three-trees-ui 1.0.68 → 1.0.70

package/package.json

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

package/packages/CustomDialog/src/customDialog.vue

@@ -1137,8 +1137,11 @@
         }
         const pInst = utils.getOnlineFormInstance(this)
         this.selectOrgs = this.convertComment2Field(str, field)
-        this.custdialog.custDialog.mappingConf.forEach((con) => {
-          var val = ''
+          this.custdialog.custDialog.mappingConf.forEach((con) => {
+          let val = ''
+          let bindValue = ''
+          //改造，绑定值，表单列表查询字段绑定对话框时，新增的绑定字段选项
+          const bindValueField = con.bindValue && con.bindValue.toLowerCase()
           str.forEach((item, index) => {
             // 此处添加url跳转参数保存逻辑
             if (
@@ -1159,6 +1162,10 @@
               },`
             } else {
               val += item[con.from] + ','
+              //绑定字段处理
+              if (bindValueField) {
+                bindValue += item[bindValueField] + ','
+              }
             }
           })
           if (this.modelName == 'data.' + con['target'][0]) {
@@ -1169,12 +1176,29 @@
               thisIndex
             )
           } else if (this.modelName == 'searchForm.' + con['target'][0]) {
+            const bInst = pInst['searchForm'] ? pInst: pInst.data
             utils.setValueByPath(
-              pInst,
+              bInst,
               'searchForm.' + con['target'][0],
               val.substring(0, val.length - 1),
               thisIndex
             )
+            //绑定字段值处理，bindValue: {target: {id: xxx}}, bindKey: {target: id }
+            if (bindValue && bindValueField) {
+              const bindValueObj = {}
+              //显示value对象
+              bindValueObj[bindValueField] = bindValue.substring(0, bindValue.length - 1)
+
+              const anInst = pInst['searchForm'] ? pInst['searchForm'] : pInst.data.searchForm
+              //若bindKey不存在，则默认空对象，若存在，则取出bindKey
+              anInst.bindKey = anInst.bindKey || {}
+              //格式 {target: id }
+              anInst.bindKey[con['target'][0]] = bindValueField
+              //若bindValue不存在，则默认空对象，若存在，则取出bindValue
+              anInst.bindValue = anInst.bindValue || {}
+              //格式 {target: {id: xxx}}
+              anInst.bindValue[con['target'][0]] = bindValueObj
+            }
           } else {
             let configAttr = con['target'][0].split('.')
             let path = con['target'][0]
@@ -1199,10 +1223,26 @@
               }
               utils.setValueByPath(
                 pInst,
-                `${pInst.data ? 'data.' : 'model.'}${path}`,
+                `${pInst.data ? 'data.' : 'model.'}${this.modelName.includes('searchForm') ? `searchForm.${path}` : path}`,
                 _val,
                 thisIndex
               )
+              //绑定字段值处理，bindValue: {target: {id: xxx}}, bindKey: {target: id }
+              if (bindValue && bindValueField) {
+                const bindValueObj = {}
+                //显示value对象
+                bindValueObj[bindValueField] = bindValue.substring(0, bindValue.length - 1)
+
+                const anInst = pInst['searchForm'] ? pInst['searchForm'] : pInst.data.searchForm
+                //若bindKey不存在，则默认空对象，若存在，则取出bindKey
+                anInst.bindKey = anInst.bindKey || {}
+                //格式 {target: id }
+                anInst.bindKey[con['target'][0]] = bindValueField
+                //若bindValue不存在，则默认空对象，若存在，则取出bindValue
+                anInst.bindValue = anInst.bindValue || {}
+                //格式 {target: {id: xxx}}
+                anInst.bindValue[con['target'][0]] = bindValueObj
+              }
             }
           }
         })
@@ -1856,8 +1896,11 @@
         }
         const pInst = utils.getOnlineFormInstance(this)
         this.custdialog.custDialog.mappingConf.forEach((con) => {
-          var val = ''
-          var from = con.from.toLowerCase()
+          let val = ''
+          let bindValue = ''
+          const from = con.from.toLowerCase()
+          //改造，绑定值，表单列表查询字段绑定对话框时，新增的绑定字段选项
+          const bindValueField = con.bindValue && con.bindValue.toLowerCase()
           str.forEach((item) => {
             // 如果有绑定url跳转参数 需获取跳转参数的key
             if (item) {
@@ -1885,6 +1928,10 @@
                 )}¯${jumpParamKey}:${decodeURIComponent(item[returnMapKey])},`
               } else {
                 val += decodeURIComponent(item[from]) + ','
+                //绑定字段处理
+                if (bindValueField) {
+                  bindValue += decodeURIComponent(item[bindValueField]) + ','
+                }
               }
             }
           })
@@ -1900,13 +1947,28 @@
             this.modelName &&
             this.modelName.startsWith('searchForm.')
           ) {
+            const currentValue = val.substring(0, val.length - 1)
+            if (this.modelName && this.modelName.endsWith(con['target'][0])) {
+              this.$emit('updateInput', currentValue);
+            }
             let prePath = pInst['searchForm'] ? '' : 'data.'
-            utils.setValueByPath(
-              pInst,
-              prePath + 'searchForm.' + con['target'][0],
-              val.substring(0, val.length - 1),
-              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)
+
+              const anInst = pInst['searchForm'] ? pInst['searchForm'] : pInst.data.searchForm
+              //若bindKey不存在，则默认空对象，若存在，则取出bindKey
+              anInst.bindKey = anInst.bindKey || {}
+              //格式 {target: id }
+              anInst.bindKey[con['target'][0]] = bindValueField
+              //若bindValue不存在，则默认空对象，若存在，则取出bindValue
+              anInst.bindValue = anInst.bindValue || {}
+              //格式 {target: {id: xxx}}
+              anInst.bindValue[con['target'][0]] = bindValueObj
+            }
           } else {
             let configAttr = con['target'][0].split('.')
             let path = con['target'][0]

package/packages/DataLists/src/main.vue

@@ -33,7 +33,7 @@
 </template>
 <script>
   import permission from '@/mixins/permission.js'
-export default {
+  export default {
     name: 'HtDataLists',
     mixins: [permission],
     props: {
@@ -56,7 +56,6 @@ export default {
     watch: {
       options: {
         handler(val) {
-          debugger
           if (val) {
             this.tabPaneList = JSON.parse(val)
             this.activeName = this.tabPaneList[0].dataTemplateKey
@@ -114,4 +113,4 @@ export default {
       margin-top: 24px;
     }
   }
-</style>
+</style>

package/packages/QuerySqlPreview/src/QuerySqlPreview.vue

@@ -163,4 +163,46 @@ export default {
     font-weight: bold;
     color: #f56c6c;
   }
-</style>
+  ::v-deep .page-btn-count {
+    margin: 0 24px;
+    float: left;
+    padding: 10px 0;
+  }
+  ::v-deep .page-btn-total {
+    margin: 5px 0px;
+    float: left;
+    padding: 11px 0px;
+    color: #606266;
+    font-weight: normal;
+    font-size: 13px;
+  }
+  ::v-deep .pagination {
+    display: flex;
+    justify-content: flex-end;
+    padding: 10px 0;
+    float: right;
+    .el-select {
+      width: 100px;
+    }
+    .page-btn {
+      margin: 0 24px;
+    }
+    .target-page {
+      display: flex;
+      align-items: center;
+      color: #606266;
+      font-weight: normal;
+      font-size: 13px;
+      .el-input {
+        width: 50px;
+        margin: 0 3px;
+      }
+      //::v-deep input::-webkit-outer-spin-button, ::v-deep input::-webkit-inner-spin-button {
+      //  -webkit-appearance: none !important;
+      //}
+      //::v-deep input[type='number'] {
+      //  -moz-appearnce: textfield !important
+      //}
+    }
+  }
+</style>

package/packages/Subtable/src/SubExportDialog.vue

@@ -35,6 +35,16 @@
         type: String,
         default: '子表数据',
       },
+      exportMaxRow: {
+        type: [String, Number],
+      },
+      exportField: {
+        // 禁止导出的字段集合
+        type: String,
+      },
+      exportFieldTransformData: {
+        type: String,
+      },
     },
     computed: {
       columns: function() {
@@ -47,6 +57,46 @@
       }
     },
     methods: {
+      async sqlChange(config, value = '') {
+        return new Promise((resolve) => {
+          let sqlStr = config.relevancyValue
+            ? config.relevancyValue.replace(/{val}/g, value)
+            : ''
+          sqlStr = sqlStr ? sqlStr.replace(/\n/g, '') : ''
+          let params = {
+            dsName: config.dataSource,
+            sql: sqlStr,
+          }
+          this.$requestConfig.getValueBySql(params).then((res) => {
+            resolve(res)
+          })
+        })
+      },
+      transformFieldData(data) {
+        return new Promise(async (resolve) => {
+          let fieldTransformData = JSON.parse(
+            decode(this.exportFieldTransformData)
+          )
+          for (let i = 0; i < data.length; i++) {
+            for (let j = 0; j < fieldTransformData.length; j++) {
+              if (fieldTransformData[j].relevancyType == 'value') {
+                data[i][fieldTransformData[j].field] =
+                  fieldTransformData[j].relevancyValue
+              } else {
+                // 动态时 请求接口修改数据
+                let result = await this.sqlChange(
+                  fieldTransformData[j],
+                  data[i][fieldTransformData[j].field]
+                )
+                if (result) {
+                  data[i][fieldTransformData[j].field] = result
+                }
+              }
+            }
+          }
+          resolve(data)
+        })
+      },
       // 配置的数据字典 导出时翻译为汉字
       changeDictionary(data) {
         return new Promise(async (resolve, reject) => {
@@ -76,10 +126,18 @@
       },
       changeRowKey(rows) {
         var exportData = []
+        let exportFieldArr = null
+        if (this.exportField) {
+          exportFieldArr = this.exportField.split(',')
+        }
         rows.forEach((row) => {
           var exportRow = {}
           this.columns.forEach((col) => {
-            if (col.ctrlType != 'suntable') {
+            if (
+              col.ctrlType != 'suntable' &&
+              (!exportFieldArr ||
+                (exportFieldArr && !exportFieldArr.includes(col.name)))
+            ) {
               exportRow[col.desc] = row[col.name]
             }
           })
@@ -87,6 +145,25 @@
         })
         return exportData
       },
+      getConfirmValue(rows, count) {
+        return new Promise((resolve) => {
+          this.$confirm(
+            `导出数据量超出导出限制【${count}】，将导出${count}条，是否继续?`,
+            '提示',
+            {
+              confirmButtonText: '确定',
+              cancelButtonText: '取消',
+              type: 'warning',
+            }
+          )
+            .then(() => {
+              resolve(rows.slice(0, count))
+            })
+            .catch(() => {
+              resolve(false)
+            })
+        })
+      },
       handleCommand(type) {
         const pInst = utils.getOnlineFormInstance(this)
         SubPagination.exportData(
@@ -97,6 +174,20 @@
         )
           .then(async (data) => {
             data = JSON.parse(JSON.stringify(data))
+            if (this.exportMaxRow && Number(this.exportMaxRow) < data.length) {
+              let result = await this.getConfirmValue(
+                data,
+                Number(this.exportMaxRow)
+              )
+              if (result === false) {
+                return
+              }
+              data = result
+            }
+
+            if (this.exportFieldTransformData) {
+              data = await this.transformFieldData(data)
+            }
             // 导出时 字典转换
             await this.changeDictionary(data)
             let exportData = this.changeRowKey(data)

package/packages/Subtable/src/SubImportDialog.vue

@@ -102,6 +102,45 @@
         type: String,
         required: true,
       },
+      importMaxRow: {
+        type: [String, Number],
+        default: null,
+      },
+      templateType: {
+        // 导入模板类型 default 系统默认 custom 自定义
+        type: String,
+        default: 'default',
+      },
+      customTemplate: {
+        // 自定义的导入模板文件
+        type: String,
+        default: '',
+      },
+      importTransform: {
+        // 是否有转换字段
+        type: String,
+        default: '0',
+      },
+      importModes: {
+        // 导入模式选项显示
+        type: String,
+        default: 'append,override,merge',
+      },
+      fieldTransformData: {
+        // 转换字段配置
+        type: String,
+        default: '',
+      },
+      conditionRule: {
+        // 条件模式配置
+        type: String,
+        default: '',
+      },
+      conditionType: {
+        // 条件模式配置
+        type: String,
+        default: 'cover',
+      },
     },
     data() {
       return {
@@ -110,11 +149,6 @@
         showRowData: false,
         mergeFunc: null,
         mode: 'append',
-        modeOptions: [
-          { mode: 'append', desc: '追加导入' },
-          { mode: 'override', desc: '覆盖导入' },
-          { mode: 'merge', desc: '合并导入', disabled: true },
-        ],
         cacheDicData: {}, // 缓存字典数据
       }
     },
@@ -122,6 +156,30 @@
       columns: function() {
         return eval(decode(this.dataColumns))
       },
+      modeOptions() {
+        let options = [
+          { mode: 'append', desc: '追加导入' },
+          { mode: 'override', desc: '覆盖导入' },
+          { mode: 'merge', desc: '合并导入' },
+          { mode: 'condition', desc: '条件导入' },
+        ]
+        return options.filter((k) => {
+          return this.importModes.includes(k.mode)
+        })
+      },
+      conditionConfig() {
+        let config = {}
+        if (this.conditionRule) {
+          config = JSON.parse(decode(this.conditionRule))
+          config.conditionArr.forEach((k) => {
+            k.exportField = this.getNameByDesc(k.exportField)
+          })
+        }
+        return {
+          conditionType: this.conditionType,
+          ...config,
+        }
+      },
     },
     watch: {
       dialogVisible: {
@@ -139,7 +197,7 @@
         handler: function(newVal) {
           if (newVal) {
             // 如果有导入合并的代码，则允许选择合并导入模式
-            this.$set(this.modeOptions[2], 'disabled', false)
+            // this.$set(this.modeOptions[2], 'disabled', false)
             // 并设置默认为 合并导入
             this.mode = 'merge'
             // 解码合并的代码
@@ -156,6 +214,9 @@
       }
     },
     mounted() {
+      if (this.importModes) {
+        this.mode = this.importModes.split(',')[0]
+      }
       // 初始化导入时需要的参数
       const pInst = utils.getOnlineFormInstance(this)
       let formUid = pInst && pInst._uid ? pInst._uid : ''
@@ -174,6 +235,48 @@
       SubPagination.clear(this.dataSubname, this)
     },
     methods: {
+      transformFieldData(data) {
+        return new Promise(async (resolve) => {
+          if (this.importTransform === '0') {
+            resolve(data)
+            return
+          }
+          let fieldTransformData = JSON.parse(decode(this.fieldTransformData))
+          for (let i = 0; i < data.length; i++) {
+            for (let j = 0; j < fieldTransformData.length; j++) {
+              if (fieldTransformData[j].relevancyType == 'value') {
+                data[i][fieldTransformData[j].field] =
+                  fieldTransformData[j].relevancyValue
+              } else {
+                // 动态时 请求接口修改数据
+                let result = await this.sqlChange(
+                  fieldTransformData[j],
+                  data[i][fieldTransformData[j].field]
+                )
+                if (result) {
+                  data[i][fieldTransformData[j].field] = result
+                }
+              }
+            }
+          }
+          resolve(data)
+        })
+      },
+      async sqlChange(config, value = '') {
+        return new Promise((resolve) => {
+          let sqlStr = config.relevancyValue
+            ? config.relevancyValue.replace(/{val}/g, value)
+            : ''
+          sqlStr = sqlStr ? sqlStr.replace(/\n/g, '') : ''
+          let params = {
+            dsName: config.dataSource,
+            sql: sqlStr,
+          }
+          this.$requestConfig.getValueBySql(params).then((res) => {
+            resolve(res)
+          })
+        })
+      },
       changeDictionary(data) {
         return new Promise(async (resolve) => {
           for (let i = 0; i < data.length; i++) {
@@ -214,6 +317,28 @@
       },
       //子表模板导出
       exportFormSub() {
+        // 如果是自定义模板
+        if (this.templateType == 'custom' && this.customTemplate) {
+          let file = JSON.parse(decode(this.customTemplate))[0]
+          this.$requestConfig
+            .download(file.response.fileId)
+            .then(({ data, headers }) => {
+              if (data && headers) {
+                // 附件下载
+                const fileName = decodeURIComponent(
+                  headers['content-disposition']
+                    .split(';')[1]
+                    .split('filename=')[1]
+                )
+                const blob = new Blob([data])
+                saveAs(blob, fileName)
+              }
+            })
+            .catch((err) => {
+              this.$message.error(`附件下载失败：${err}`)
+            })
+          return
+        }
         let columns = this.columns.filter((item) => {
           return !(
             item.ctrlType &&
@@ -263,6 +388,7 @@
             let count = this.importRows.length
             if (count > maxRowInt && maxRowInt != 0) {
               this.$message.error('子表数据已超过最大行数【' + maxRowInt + '】')
+              this.$refs.selectFile.value = ''
               return
             }
           } else if (this.mode == 'append') {
@@ -290,13 +416,16 @@
             }
           }
         }
-        let importRows = await this.changeDictionary(this.importRows)
         const pInst = utils.getOnlineFormInstance(this.$parent.$parent)
+        let importRows = await this.changeDictionary(this.importRows)
+        // 导入如果有数据转换的此处做转换
+        importRows = await this.transformFieldData(importRows)
         SubPagination.importData(
           this.dataSubname,
           importRows,
           this.mode,
           this.mergeFunc,
+          this.conditionConfig,
           pInst
         )
           .then(() => {
@@ -304,6 +433,7 @@
             this.dialogVisible = false
           })
           .catch((err) => {
+            this.$refs.selectFile.value = ''
             this.$message.error(`数据导入失败：${err}`)
           })
       },
@@ -312,10 +442,43 @@
           return
         }
         this.importRows = []
-        this.readWorkbookFromLocalFile(m.target.files[0], (rows) => {
+        this.readWorkbookFromLocalFile(m.target.files[0], async (rows) => {
+          if (this.importMaxRow) {
+            let count = rows.length
+            if (count > parseInt(this.importMaxRow)) {
+              let result = await this.getConfirmValue(
+                rows,
+                parseInt(this.importMaxRow)
+              )
+              if (result === false) {
+                this.$refs.selectFile.value = ''
+                return
+              }
+              rows = result
+            }
+          }
           this.importRows = this.changeRowKey(rows)
         })
       },
+      getConfirmValue(rows, count) {
+        return new Promise((resolve) => {
+          this.$confirm(
+            `导入数据量已超过最大限制，将默认导入前【${count}】条，是否继续？`,
+            '提示',
+            {
+              confirmButtonText: '确定',
+              cancelButtonText: '取消',
+              type: 'warning',
+            }
+          )
+            .then(() => {
+              resolve(rows.slice(0, count))
+            })
+            .catch(() => {
+              resolve(false)
+            })
+        })
+      },
       // 读取本地excel文件
       readWorkbookFromLocalFile(file, callback) {
         const reader = new FileReader()

package/packages/TableSearchField/src/main.vue

@@ -15,6 +15,7 @@
       :class="{ 'is-align-right': isAlignRight }"
     >
       <label v-if="label" v-ellipsis :title="label" class="search-field-label">
+        <span v-if="isRequired" class="red-color">*</span>
         {{ label }}
       </label>
     </div>
@@ -167,6 +168,7 @@
         type: Boolean,
         default: false,
       },
+      isRequired: Boolean,
     },
     data() {
       return {
@@ -317,6 +319,9 @@
     display: inline-block;
     max-width: calc(100% - 10px);
     line-height: 100%;
+    .red-color {
+      color: #f56c6c;
+    }
 
     &::after {
       content: ':';

package/packages/TemplatePreview/src/TemplatePreview.vue

@@ -223,6 +223,49 @@
     margin: 0;
     padding: 0;
   }
+  ::v-deep .page-btn-count {
+    margin: 0 24px;
+    float: left;
+    padding: 10px 0;
+  }
+  ::v-deep .page-btn-total {
+    margin: 5px 0px;
+    float: left;
+    padding: 11px 0px;
+    color: #606266;
+    font-weight: normal;
+    font-size: 13px;
+  }
+  ::v-deep .pagination {
+    display: flex;
+    justify-content: flex-end;
+    padding: 10px 0;
+    float: right;
+    .el-select {
+      width: 100px;
+    }
+    .page-btn {
+      margin: 0 24px;
+    }
+
+    .target-page {
+      display: flex;
+      align-items: center;
+      color: #606266;
+      font-weight: normal;
+      font-size: 13px;
+      .el-input {
+        width: 50px;
+        margin: 0 3px;
+      }
+      //::v-deep input::-webkit-outer-spin-button, ::v-deep input::-webkit-inner-spin-button {
+      //  -webkit-appearance: none !important;
+      //}
+      //::v-deep input[type='number'] {
+      //  -moz-appearnce: textfield !important
+      //}
+    }
+  }
 </style>
 <style lang="scss">
   .template-dropdown {

package/src/directive/formulas.js

@@ -845,5 +845,5 @@ const Formulas = {
 Formulas.install = (Vue) => {
   Vue.prototype.$Formulas = Formulas
 }
-
+window.FormMath = Formulas
 export { formula, Formulas }