合并更新最新4.1

applications/architecture-dee/src/commonComponents/components/AssociationFormAddMVM/index.vue

@@ -97,7 +97,7 @@ export default {
     latestOptions: { // 版本选择
       type: Array,
       default: () => [
-        { value: 'LATEST', label: '最新' },
+        { value: 'ACCURATE_LATEST', label: '最新' },
         { value: 'VERSION_NEWEST', label: '修订' }
       ]
     },
@@ -520,7 +520,8 @@ export default {
     this.$nextTick(() => {
       if (this.associationFormRelationObj && this.associationFormRelationObj.length === 1) {
         this.getOptionsDataFun(this.defaultData.modelName)
-        this.defaultData.latest = this.componentProp.setShowVersion ? this.componentProp.setShowVersion : 'LATEST'
+        // this.defaultData.latest = this.componentProp.setShowVersion ? this.componentProp.setShowVersion : 'LATEST'
+        this.defaultData.latest = this.componentProp.setShowVersion ? this.componentProp.setShowVersion : 'ACCURATE_LATEST'
         this.searchEvent()
       }
     })

applications/architecture-dee/src/commonComponents/components/LinkToPage/index.vue

@@ -5,7 +5,20 @@
 */
 <template>
   <span class="link-to-page-com">
-    <span :class="{'link': allProp.component.toPageType !== 'detailPage' || (allProp.component.toPageType === 'detailPage' && passParameter)}" @click.stop="clickLink">{{ value }}</span>
+    <span
+      :class="{'link': allProp.component.toPageType !== 'detailPage' || (allProp.component.toPageType === 'detailPage' && passParameter)}"
+      @click.stop="clickLink"
+    >
+      <span v-if="itemObj && itemObj.key === 'state'">
+        {{ $utils.getParamsFromLists(dictOptions['state'], 'value', value, 'label') }}
+      </span>
+      <span v-else-if="itemObj && itemObj.fildProp && itemObj.fildProp.type=== 'DictDataVO'">
+        {{ $utils.getParamsFromLists(dictOptions[itemObj.key], 'value', value, 'label') || value }}
+      </span>
+      <span v-else>
+        {{ value }}
+      </span>
+    </span>
     <dee-dialog
       v-if="selfDialogShow"
       :dialog-visible="selfDialogShow"
@@ -87,6 +100,10 @@ export default {
       type: Object,
       default: () => {}
     },
+    dictOptions: {
+      type: Object,
+      default: () => { return {} }
+    },
     value: {
       type: [String, Number],
       default: () => {}

applications/architecture-dee/src/commonComponents/components/orgLazyLoadSelect/index.vue

@@ -83,6 +83,11 @@ export default {
       observer: null
     }
   },
+  computed: {
+    bindKey() {
+      return this.$utils._get(this.item, 'component.bindKey') || this.initBindKey || 'id'
+    }
+  },
   watch: {
     value: {
       immediate: true,
@@ -184,9 +189,9 @@ export default {
           'children': [],
           'items': [
             {
-              'fieldName': 'targetId',
+              'fieldName': 'id',
               'operator': 'EQ',
-              'value': localStorage.getItem('userId')
+              'value': localStorage.getItem('org')
             }
           ],
           'operator': 'AND'
@@ -202,10 +207,10 @@ export default {
       const res = await this.$api.searchApi('DxOrganization', params)
       const items = this.$utils._get(res, 'items.content') || []
       if (items.length > 0) {
-        const row = items.find(m => !!m.source)
+        const row = items[0]
         if (row) {
-          this.selectedOrgList = [row.source]
-          this.checkedData = [row.source]
+          this.selectedOrgList = [row]
+          this.checkedData = [row]
           this.onSave()
         }
       }

applications/architecture-dee/src/store/modules/menu.js

@@ -115,12 +115,16 @@ const actions = {
         const subMenu = findPlatformRootEvent(state.permMenus, model.pageInfo, model.appId)
         commit('SET_ACTIVE_MODEL', subMenu)
         const findPlatformMenu = state.menusData.find(el => {
-          return el.menuRootAppId === findModel.id
-        })
-        const findSubMenu = findPlatformMenu.children.find(el => {
-          return el.id === subMenu.id
+          return el.menuRootAppId === findModel.id && el.children && el.children.length
         })
-        commit('UPDATE_MENU', findSubMenu && findSubMenu.children ? findSubMenu.children : [])
+        if (findPlatformMenu) {
+          const findSubMenu = findPlatformMenu.children.find(el => {
+            return el.id === subMenu.id
+          })
+          commit('UPDATE_MENU', findSubMenu && findSubMenu.children ? findSubMenu.children : [])
+        } else {
+          commit('UPDATE_MENU', [])
+        }
       } else {
         commit('SET_ACTIVE_MODEL', findModel)
         const findMenus = state.menusData.find(el => {

applications/dee-craft/src/privateComponents/components/TestItem/components/PresetBaseDynamicTable/base.js

@@ -120,7 +120,8 @@ export default {
     },
     mapHeadType2EditComp(row) {
       let component = null
-      const componentConfig = this.editComponentConfig[this.headType2EditComponent[row.tableHeadType]]
+      const componentConfig = JSON.parse(JSON.stringify(this.editComponentConfig[this.headType2EditComponent[row.tableHeadType]]))
+      // const componentConfig = this.editComponentConfig[this.headType2EditComponent[row.tableHeadType]]
       // 字典列传值
       if (row.tableHeadType === 'DictColumn') {
         this.mergeConfig(componentConfig, { 'optionsdic': row.dictType })

applications/dee-resource/src/privateComponents/components/PresetBaseDynamicTable/base.js

@@ -107,7 +107,8 @@ export default {
     },
     mapHeadType2EditComp(row) {
       let component = null
-      const componentConfig = this.editComponentConfig[this.headType2EditComponent[row.tableHeadType]]
+      // const componentConfig = this.editComponentConfig[this.headType2EditComponent[row.tableHeadType]]
+      const componentConfig = JSON.parse(JSON.stringify(this.editComponentConfig[this.headType2EditComponent[row.tableHeadType]]))
       // 字典列传值
       if (row.tableHeadType === 'DictColumn') {
         this.mergeConfig(componentConfig, { 'optionsdic': row.dictType })

applications/dee-task-center/src/business-components/tabCom/task-detail.vue

@@ -84,12 +84,6 @@
             :form="ExtPlanReplyLinkform"
             @on-submit="toSubmitExtPlanReply"
           />
-
-          <!-- :form="ExtPlanReplyLinkform" -->
-          <!-- <div class="ExtPlanReplyLink-submitBTN">
-            <el-button type="primary" @click="ExtPlanReplyLinkform">保存</el-button>
-          </div> -->
-
         </div>
         <div v-if="basicData && basicData.basicInfo && !basicData.basicInfo.forwardFlag && (!isCheckTaskState || (isCheckTaskState && basicData.basicInfo.state==='BE_RESOLVED' && !basicData.basicInfo.parentTaskId))">
           <div class="sub-title" style="padding-bottom:12px">任务处理</div>