three-trees-ui 1.0.45 → 1.0.47

package/package.json

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

package/packages/Button/src/main.vue

@@ -18,7 +18,7 @@
       type="text"
       :permission="permission_sub"
     >
-      <template v-if="inputWriteable" slot="append">
+      <template v-if="comWriteable" slot="append">
         <el-button
           btn="btn"
           :size="inputSize"
@@ -32,7 +32,7 @@
     </ht-input>
     <el-button
       v-else
-      :disabled="!inputWriteable"
+      :disabled="!comWriteable"
       btn="btn"
       :size="inputSize"
       type="primary"
@@ -57,6 +57,11 @@
       icon: String,
       btnName: String,
       isShowInput: Boolean,
+      statusAndAvailable: {
+        //表单查看状态下是否可用
+        type: Boolean,
+        default: false,
+      },
     },
     computed: {
       inputVal: {
@@ -67,6 +72,13 @@
           this.$emit('input', val)
         },
       },
+      comWriteable() {
+        if (this.statusAndAvailable) {
+          return this.statusAndAvailable
+        } else {
+          return this.inputWriteable
+        }
+      },
     },
     methods: {
       customEvilJS() {

package/packages/CustomDialog/src/customDialog.vue

@@ -229,7 +229,7 @@
               >
                 <ht-custom-dialog
                   v-model="queryParams[index][condition.field]"
-                  :model-name="condition.config.keyBind"
+                  :model-name="condition.config.valueBind"
                   dialogType="search"
                   :custdialog="{
                     name: '请选择',
@@ -1684,8 +1684,9 @@
         // 如果是查询中使用的对话框
         if (this.dialogType == 'search') {
           let returnVal = []
+          let from = this.modelName.toLowerCase()
           str.forEach((item) => {
-            returnVal.push(decodeURIComponent(item[this.modelName]))
+            returnVal.push(decodeURIComponent(item[from]))
           })
           this.$emit('updateInput', returnVal.join(','))
           return

package/packages/File/src/main.vue

@@ -121,7 +121,7 @@
       type: {
         type: String,
         default: 'table',
-        validator: function(value) {
+        validator: function (value) {
           return ['table', 'list', 'card'].indexOf(value) !== -1
         },
       },
@@ -230,7 +230,7 @@
       }
     },
     computed: {
-      typeVal: function() {
+      typeVal: function () {
         return this.isSimple || this.simplicity ? 'list' : this.type
       },
       inputsContainerWidth() {
@@ -238,7 +238,7 @@
           ? { width: 'auto' }
           : {}
       },
-      actionUrlVal: function() {
+      actionUrlVal: function () {
         return this.actionUrl
           ? this.actionUrl
           : this.$requestConfig.uploadUrl
@@ -262,14 +262,14 @@
         }
         return baseUrl
       },
-      headerVal: function() {
+      headerVal: function () {
         return this.header
           ? this.header
           : this.$requestConfig.header
           ? this.$requestConfig.header()
           : null
       },
-      acceptType: function() {
+      acceptType: function () {
         if (this.accept) {
           const ary = []
           this.accept.split(',').forEach((m) => {
@@ -283,10 +283,10 @@
         }
         return null
       },
-      previewableVal: function() {
+      previewableVal: function () {
         return (this.inputWriteable && this.previewable) || this.allowPreview
       },
-      downloadableVal: function() {
+      downloadableVal: function () {
         return (this.inputWriteable && this.downloadable) || this.allowDownload
       },
     },
@@ -472,7 +472,13 @@
         if (this.previewableVal) {
           // 当前组件未添加preview事件监听 并且 设置了全局预览方法
           if (!this._events.preview && this.$preview) {
-            this.$preview(file)
+            if (this.isMobile) {
+              this.$preview(file)
+            } else {
+              let token = this.$requestConfig.getToken().replace('Bearer ', '')
+              let url = `${window.context.front}/previewFile/${file.response.fileId}/${file.response.fileName}?token=${token}`
+              window.open(url, '_blank')
+            }
           } else {
             this.$emit('preview', file, this.inputVal)
           }

package/packages/Preview/src/main.vue

@@ -164,14 +164,14 @@
       }
     },
     computed: {
-      headerVal: function() {
+      headerVal: function () {
         return this.headers
           ? this.headers
           : this.$requestConfig.header
           ? this.$requestConfig.header()
           : null
       },
-      titleVal: function() {
+      titleVal: function () {
         return this.tempTitle ? this.tempTitle : this.title
       },
     },
@@ -180,6 +180,7 @@
         this.src = null
         this.mode = null
         this.errorMessage = null
+        this.$emit('handleClosePreview')
       },
       handlePreviewErr(err) {
         this.errorMessage = `预览失败：${err}`

package/packages/TemplateForm/src/main.vue

@@ -145,7 +145,7 @@
       },
     },
     watch: {
-      templateKey: function (n, o) {
+      templateKey: function(n, o) {
         if (n && o && n != o) {
           this.init()
         }
@@ -201,8 +201,9 @@
       printDetail() {
         this.$refs.btnRegion.style.display = 'none'
         setTimeout(() => {
-          document.body.innerHTML =
-            document.getElementsByClassName('custom-form')[0].innerHTML
+          document.body.innerHTML = document.getElementsByClassName(
+            'custom-form'
+          )[0].innerHTML
           window.print()
           this.$refs.btnRegion.style.display = 'block'
           location.reload()
@@ -255,9 +256,6 @@
               .then((result) => {
                 if (result.state) {
                   if (this.closeSave) {
-                    if (this.isMobile) {
-                      this.$notify({ type: 'success', message: result.message })
-                    }
                     this.close()
                     return
                   }
@@ -288,10 +286,7 @@
                   this.disabled = false
                 }
               })
-              .catch((err) => {
-                if (this.isMobile) {
-                  this.$notify.error(err)
-                }
+              .catch(() => {
                 this.disabled = false
               })
           })

package/src/directive/formulas.js

@@ -310,7 +310,7 @@ const Formulas = {
     let num = 0
     args.forEach((item) => {
       item = Formulas.parseNumber(item)
-      num += item
+      num = Formulas.floatAdd(num, item)
     })
     return num
   },
@@ -693,6 +693,137 @@ const Formulas = {
     }
     return new Date(Date.parse(str.replace(/-/g, '/')))
   },
+  //格式化
+  toNonExponential(num) {
+    if (num == null) {
+      return num
+    }
+    if (typeof num == 'number') {
+      var m = num.toExponential().match(/\d(?:\.(\d*))?e([+-]\d+)/)
+      return num.toFixed(Math.max(0, (m[1] || '').length - m[2]))
+    } else {
+      return num
+    }
+  },
+  // 加
+  floatAdd(arg1, arg2) {
+    arg1 = Number(arg1) || 0
+    arg2 = Number(arg2) || 0
+    arg1 = Formulas.toNonExponential(arg1)
+    arg2 = Formulas.toNonExponential(arg2)
+    var r1, r2, m
+    try {
+      r1 = arg1.toString().split('.')[1].length
+    } catch (e) {
+      r1 = 0
+    }
+    try {
+      r2 = arg2.toString().split('.')[1].length
+    } catch (e) {
+      r2 = 0
+    }
+    m = Math.pow(10, Math.max(r1, r2))
+    return (
+      (Formulas.floatMultiply(arg1, m) + Formulas.floatMultiply(arg2, m)) / m
+    )
+  },
+  // 减
+  floatSub(arg1, arg2) {
+    arg1 = Number(arg1) || 0
+    arg2 = Number(arg2) || 0
+    arg1 = Formulas.toNonExponential(arg1)
+    arg2 = Formulas.toNonExponential(arg2)
+    var r1, r2, m, n
+    try {
+      r1 = arg1.toString().split('.')[1].length
+    } catch (e) {
+      r1 = 0
+    }
+    try {
+      r2 = arg2.toString().split('.')[1].length
+    } catch (e) {
+      r2 = 0
+    }
+    m = Math.pow(10, Math.max(r1, r2))
+    // 动态控制精度长度
+    n = r1 >= r2 ? r1 : r2
+    return (
+      (Formulas.floatMultiply(arg1, m) - Formulas.floatMultiply(arg2, m)) /
+      m
+    ).toFixed(n)
+  },
+  //乘
+  floatMultiply(arg1, arg2) {
+    arg1 = Number(arg1)
+    arg2 = Number(arg2)
+    if ((!arg1 && arg1 !== 0) || (!arg2 && arg2 !== 0)) {
+      return null
+    }
+    arg1 = Formulas.toNonExponential(arg1)
+    arg2 = Formulas.toNonExponential(arg2)
+    var n1, n2
+    var r1, r2 // 小数位数
+    try {
+      r1 = arg1.toString().split('.')[1].length
+    } catch (e) {
+      r1 = 0
+    }
+    try {
+      r2 = arg2.toString().split('.')[1].length
+    } catch (e) {
+      r2 = 0
+    }
+    n1 = Number(arg1.toString().replace('.', ''))
+    n2 = Number(arg2.toString().replace('.', ''))
+    return (n1 * n2) / Math.pow(10, r1 + r2)
+  },
+  //除
+  floatDivide(arg1, arg2) {
+    arg1 = Number(arg1)
+    arg2 = Number(arg2)
+    if (!arg2) {
+      return null
+    }
+    if (!arg1 && arg1 !== 0) {
+      return null
+    } else if (arg1 === 0) {
+      return 0
+    }
+    arg1 = Formulas.toNonExponential(arg1)
+    arg2 = Formulas.toNonExponential(arg2)
+    var n1, n2
+    var r1, r2 // 小数位数
+    try {
+      r1 = arg1.toString().split('.')[1].length
+    } catch (e) {
+      r1 = 0
+    }
+    try {
+      r2 = arg2.toString().split('.')[1].length
+    } catch (e) {
+      r2 = 0
+    }
+    n1 = Number(arg1.toString().replace('.', ''))
+    n2 = Number(arg2.toString().replace('.', ''))
+    return Formulas.floatMultiply(n1 / n2, Math.pow(10, r2 - r1))
+  },
+  //余
+  floatMod(arg1, arg2) {
+    arg1 = Number(arg1)
+    arg2 = Number(arg2)
+    if (!arg2) {
+      return null
+    }
+    if (!arg1 && arg1 !== 0) {
+      return null
+    } else if (arg1 === 0) {
+      return 0
+    }
+    let intNum = arg1 / arg2
+    intNum = intNum < 0 ? Math.ceil(arg1 / arg2) : Math.floor(arg1 / arg2) // -1.02 取整为 -1; 1.02取整为1
+    let intVal = Formulas.floatMultiply(intNum, arg2)
+    return Formulas.floatSub(arg1, intVal)
+  },
   getArrayByPath(obj) {
     let array = []
     if (!obj.data) return array

package/src/mixins/templatePreview.js

@@ -11,7 +11,7 @@ const { saveAs } = require('file-saver')
 import _ from 'lodash'
 import { decode } from '@/util/base64'
 
-const req = function (url, data = {}, option = {}) {
+const req = function(url, data = {}, option = {}) {
   const requestData = {
     url: url,
     data: data,
@@ -251,7 +251,7 @@ export default {
       deep: true,
     },
     ents: {
-      handler: function (newVal, oldValue) {
+      handler: function(newVal, oldValue) {
         if (newVal && newVal.length >= 1 && newVal != oldValue) {
           this.getSubData(this, this.refId)
         }
@@ -260,7 +260,7 @@ export default {
       immediate: true,
     },
     templateInfo: {
-      handler: function (newVal) {
+      handler: function(newVal) {
         if (newVal && newVal.id) {
           let _me = this
           _me.templateInfo = newVal
@@ -380,13 +380,13 @@ export default {
       deep: true,
       immediate: true,
     },
-    currentTabName: function (newVal) {
+    currentTabName: function(newVal) {
       if (newVal) {
         this.querySubValue = ''
       }
     },
     rows: {
-      handler: function (newVal) {
+      handler: function(newVal) {
         if (this.templateInfo.defId) {
           let this_ = this
           let boAlias = this.templateInfo.boDefAlias
@@ -430,8 +430,9 @@ export default {
       if (val) {
         this.$nextTick(() => {
           if (document.getElementById('summaryDiv')) {
-            this.summaryTableHeight =
-              document.getElementById('summaryDiv').clientHeight
+            this.summaryTableHeight = document.getElementById(
+              'summaryDiv'
+            ).clientHeight
           }
         })
       }
@@ -442,7 +443,7 @@ export default {
       //如果当前页面被嵌入iframe里面不显示草稿
       return !this.isJoinFlow
     },
-    navbarCollapseStyle: function () {
+    navbarCollapseStyle: function() {
       if (this.asideShow) {
         return { left: '200px' }
       }
@@ -481,7 +482,7 @@ export default {
     })
     this.handelBindFiledValua()
     let this_ = this
-    this.$on('data-reload-success', function () {
+    this.$on('data-reload-success', function() {
       this_.calcScriptBtnPermission()
     })
     this.$emit('afterMounted')
@@ -807,7 +808,7 @@ export default {
           this.listSelectable = false
         }
         let _this = this
-        setTimeout(function () {
+        setTimeout(function() {
           let tdDom = _this.$el.querySelector('td.right_menu')
           if (
             !tdDom ||
@@ -912,7 +913,7 @@ export default {
               selectList[i].selectValue = value
 
               //添加监听
-              pInst.$watch(path, function (newVal, oldVal) {
+              pInst.$watch(path, function(newVal, oldVal) {
                 // 监听中使用间隔请求，减少请求次数
                 clearTimeout(this.timeout)
                 this.timeout = setTimeout(() => {
@@ -935,7 +936,7 @@ export default {
               const value = utils.getValueByPath(pInst, path)
 
               bindList[i].fillValue = value
-              pInst.$watch(path, function (newVal, oldVal) {
+              pInst.$watch(path, function(newVal, oldVal) {
                 // 监听中使用间隔请求，减少请求次数
                 clearTimeout(this.timeout)
                 this.timeout = setTimeout(() => {
@@ -1193,7 +1194,7 @@ export default {
         }
         let msg = document.createElement('canvas')
 
-        this.$qrcode.toCanvas(msg, QRCodeurl, function (error) {
+        this.$qrcode.toCanvas(msg, QRCodeurl, function(error) {
           console.error(error)
         })
         let _canvas = document.createElement('div')
@@ -1233,7 +1234,7 @@ export default {
           .generateAsync({
             type: 'blob',
           })
-          .then(function (content) {
+          .then(function(content) {
             let eleLink = document.createElement('a')
             eleLink.download = '二维码.zip'
             eleLink.style.display = 'none'
@@ -1286,7 +1287,7 @@ export default {
         context.scale(2, 2)
         return html2canvas(document.querySelector(classs), {
           canvas: canvas2,
-        }).then(function (canvas) {
+        }).then(function(canvas) {
           resolve(canvas)
         })
       })
@@ -1328,7 +1329,7 @@ export default {
       // Base64.encode(this.$store.state.login.currentUser.account);
       let msg = document.getElementById('QRCode')
 
-      this.$qrcode.toCanvas(msg, this.QRCodeurl, function (error) {
+      this.$qrcode.toCanvas(msg, this.QRCodeurl, function(error) {
         console.log(error)
       })
       this.QRCodeShow = true
@@ -1351,13 +1352,13 @@ export default {
       this.rowTemplateId = templateId
       this.rowId = id
     },
-    handleSizeChange: function (size) {
+    handleSizeChange: function(size) {
       //每页下拉显示数据
       this.pagination.page = 1
       this.pagination.pageSize = size
       this.$refs.multipleTemplateTable.handleFilterChange()
     },
-    handleCurrentChange: function (currentPage) {
+    handleCurrentChange: function(currentPage) {
       //点击第几页
       this.pagination.page = currentPage
       this.$refs.multipleTemplateTable.handleFilterChange()
@@ -1859,10 +1860,18 @@ 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
@@ -1888,10 +1897,18 @@ 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('type')
-            operationMap[$(searchItems[i]).children().attr('ht-query')] =
+            operation = $(searchItems[i])
+              .children()
+              .attr('type')
+            operationMap[
+              $(searchItems[i])
+                .children()
+                .attr('ht-query')
+            ] =
               typeof operationType[operation] != 'undefined'
                 ? operationType[operation]
                 : operation
@@ -1914,12 +1931,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
           }
@@ -1987,7 +2011,7 @@ export default {
       }
     },
     //回车查询
-    searchEnterFun: function (e) {
+    searchEnterFun: function(e) {
       let keyCode = window.event ? e.keyCode : e.which
       if (keyCode == 13) {
         this.search()
@@ -2106,6 +2130,18 @@ export default {
       openType,
       quitAfterSaving
     ) {
+      let customTitleName =
+        action == 'addFlow'
+          ? `${this.templateInfo.subject || this.templateInfo.formName}`
+          : `${this.templateInfo.formName}-${
+              action == 'add'
+                ? '新增'
+                : action == 'edit'
+                ? '编辑'
+                : action == 'get'
+                ? '明细'
+                : ''
+            }`
       //isStartFlow （false：可以发起流程，true：不可以发起流程）
       if (this.templateInfo.manageField && !isStartFlow) {
         //先配置不能发起流程
@@ -2197,6 +2233,7 @@ export default {
             path: path + '&isNewPage=true',
             query: {
               quitAfterSaving,
+              customTitleName,
             },
           }).href,
           '_blank'
@@ -2224,6 +2261,7 @@ export default {
           path,
           query: {
             quitAfterSaving,
+            customTitleName,
           },
         })
       }