three-trees-ui 1.0.33 → 1.0.35

package/package.json

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

package/packages/CustomDialog/src/customDialog.vue

@@ -527,6 +527,7 @@
         executeScriptResult: null,
         customDialogParams: {},
         treeDialogConfig: null,
+        isPreview: false,
       }
     },
     computed: {
@@ -608,7 +609,8 @@
         })
         return ids.join(',')
       },
-      showDialog(isMounted = false) {
+      showDialog(isMounted = false, isPreview = false) {
+        this.isPreview = isPreview
         this.fixedParams = {}
         // 如果已存在配置信息就不去请求配置信息 直接初始化数据
         if (this.dialogConfig) {
@@ -1122,8 +1124,12 @@
         let flag = false
         if (this.queryParams.length != 0 && this.queryParams[0] != '') {
           this.conditionBind.forEach((item, index) => {
-            if (item.isRequire == 1 && !this.queryParams[index][item.field]) {
-              this.$message.error(`${item.comment}必填`)
+            if (
+              item.isRequire == 1 &&
+              !this.queryParams[index][item.field] &&
+              !this.isPreview
+            ) {
+              !flag && this.$message.error(`${item.comment}必填`)
               flag = true
               return
             }
@@ -1161,6 +1167,7 @@
             }
           })
         }
+        this.isPreview = false
         if (flag) {
           return
         }

package/packages/CustomDialog/src/main.vue

@@ -412,7 +412,8 @@
         if (this.isMobile) {
           this.$refs.customMobileDialogRef.showDialog()
         } else {
-          this.$refs.customDialogRef.showDialog()
+          // 第二个参数是为了处理点击预览按钮时，不立即触发必传验证提示
+          this.$refs.customDialogRef.showDialog(false, true)
         }
       },
       removeSelectOrg(item) {

package/packages/Input/src/main.vue

@@ -14,13 +14,14 @@
     <el-input
       v-if="isShowInput"
       ref="inputEle"
+      :class="{ readonly_input: readonly }"
       v-model="inputVal"
       v-validate="inputValidate"
       :type="type"
       :size="inputSize"
       :style="inputWidth"
       :name="inputName"
-      :placeholder="placeholder"
+      :placeholder="readonly ? '' : placeholder"
       :clearable="clearable"
       :show-password="showPassword"
       :disabled="isDisabled"

package/packages/Table/src/Table.vue

@@ -798,14 +798,26 @@
         this.$emit('sort-change', column)
       },
       handleFilterChange(m) {
+        // 如果是点击的是重置 筛选条件 需把默认的筛选条件里数据也删除掉
+        if (m) {
+          Object.keys(m).forEach((key) => {
+            if (
+              m[key] &&
+              m[key].length == 0 &&
+              this.resetDefaultFilter.indexOf(key) === -1
+            ) {
+              this.resetDefaultFilter.push(key)
+            }
+          })
+        }
         this.filters = { ...this.filters, ...m }
         Object.keys(this.filters).forEach((k) => {
           if (!this.filters[k] || this.filters[k].length == 0) {
             delete this.filters[k]
           }
         })
-        this.load()
         this.$emit('filter-change', m)
+        this.load()
       },
       doLayout() {
         this.$nextTick(() => {

package/src/mixins/templatePreview.js

@@ -540,7 +540,7 @@ export default {
     //获取汇总全部数据
     getAllSummary(data) {
       const allSummaryConfig = data.reduce((pre, cur) => {
-        pre[cur.field] = cur.val
+        pre[cur.field] = utils.thousandBit(cur.val)
         return pre
       }, {})
       if (Object.keys(allSummaryConfig).length) {
@@ -736,9 +736,14 @@ export default {
         let manageField = JSON.parse(this.templateInfo.manageField)
         let this_ = this
         manageField.forEach((item) => {
+          if (item.buttonId) {
+            obj[item.buttonId] = true
+          }
           if (item.beforeScriptValue) {
             let promise = this_.beforeScript(item.beforeScriptValue, item)
             promise.then((res) => {
+              obj[item.buttonId] = res
+              //为兼容旧数据（没有buttonId的数据）
               obj[item.name] = res
             })
           }
@@ -1404,6 +1409,10 @@ export default {
     },
     //列表数据查询入口
     search(param, cb, isSearchBtn) {
+      // 如果是高级查询，页码重置为首页
+      if (isSearchBtn) {
+        this.pagination.page = 1
+      }
       let params = {}
       //判断为合并查询还是高级查询
       let showAdvancedSearch = this.$refs.multipleTemplateTable
@@ -1480,7 +1489,7 @@ export default {
         let betweenConditions = {}
         params.pagination.querys.forEach((q) => {
           if (
-            q.value &&
+            q.value != undefined &&
             (q.operation != 'BETWEEN' || q.value.constructor == Array)
           ) {
             tempQueryS.push(q)
@@ -1962,10 +1971,11 @@ export default {
         const filterField = utils.parseToJson(this.templateInfo.filteringField)
         temquerys.forEach((q) => {
           let prefix = this.getColPreFix(conditionField, q.property)
+          const queryPre = this.getQueryPre(conditionField, q.property)
           if (!prefix) {
             prefix = this.getColPreFix(filterField, q.property)
           }
-          q.property = prefix + q.property
+          q.property = queryPre + prefix + q.property
           querys.push(q)
         })
       }
@@ -2422,7 +2432,7 @@ export default {
       if (type === 'searchResult') {
         this.curSelectParams.queryFilter.querys = this.templateSearchQuery
       }
-      // 增加导出字段限制
+	  // 增加导出字段限制
       const checkField = this.getCheckField()
       if (checkField && checkField.length) {
         let fieldExport = {}
@@ -2431,18 +2441,50 @@ export default {
         })
         this.curSelectParams.fieldExport = fieldExport
       }
+      if (type === 'selected') {
+        const selectedId = this.tableData.selectRows.map((item) => item.id_)
+        const selectedQuery = {
+          property: 't.id_',
+          value: selectedId ? selectedId.join(',') : '',
+          group: 'main',
+          operation: 'IN',
+          relation: 'AND',
+        }
+        this.curSelectParams.queryFilter.querys = [
+          ...this.curSelectParams.queryFilter.querys,
+          selectedQuery,
+        ]
+      }
+      //导出全部数据按钮
+      if (type == 'all') {
+        this.curSelectParams.queryFilter.querys = []
+      }
+      let loadingInstance = Loading.service({
+        fullscreen: true,
+      }) //开始
       this.$requestConfig
         .exportByBtnSetting({
           id: this.templateInfo.id,
           params: this.curSelectParams,
         })
-        .then(({ data, headers }) => {
-          const fileName = decodeURIComponent(
-            headers['content-disposition'].split(';')[1].split('filename=')[1]
-          )
-          const blob = new Blob([data])
-          saveAs(blob, fileName)
-        })
+        .then(
+          ({ data, headers }) => {
+            const fileName = decodeURIComponent(
+              headers['content-disposition'].split(';')[1].split('filename=')[1]
+            )
+            const blob = new Blob([data])
+            saveAs(blob, fileName)
+            loadingInstance.close() // 结束
+          },
+          (e) => {
+            loadingInstance.close() // 结束
+            let enc = new TextDecoder('utf-8')
+            let uint8_msg = JSON.parse(
+              enc.decode(new Uint8Array(e.response.data))
+            )
+            this.$message.error(uint8_msg.message)
+          }
+        )
     },
     importCommand(params) {
       switch (params.command) {
@@ -2731,6 +2773,13 @@ export default {
             operation: 'EQUAL',
             relation: 'AND',
           },
+          {
+            property: 'bo_alias_',
+            value: this.templateInfo.boDefAlias,
+            group: 'main',
+            operation: 'EQUAL',
+            relation: 'AND',
+          },
         ],
       }
       this.recordTableLoading = true
@@ -3117,6 +3166,10 @@ export default {
       this.getBpmTemplateByPagination(params)
     },
     filterChange(filters) {
+      // 筛选时需重置页面页码
+      if (filters) {
+        this.pagination.page = 1
+      }
       if (filters && Object.keys(filters).length > 0) {
         const key = Object.keys(filters)[0]
         const filter = filters[key]
@@ -3497,7 +3550,10 @@ export default {
         currentRows
           .filter((item) => item[fields] !== undefined && item[fields] !== '')
           .map((item) => Number(item[fields]))
-      if (!list || list.length == 0) return
+      if (!list || list.length == 0) {
+        let num = 0
+        return num.toFixed(decimal)
+      }
       const METHOD_MAP = {
         count: 'getCount',
         sum: 'getSum',
@@ -3665,7 +3721,7 @@ export default {
                 type: dialogConfig.custDialog,
               }
               obj.custdialog = {
-                name: '请选择',
+                name: dialogConfig.name || '请选择',
                 custDialog: custdialog,
                 resultField: dialogConfig.resultField,
               }
@@ -3741,6 +3797,10 @@ export default {
         type: 'warning',
       })
         .then(() => {
+          let loadingInstance = Loading.service({
+            fullscreen: true,
+            text: '数据更新中...',
+          })
           let selectRows = row
             ? [row]
             : this.tableData.selectRows
@@ -3756,20 +3816,37 @@ export default {
             boData: selectRows,
             boAlias: this.templateInfo.boDefAlias,
           }
-          this.$requestConfig.batchUpdateTemplateData(data).then((data) => {
-            if (data.state) {
-              this.$message({
-                type: 'success',
-                message: data.message,
-              })
-              this.search({
-                querys: this.buildDefaultQuerys() || [],
-              })
-              // 更新成功后需执行后置js
-              let script = Base64.decode(afterScriptValue)
-              this.tempScript(script, row)
-            }
-          })
+          this.$requestConfig
+            .batchUpdateTemplateData(data)
+            .then((data) => {
+              if (data.state) {
+                this.$message({
+                  type: 'success',
+                  message: data.message,
+                })
+                this.$nextTick(() => {
+                  // 以服务的方式调用的 Loading 需要异步关闭
+                  loadingInstance.close()
+                })
+                this.search({
+                  querys: this.buildDefaultQuerys() || [],
+                })
+                // 更新成功后需执行后置js
+                if (afterScriptValue) {
+                  let script = Base64.decode(afterScriptValue)
+                  this.tempScript(script, row)
+                }
+              } else {
+                this.$nextTick(() => {
+                  // 以服务的方式调用的 Loading 需要异步关闭
+                  loadingInstance.close()
+                })
+              }
+            })
+            .finally(() => {
+              loadingInstance.close()
+            })
+          this.$parent.init()
         })
         .catch(() => {
           this.$message({
@@ -4024,8 +4101,11 @@ export default {
         }
       } else if (btnOk.indexOf(btnAlias) != -1) {
         if (btnAlias == 'switch') {
+          const pkFieldValue =
+            parameter.pkField ||
+            this.getBindValue(row, this.templateInfo.pkField)
           this.switchChange(
-            parameter.pkField,
+            pkFieldValue,
             parameter.switchOn,
             parameter.switchOff,
             parameter.bind,
@@ -4532,7 +4612,7 @@ export default {
         return strData
       }
     },
-    getCheckField() {
+	getCheckField() {
       let customColumns = this.$refs.multipleTemplateTable.customColumns || []
       let customColumnSetting = JSON.parse(
         localStorage.getItem('customColumnSetting') || '{}'