diff --git a/Dockerfile b/Dockerfile
index d74940b44..5ad853682 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -4,7 +4,7 @@ COPY package*.json ./
COPY yarn.lock ./
RUN yarn install
COPY . .
-RUN git rev-parse HEAD > git_commit && echo "1.19.0" > git_tag && git log -1 --date=iso8601 --format="%ad" > git_date
+RUN git rev-parse HEAD > git_commit && echo "1.19.1" > git_tag && git log -1 --date=iso8601 --format="%ad" > git_date
RUN echo -e "\nVUE_APP_COMMIT='$(cat git_commit)'\nVUE_APP_TAG='$(cat git_tag)'\nVUE_APP_DATE='$(cat git_date)'" >> .env.production
RUN yarn run build:prod
diff --git a/src/views/MyWork/components/IssueTable.vue b/src/views/MyWork/components/IssueTable.vue
index 5692fe10f..44a85b85e 100644
--- a/src/views/MyWork/components/IssueTable.vue
+++ b/src/views/MyWork/components/IssueTable.vue
@@ -172,6 +172,7 @@
:filter-column-options="filterOptions"
:selection-options="contextOptions"
@update="updateAllIssueTables"
+ @update-row="getContextRow"
/>
diff --git a/src/views/Overview/ProjectList/components/EditProjectDialog.vue b/src/views/Overview/ProjectList/components/EditProjectDialog.vue
index 07c4d4061..f831a8ce8 100644
--- a/src/views/Overview/ProjectList/components/EditProjectDialog.vue
+++ b/src/views/Overview/ProjectList/components/EditProjectDialog.vue
@@ -107,11 +107,13 @@
-
+ {{ baseExampleDisplay }}
+
+
@@ -206,7 +208,8 @@ export default {
]
},
assignableList: [],
- baseExampleInfo: '',
+ baseExampleDisplay: '',
+ baseExampleDescription: '',
originProject: {
parent_id: '',
is_inheritance_member: false
@@ -259,7 +262,8 @@ export default {
res.data.forEach((item) => {
item.options.forEach((element) => {
if (element.path === this.form.base_example) {
- this.baseExampleInfo = element.description
+ this.baseExampleDisplay = element.display
+ this.baseExampleDescription = element.description
}
})
})
@@ -276,7 +280,8 @@ export default {
this.$nextTick(() => {
this.$refs.editProjectForm.resetFields()
this.form = formTemplate()
- this.baseExampleInfo = ''
+ this.baseExampleDisplay = ''
+ this.baseExampleDescription = ''
this.clearTemplate()
})
},
diff --git a/src/views/Overview/ProjectList/components/TemplateList.vue b/src/views/Overview/ProjectList/components/TemplateList.vue
index 0cc50cde1..4ae38db4b 100644
--- a/src/views/Overview/ProjectList/components/TemplateList.vue
+++ b/src/views/Overview/ProjectList/components/TemplateList.vue
@@ -86,7 +86,7 @@
:span="24"
>
-
+
diff --git a/src/views/Plan/Milestone/components/WBS.vue b/src/views/Plan/Milestone/components/WBS.vue
index 5835eb7a3..66c8985f7 100644
--- a/src/views/Plan/Milestone/components/WBS.vue
+++ b/src/views/Plan/Milestone/components/WBS.vue
@@ -369,7 +369,7 @@ import WBSSelectColumn from '@/views/Plan/Milestone/components/WBSSelectColumn'
import WBSDateColumn from '@/views/Plan/Milestone/components/WBSDateColumn'
import ProjectIssueDetail from '@/views/Project/IssueDetail/'
import SettingRelationIssue from '@/views/Project/IssueList/components/SettingRelationIssue'
-import { addIssue, deleteIssue, getIssueFamily, updateIssue } from '@/api/issue'
+import { getIssue, addIssue, deleteIssue, getIssueFamily, updateIssue } from '@/api/issue'
import { cloneDeep } from 'lodash'
import { CancelRequest } from '@/newMixins'
@@ -472,6 +472,10 @@ export default {
},
mounted() {
this.loadData()
+ window.addEventListener('resize', this.loadData)
+ },
+ destroyed() {
+ window.removeEventListener('resize', this.loadData)
},
methods: {
getParams() {
@@ -517,6 +521,13 @@ export default {
this.$set(this.$refs['WBS'].resizeState, 'height', 0)
this.$set(this.$refs['WBS'], 'isGroup', true)
this.$set(this.$refs['WBS'], 'isGroup', false)
+
+ if (this.issueMatrixDialog.row.id) {
+ const issue = await getIssue(this.issueMatrixDialog.row.id)
+ this.$nextTick(() => {
+ this.issueMatrixDialog.row = issue.data
+ })
+ }
},
async fetchData() {
if (!this.selectedProjectId) return
@@ -1092,6 +1103,7 @@ export default {