three-trees-ui 1.0.62 → 1.0.64

package/package.json

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

package/packages/CustomDialog/src/customDialog.vue

@@ -1137,11 +1137,8 @@
         }
         const pInst = utils.getOnlineFormInstance(this)
         this.selectOrgs = this.convertComment2Field(str, field)
-          this.custdialog.custDialog.mappingConf.forEach((con) => {
-          let val = ''
-          let bindValue = ''
-          //改造，绑定值，表单列表查询字段绑定对话框时，新增的绑定字段选项
-          const bindValueField = con.bindValue && con.bindValue.toLowerCase()
+        this.custdialog.custDialog.mappingConf.forEach((con) => {
+          var val = ''
           str.forEach((item, index) => {
             // 此处添加url跳转参数保存逻辑
             if (
@@ -1162,10 +1159,6 @@
               },`
             } else {
               val += item[con.from] + ','
-              //绑定字段处理
-              if (bindValueField) {
-                bindValue += item[bindValueField] + ','
-              }
             }
           })
           if (this.modelName == 'data.' + con['target'][0]) {
@@ -1182,22 +1175,6 @@
               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]
@@ -1226,22 +1203,6 @@
                 _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
-              }
             }
           }
         })
@@ -1895,11 +1856,8 @@
         }
         const pInst = utils.getOnlineFormInstance(this)
         this.custdialog.custDialog.mappingConf.forEach((con) => {
-          let val = ''
-          let bindValue = ''
-          const from = con.from.toLowerCase()
-          //改造，绑定值，表单列表查询字段绑定对话框时，新增的绑定字段选项
-          const bindValueField = con.bindValue && con.bindValue.toLowerCase()
+          var val = ''
+          var from = con.from.toLowerCase()
           str.forEach((item) => {
             // 如果有绑定url跳转参数 需获取跳转参数的key
             if (item) {
@@ -1927,10 +1885,6 @@
                 )}¯${jumpParamKey}:${decodeURIComponent(item[returnMapKey])},`
               } else {
                 val += decodeURIComponent(item[from]) + ','
-                //绑定字段处理
-                if (bindValueField) {
-                  bindValue += decodeURIComponent(item[bindValueField]) + ','
-                }
               }
             }
           })
@@ -1953,22 +1907,6 @@
               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]

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,6 +56,7 @@
     watch: {
       options: {
         handler(val) {
+          debugger
           if (val) {
             this.tabPaneList = JSON.parse(val)
             this.activeName = this.tabPaneList[0].dataTemplateKey
@@ -113,4 +114,4 @@
       margin-top: 24px;
     }
   }
-</style>
+</style>

package/packages/Subtable/src/SubExportDialog.vue

@@ -35,16 +35,6 @@
         type: String,
         default: '子表数据',
       },
-      exportMaxRow: {
-        type: [String, Number],
-      },
-      exportField: {
-        // 禁止导出的字段集合
-        type: String,
-      },
-      exportFieldTransformData: {
-        type: String,
-      },
     },
     computed: {
       columns: function() {
@@ -57,44 +47,6 @@
       }
     },
     methods: {
-      async sqlChange(config, value = '') {
-        return new Promise((resolve) => {
-          let params = {
-            dsName: config.dataSource,
-            sql: config.relevancyValue
-              ? config.relevancyValue.replace(/{val}/g, value)
-              : '',
-          }
-          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) => {
@@ -124,18 +76,10 @@
       },
       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' &&
-              (!exportFieldArr ||
-                (exportFieldArr && !exportFieldArr.includes(col.name)))
-            ) {
+            if (col.ctrlType != 'suntable') {
               exportRow[col.desc] = row[col.name]
             }
           })
@@ -143,25 +87,6 @@
         })
         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(
@@ -172,20 +97,6 @@
         )
           .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,45 +102,6 @@
         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 {
@@ -149,6 +110,11 @@
         showRowData: false,
         mergeFunc: null,
         mode: 'append',
+        modeOptions: [
+          { mode: 'append', desc: '追加导入' },
+          { mode: 'override', desc: '覆盖导入' },
+          { mode: 'merge', desc: '合并导入', disabled: true },
+        ],
         cacheDicData: {}, // 缓存字典数据
       }
     },
