three-trees-ui 1.0.86 → 1.0.88

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "three-trees-ui",
-  "version": "1.0.86",
+  "version": "1.0.88",
   "publicPath": "/ui",
   "author": "hotent",
   "private": false,

package/packages/CustomDialog/src/customDialog.vue

@@ -693,7 +693,7 @@
       })
       this.$nextTick(() => {
         if (this.value && !this.isReadOnly) {
-          this.showDialog(true)
+          // this.showDialog(true)
         }
       })
     },
@@ -1137,7 +1137,7 @@
         }
         const pInst = utils.getOnlineFormInstance(this)
         this.selectOrgs = this.convertComment2Field(str, field)
-          this.custdialog.custDialog.mappingConf.forEach((con) => {
+        this.custdialog.custDialog.mappingConf.forEach((con) => {
           let val = ''
           let bindValue = ''
           //改造，绑定值，表单列表查询字段绑定对话框时，新增的绑定字段选项
@@ -1176,19 +1176,29 @@
               thisIndex
             )
           } else if (this.modelName == 'searchForm.' + con['target'][0]) {
-            const bInst = pInst['searchForm'] ? pInst: pInst.data
+            const bInst = pInst['searchForm'] ? pInst : pInst.data
             const currentValue = val.substring(0, val.length - 1)
             if (this.modelName && this.modelName.endsWith(con['target'][0])) {
-              this.$emit('updateInput', currentValue);
+              this.$emit('updateInput', currentValue)
             }
-            utils.setValueByPath(bInst, 'searchForm.' + con['target'][0], currentValue, thisIndex)
+            utils.setValueByPath(
+              bInst,
+              'searchForm.' + con['target'][0],
+              currentValue,
+              thisIndex
+            )
             //绑定字段值处理，bindValue: {target: {id: xxx}}, bindKey: {target: id }
             if (bindValue && bindValueField) {
               const bindValueObj = {}
               //显示value对象
-              bindValueObj[bindValueField] = bindValue.substring(0, bindValue.length - 1)
+              bindValueObj[bindValueField] = bindValue.substring(
+                0,
+                bindValue.length - 1
+              )
 
-              const anInst = pInst['searchForm'] ? pInst['searchForm'] : pInst.data.searchForm
+              const anInst = pInst['searchForm']
+                ? pInst['searchForm']
+                : pInst.data.searchForm
               //若bindKey不存在，则默认空对象，若存在，则取出bindKey
               anInst.bindKey = anInst.bindKey || {}
               //格式 {target: id }
@@ -1222,7 +1232,11 @@
               }
               utils.setValueByPath(
                 pInst,
-                `${pInst.data ? 'data.' : 'model.'}${this.modelName.includes('searchForm') ? `searchForm.${path}` : path}`,
+                `${pInst.data ? 'data.' : 'model.'}${
+                  this.modelName.includes('searchForm')
+                    ? `searchForm.${path}`
+                    : path
+                }`,
                 _val,
                 thisIndex
               )
@@ -1230,9 +1244,14 @@
               if (bindValue && bindValueField) {
                 const bindValueObj = {}
                 //显示value对象
-                bindValueObj[bindValueField] = bindValue.substring(0, bindValue.length - 1)
+                bindValueObj[bindValueField] = bindValue.substring(
+                  0,
+                  bindValue.length - 1
+                )
 
-                const anInst = pInst['searchForm'] ? pInst['searchForm'] : pInst.data.searchForm
+                const anInst = pInst['searchForm']
+                  ? pInst['searchForm']
+                  : pInst.data.searchForm
                 //若bindKey不存在，则默认空对象，若存在，则取出bindKey
                 anInst.bindKey = anInst.bindKey || {}
                 //格式 {target: id }
@@ -1948,17 +1967,27 @@
           ) {
             const currentValue = val.substring(0, val.length - 1)
             if (this.modelName && this.modelName.endsWith(con['target'][0])) {
-              this.$emit('updateInput', currentValue);
+              this.$emit('updateInput', currentValue)
             }
             let prePath = pInst['searchForm'] ? '' : 'data.'
-            utils.setValueByPath(pInst, prePath + 'searchForm.' + con['target'][0], currentValue, thisIndex)
+            utils.setValueByPath(
+              pInst,
+              prePath + 'searchForm.' + con['target'][0],
+              currentValue,
+              thisIndex
+            )
             //绑定字段值处理，bindValue: {target: {id: xxx}}, bindKey: {target: id }
             if (bindValue && bindValueField) {
               const bindValueObj = {}
               //显示value对象
-              bindValueObj[bindValueField] = bindValue.substring(0, bindValue.length - 1)
+              bindValueObj[bindValueField] = bindValue.substring(
+                0,
+                bindValue.length - 1
+              )
 
-              const anInst = pInst['searchForm'] ? pInst['searchForm'] : pInst.data.searchForm
+              const anInst = pInst['searchForm']
+                ? pInst['searchForm']
+                : pInst.data.searchForm
               //若bindKey不存在，则默认空对象，若存在，则取出bindKey
               anInst.bindKey = anInst.bindKey || {}
               //格式 {target: id }

package/packages/Subtable/src/SubImportDialog.vue

@@ -227,7 +227,7 @@
         })
       }
       const instKey = SubPagination._vueComponentKey(this.dataSubname)
-      if (!SubPagination._map.has(instKey) && pInst) {
+      if (pInst) {
         // 将子表数据所属的VueComponent对象实例存储（用于数据导入）
         SubPagination._map.set(instKey, pInst)
       }