three-trees-ui 1.0.85 → 1.0.87

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "three-trees-ui",
-  "version": "1.0.85",
+  "version": "1.0.87",
   "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/DimensionSelectorInput/src/main.vue

@@ -73,9 +73,9 @@
       }
     },
     mounted() {
-      if (!this.data || this.data.length == 0) {
-        this.handleLoad()
-      }
+      // if (!this.data || this.data.length == 0) {
+      //   this.handleLoad()
+      // }
     },
     methods: {
       getQueryFilter(page) {

package/packages/JobSelectorInput/src/main.vue

@@ -80,9 +80,9 @@
       }
     },
     mounted() {
-      if (!this.data || this.data.length == 0) {
-        this.handleLoad()
-      }
+      // if (!this.data || this.data.length == 0) {
+      //   this.handleLoad()
+      // }
     },
     methods: {
       getQueryFilter(page) {

package/packages/OrgSelectorInput/src/OrgSelectorInput.vue

@@ -108,9 +108,9 @@
           this.initCurrentOrg(currentUserOrg)
         })
       }
-      if (!this.data || this.data.length == 0) {
-        this.handleLoad()
-      }
+      // if (!this.data || this.data.length == 0) {
+      //   this.handleLoad()
+      // }
     },
     methods: {
       handleSearch(word) {

package/packages/PostSelectorInput/src/PostSelectorInput.vue

@@ -113,9 +113,9 @@
           this.initCurrentPost(currentUserPost)
         })
       }
-      if (!this.data || this.data.length == 0) {
-        this.handleLoad()
-      }
+      // if (!this.data || this.data.length == 0) {
+      //   this.handleLoad()
+      // }
     },
     methods: {
       initCurrentPost(post) {

package/packages/RoleSelectorInput/src/main.vue

@@ -80,9 +80,9 @@
       }
     },
     mounted() {
-      if (!this.data || this.data.length == 0) {
-        this.handleLoad()
-      }
+      // if (!this.data || this.data.length == 0) {
+      //   this.handleLoad()
+      // }
     },
     methods: {
       getQueryFilter(page) {

package/packages/Subtable/src/SubImportDialog.vue

@@ -150,6 +150,7 @@
         mergeFunc: null,
         mode: 'append',
         cacheDicData: {}, // 缓存字典数据
+        cacheImportData: [], // 缓存导入时重复的请求
       }
     },
     computed: {
@@ -272,7 +273,18 @@
             dsName: config.dataSource,
             sql: sqlStr,
           }
+          let cacheObj = this.cacheImportData.find((k) => {
+            return utils.objectEquals(k.params, params)
+          })
+          if (cacheObj) {
+            resolve(cacheObj.result)
+            return
+          }
           this.$requestConfig.getValueBySql(params).then((res) => {
+            this.cacheImportData.push({
+              params,
+              result: res,
+            })
             resolve(res)
           })
         })
@@ -376,6 +388,13 @@
         })
         return importRows
       },
+      awaitTime() {
+        return new Promise((resolve) => {
+          setTimeout(() => {
+            resolve()
+          }, 10)
+        })
+      },
       async dialogConfirm() {
         if (this.importRows.length == 0) {
           this.$message.error('请选择要导入的文件')
@@ -416,6 +435,11 @@
             }
           }
         }
+        const loading = this.$loading({
+          text: '导入中...',
+        })
+        // 先等待弹窗弹出，再执行后面代码，后面代码执行js量大，容易卡顿导致loading框不出现
+        await this.awaitTime()
         const pInst = utils.getOnlineFormInstance(this.$parent.$parent)
         let importRows = await this.changeDictionary(this.importRows)
         // 导入如果有数据转换的此处做转换
@@ -429,10 +453,12 @@
           pInst
         )
           .then(() => {
+            loading && loading.close()
             this.$message.success('导入成功！')
             this.dialogVisible = false
           })
           .catch((err) => {
+            loading && loading.close()
             this.$refs.selectFile.value = ''
             this.$message.error(`数据导入失败：${err}`)
           })

package/packages/Table/src/Table.vue

@@ -710,7 +710,7 @@
         const me = this
         // 防止外部没有回调，设置10秒后自动取消加载中的状态
         let waitTime = 10000
-        if (!this._events || !this._events.load || !this._events.load.length) {
+        if (!this._events || (!this._events.loading && !this._events.load)) {
           // 如果没有绑定在当前组件里的load事件，即组件仅仅作展示数据用 直接取消loading
           waitTime = 0
         }

package/packages/UserSelectorInput/src/main.vue

@@ -103,9 +103,9 @@
           this.initCurrentValue(currentUserDetail)
         })
       }
-      if (!this.data || this.data.length == 0) {
-        this.handleLoad()
-      }
+      // if (!this.data || this.data.length == 0) {
+      //   this.handleLoad()
+      // }
     },
     methods: {
       handleSearch(word) {