Merge branch 'develop'

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
 

src/views/MyWork/components/IssueTable.vue

@@ -172,6 +172,7 @@
       :filter-column-options="filterOptions"
       :selection-options="contextOptions"
       @update="updateAllIssueTables"
+      @update-row="getContextRow"
     />
   </div>
 </template>

src/views/Overview/ProjectList/components/EditProjectDialog.vue

@@ -107,11 +107,13 @@
             </el-form-item>
           </el-col>
           <el-col
-            v-if="form.base_example && baseExampleInfo && !editProjectObj.is_empty_project"
+            v-if="form.base_example && baseExampleDescription && !editProjectObj.is_empty_project"
             :span="24"
           >
             <el-form-item :label="$t('Project.OriginalTemplate')">
-              <p v-html="baseExampleInfo" />
+              <span class="font-bold">{{ baseExampleDisplay }}</span>
+              <br>
+              <span v-html="baseExampleDescription" />
             </el-form-item>
           </el-col>
         </el-col>
@@ -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()
       })
     },

src/views/Overview/ProjectList/components/TemplateList.vue

@@ -86,7 +86,7 @@
       :span="24"
     >
       <el-form-item :label="$t('Project.TemplateDescription')">
-        <p v-html="focusTemplate.description" />
+        <span v-html="focusTemplate.description" />
       </el-form-item>
     </el-col>
     <div>

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 {
 <style lang="scss" scoped>
 .add-issue-inline {
   @apply pl-5;
+  @apply py-3;
 }
 
 .table-css {

src/views/Project/IssueBoards/components/Boards.vue

@@ -47,13 +47,14 @@
       :row="contextMenu.row"
       :filter-column-options="filterOptions"
       :selection-options="contextOptions"
+      @update-row="getContextRow"
     />
   </section>
 </template>
 
 <script>
 import { mapGetters } from 'vuex'
-import { addIssue, updateIssue } from '@/api/issue'
+import { getIssue, addIssue, updateIssue } from '@/api/issue'
 import { Kanban } from '@/views/Project/IssueBoards/components'
 import { ContextMenu } from '@/components/Issue'
 import ProjectIssueDetail from '@/views/Project/IssueDetail/'
@@ -296,6 +297,12 @@ export default {
         document.addEventListener('click', this.hideContextMenu)
       })
     },
+    async getContextRow(issueId) {
+      const issue = await getIssue(issueId)
+      this.$nextTick(() => {
+        this.contextMenu.row = issue.data
+      })
+    },
     hideContextMenu() {
       this.contextMenu.visible = false
       document.removeEventListener('click', this.hideContextMenu)

src/views/Project/IssueDetail/components/IssueMatrix/index.vue

@@ -1,6 +1,7 @@
 <template>
   <div
     ref="wrapper"
+    v-loading="isLoading"
     class="wrapper"
   >
     <el-alert
@@ -112,7 +113,6 @@
     <div
       v-show="data.length > 0"
       ref="matrix"
-      v-loading="isLoading"
       v-dragscroll
       class="mermaid-wrapper"
       :style="{ height:`${tableHeight}px` }"