three-trees-ui 1.0.70 → 1.0.72

package/package.json

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

package/packages/Subtable/src/SubImportDialog.vue

@@ -231,9 +231,9 @@
         SubPagination._map.set(instKey, pInst)
       }
     },
-    destroyed() {
-      SubPagination.clear(this.dataSubname, this)
-    },
+    // destroyed() {
+    //   SubPagination.clear(this.dataSubname, this)
+    // },
     methods: {
       transformFieldData(data) {
         return new Promise(async (resolve) => {

package/packages/Subtable/src/SubPagination.vue

@@ -106,9 +106,9 @@
     mounted() {
       this.paginationChange()
     },
-    destroyed() {
-      SubPagination.clear(this.dataSubname, this)
-    },
+    // destroyed() {
+    //   SubPagination.clear(this.dataSubname, this)
+    // },
     methods: {
       paginationChange() {
         // 分页变化时，以dataPath为key设置到公共的js对象中

package/src/mixins/querySqlPreview.js

@@ -526,7 +526,7 @@ export default {
         }
       })
     },
-    validateSearchRequired(querys) {
+    validateSearchRequired(querys = []) {
       let errorMsg = ''
       let conditions = JSON.parse(this.queryView.conditions)
       if (conditions && querys) {
@@ -543,6 +543,20 @@ export default {
       }
       return errorMsg
     },
+    checkHaveRequired() {
+      let haveRequired = false
+      try {
+        let conditions = JSON.parse(this.queryView.conditions)
+        if (conditions) {
+          haveRequired = conditions.some((item) => {
+            return item.isRequired
+          })
+        }
+      } catch (e) {
+        console.log(e)
+      }
+      return haveRequired
+    },
     async search(param, cb, isSearchBtn, needRequestTotal = false) {
       // 不需要请求后端接口统计列表数据
       this.needRequestTotal = needRequestTotal
@@ -553,7 +567,6 @@ export default {
       }
       //初始化时，把查询字段的默认值加进去
       if (this.isInit) {
-        this.isInit = false
         let querys = await this.buildDefaultQuerys()
         dataTemplateQueryVo.queryFilter.querys =
           dataTemplateQueryVo.queryFilter.querys || []
@@ -569,17 +582,21 @@ export default {
           this.defaultQuerys
         )
       }
+      // 检查是否有必填字段
+      if (this.checkHaveRequired() && this.isInit) {
+        this.$refs.queryViewList.showAdvancedSearch = true
+      }
       // 查询字段 校验是否必填，如果是必填没数据，需返回提示
-      if (isSearchBtn) {
-        let errorMsg = this.validateSearchRequired(
-          dataTemplateQueryVo.queryFilter.querys
-        )
-        if (errorMsg) {
-          this.$message.warning(errorMsg)
-          cb && cb()
-          return
-        }
+      let errorMsg = this.validateSearchRequired(
+        dataTemplateQueryVo.queryFilter.querys
+      )
+      if (errorMsg) {
+        !this.isInit && this.$message.warning(errorMsg)
+        cb && cb()
+        this.isInit = false
+        return
       }
+      this.isInit = false
       //保存查询参数，用于作为导出的查询参数
       if (this.queryViewOptions) {
         //关联查询字段
@@ -775,11 +792,19 @@ export default {
                 ? operationType[operation]
                 : operation
           } else if (
-            typeof $(searchItems[i]).children().attr('ht-query') != 'undefined'
+            typeof $(searchItems[i])
+              .children()
+              .attr('ht-query') != 'undefined'
           ) {
             //查询条件类型
-            operation = $(searchItems[i]).children().attr('operation')
-            operationMap[$(searchItems[i]).children().attr('ht-query')] =
+            operation = $(searchItems[i])
+              .children()
+              .attr('operation')
+            operationMap[
+              $(searchItems[i])
+                .children()
+                .attr('ht-query')
+            ] =
               typeof operationType[operation] != 'undefined'
                 ? operationType[operation]
                 : operation
@@ -801,12 +826,16 @@ export default {
               searchItems[i]
             ).attr('field-query')
           } else if (
-            typeof $(searchItems[i]).children().attr('ht-query') != 'undefined'
+            typeof $(searchItems[i])
+              .children()
+              .attr('ht-query') != 'undefined'
           ) {
             //查询条件字段
-            fieldQueryMap[$(searchItems[i]).children().attr('ht-query')] = $(
-              searchItems[i]
-            )
+            fieldQueryMap[
+              $(searchItems[i])
+                .children()
+                .attr('ht-query')
+            ] = $(searchItems[i])
               .children()
               .attr('field-query')
           }
@@ -828,12 +857,19 @@ export default {
                 ? true
                 : false
           } else if (
-            typeof $(searchItems[i]).children().attr('ht-query') != 'undefined'
+            typeof $(searchItems[i])
+              .children()
+              .attr('ht-query') != 'undefined'
           ) {
             //查询条件字段
-            fieldQueryMap[$(searchItems[i]).children().attr('ht-query')] =
-              typeof $(searchItems[i]).children().attr('special-query') !=
-              'undefined'
+            fieldQueryMap[
+              $(searchItems[i])
+                .children()
+                .attr('ht-query')
+            ] =
+              typeof $(searchItems[i])
+                .children()
+                .attr('special-query') != 'undefined'
                 ? true
                 : false
           }
@@ -987,6 +1023,14 @@ export default {
           dataTemplateQueryVo.selectList = this.queryViewOptions.selectList
         }
       }
+      // 查询字段 校验是否必填，如果是必填没数据，需返回提示
+      let errorMsg = this.validateSearchRequired(
+        dataTemplateQueryVo.queryFilter.querys
+      )
+      if (errorMsg) {
+        this.$message.warning(errorMsg)
+        return
+      }
 
       let data = {
         sqlAlias: this.sqlAlias || this.queryView.sqlAlias,

package/src/mixins/templatePreview.js

@@ -1408,7 +1408,8 @@ export default {
       for (let x = 0; x < display.length; x++) {
         let item = JSON.parse(display[x])
         if (this.rows[index][item.name] || this.rows[index][item.fieldsAlias]) {
-          const qrCode = this.rows[index][item.name] || this.rows[index][item.fieldsAlias]
+          const qrCode =
+            this.rows[index][item.name] || this.rows[index][item.fieldsAlias]
           this.QRCodeDesc.push(`${item.desc}:${qrCode}`)
         }
       }
@@ -1605,7 +1606,7 @@ export default {
         params.defKey = this_.defKey
       }
       // 检查是否有必填字段
-      if (this.checkHaveRequired && this.isInit) {
+      if (this.checkHaveRequired() && this.isInit) {
         this.$refs.multipleTemplateTable.showAdvancedSearch = true
       }
       // 查询字段 校验是否必填，如果是必填没数据，需返回提示
@@ -1625,7 +1626,7 @@ export default {
       }
     },
     // 校验查询字段必填
-    validateSearchRequired(querys) {
+    validateSearchRequired(querys = []) {
       let errorMsg = ''
       let conditions = JSON.parse(this.templateInfo.conditionField)
       if (conditions) {
@@ -3525,6 +3526,12 @@ export default {
         params.defKey = this_.defKey
       }
       await this.handleInitQuery(params)
+      // 查询字段 校验是否必填，如果是必填没数据，需返回提示
+      let errorMsg = this.validateSearchRequired(params.pagination.querys)
+      if (errorMsg) {
+        this.$message.warning(errorMsg)
+        return
+      }
       this.getBpmTemplateByPagination(params)
     },
     filterChange(filters) {