@@ -156,30 +122,6 @@
       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: {
@@ -197,7 +139,7 @@
         handler: function(newVal) {
           if (newVal) {
             // 如果有导入合并的代码，则允许选择合并导入模式
-            // this.$set(this.modeOptions[2], 'disabled', false)
+            this.$set(this.modeOptions[2], 'disabled', false)
             // 并设置默认为 合并导入
             this.mode = 'merge'
             // 解码合并的代码
@@ -214,13 +156,11 @@
       }
     },
     mounted() {
-      if (this.importModes) {
-        this.mode = this.importModes.split(',')[0]
-      }
       // 初始化导入时需要的参数
       const pInst = utils.getOnlineFormInstance(this)
-      if (!SubPagination._map.has(this.dataSubname)) {
-        SubPagination.set(this.dataSubname, {
+      let formUid = pInst && pInst._uid ? pInst._uid : ''
+      if (!SubPagination._map.has(this.dataSubname + formUid)) {
+        SubPagination.set(this.dataSubname + formUid, {
           rows: this.rows || [],
         })
       }
@@ -231,49 +171,9 @@
       }
     },
     destroyed() {
-      SubPagination.clear(this.dataSubname)
+      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 params = {
-            dsName: config.dataSource,
-            sql: config.relevancyValue
-              ? config.relevancyValue.replace(/{val}/g, value)
-              : '',
-          }
-          this.$requestConfig.getValueBySql(params).then((res) => {
-            resolve(res)
-          })
-        })
-      },
       changeDictionary(data) {
         return new Promise(async (resolve) => {
           for (let i = 0; i < data.length; i++) {
@@ -314,28 +214,6 @@
       },
       //子表模板导出
       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 &&
@@ -385,7 +263,6 @@
             let count = this.importRows.length
             if (count > maxRowInt && maxRowInt != 0) {
               this.$message.error('子表数据已超过最大行数【' + maxRowInt + '】')
-              this.$refs.selectFile.value = ''
               return
             }
           } else if (this.mode == 'append') {
@@ -414,21 +291,17 @@
           }
         }
         let importRows = await this.changeDictionary(this.importRows)
-        // 导入如果有数据转换的此处做转换
-        importRows = await this.transformFieldData(importRows)
         SubPagination.importData(
           this.dataSubname,
           importRows,
           this.mode,
-          this.mergeFunc,
-          this.conditionConfig
+          this.mergeFunc
         )
           .then(() => {
             this.$message.success('导入成功！')
             this.dialogVisible = false
           })
           .catch((err) => {
-            this.$refs.selectFile.value = ''
             this.$message.error(`数据导入失败：${err}`)
           })
       },
@@ -437,43 +310,10 @@
           return
         }
         this.importRows = []
-        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.readWorkbookFromLocalFile(m.target.files[0], (rows) => {
           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/Subtable/src/SubPagination.vue

@@ -12,6 +12,7 @@
 </template>
 <script>
   import SubPagination from '@/services/SubPagination.js'
+  import utils from '@/utils.js'
 
   export default {
     name: 'HtSubPagination',
@@ -75,7 +76,9 @@
             throw 'EipSubPagination组件的rows属性只能传入数组'
           }
           if (newVal.length > 0) {
-            var obj = SubPagination._map.get(this.dataSubname)
+            const pInst = utils.getOnlineFormInstance(this)
+            let formUid = pInst && pInst._uid ? pInst._uid : ''
+            var obj = SubPagination._map.get(this.dataSubname + formUid)
             if (obj && obj.rows.length == 0) this.paginationChange()
           }
           // 子表数据变化时更新分页总数
@@ -104,12 +107,14 @@
       this.paginationChange()
     },
     destroyed() {
-      SubPagination.clear(this.dataSubname)
+      SubPagination.clear(this.dataSubname, this)
     },
     methods: {
       paginationChange() {
         // 分页变化时，以dataPath为key设置到公共的js对象中
-        SubPagination.set(this.dataSubname, {
+        const pInst = utils.getOnlineFormInstance(this)
+        let formUid = pInst && pInst._uid ? pInst._uid : ''
+        SubPagination.set(this.dataSubname + formUid, {
           rows: this.rows || [],
           currentPage: this.myCurrentPage,
           pageSize: this.myPageSize,

package/packages/TableSearchField/src/main.vue

@@ -15,7 +15,6 @@
       :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>
@@ -168,7 +167,6 @@
         type: Boolean,
         default: false,
       },
-      isRequired: Boolean,
     },
     data() {
       return {
@@ -319,9 +317,6 @@
     display: inline-block;
     max-width: calc(100% - 10px);
     line-height: 100%;
-    .red-color {
-      color: #f56c6c;
-    }
 
     &::after {
       content: ':';

package/src/directive/formulas.js

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