three-trees-ui 1.0.46 → 1.0.48

package/package.json

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

package/packages/CustomDialog/src/customDialog.js

@@ -11,12 +11,13 @@ export default {
       total: 0,
       form: {},
       itemSavestate: {},
+      loadingInstance: null,
     }
   },
   methods: {
     //更新对话框数据
     setDialogData(data) {
-      data.forEach(item => {
+      data.forEach((item) => {
         delete item.row_id
       })
       if (this.isMobile && this.pagination && this.pagination.page > 1) {
@@ -25,12 +26,19 @@ export default {
         this.dialogData = data
       }
     },
+    closeLoadingInstance() {
+      if (this.loadingInstance) {
+        this.loadingInstance.close()
+      }
+    },
     getDialoglistJson(pagination) {
-      let loadingInstance
       if (this.isMobile) {
         this.$showLoading()
       } else {
-        loadingInstance = Loading.service({ fullscreen: true, text: '查询中...' })
+        this.loadingInstance = Loading.service({
+          fullscreen: true,
+          text: '查询中...',
+        })
       }
       return this.$requestConfig
         .request({
@@ -42,13 +50,13 @@ export default {
           if (this.isMobile) {
             this.$cancelLoading()
           } else {
-            loadingInstance.close()
+            this.loadingInstance.close()
           }
           const listKey = pagination.listKey
             ? pagination.listKey
             : pagination.dsType && pagination.dsType == 'dataSource'
-              ? 'rows'
-              : ''
+            ? 'rows'
+            : ''
           if (!listKey) {
             console.warn(
               '自定义对话框未获取到数据返回的listKey，数据加载可能产生异常。'
@@ -78,11 +86,12 @@ export default {
           }
           this.setPagination(pageBean)
           this.setTodoRows(rows) //列表数据
-        }).catch(err=>{
+        })
+        .catch(() => {
           if (this.isMobile) {
             this.$cancelLoading()
           } else {
-            loadingInstance.close()
+            this.loadingInstance.close()
           }
         })
     },

package/packages/CustomDialog/src/customDialog.vue

@@ -77,8 +77,8 @@
               </div>
               <!-- 下拉框 -->
               <div
-                class="search-item_main"
                 v-if="condition.controllerType == '3'"
+                class="search-item_main"
               >
                 <!-- 静态选项 -->
                 <ht-select
@@ -126,7 +126,7 @@
                         ? 'yyyy-MM-dd HH:mm:ss'
                         : condition.config.inputFormat
                     "
-                    :valueFormat="
+                    :value-format="
                       condition.config.inputFormat.includes('mm:ss')
                         ? 'yyyy-MM-dd HH:mm:ss'
                         : condition.config.inputFormat
@@ -140,7 +140,7 @@
                         ? 'yyyy-MM-dd HH:mm:ss'
                         : condition.config.inputFormat
                     "
-                    :valueFormat="
+                    :value-format="
                       condition.config.inputFormat.includes('mm:ss')
                         ? 'yyyy-MM-dd HH:mm:ss'
                         : condition.config.inputFormat
@@ -148,14 +148,14 @@
                   ></ht-date>
                 </div>
                 <ht-date
-                  v-model="queryParams[index][condition.field]"
                   v-else
+                  v-model="queryParams[index][condition.field]"
                   :format="
                     condition.config.inputFormat.includes('mm:ss')
                       ? 'yyyy-MM-dd HH:mm:ss'
                       : condition.config.inputFormat
                   "
-                  :valueFormat="
+                  :value-format="
                     condition.config.inputFormat.includes('mm:ss')
                       ? 'yyyy-MM-dd HH:mm:ss'
                       : condition.config.inputFormat
@@ -230,7 +230,7 @@
                 <ht-custom-dialog
                   v-model="queryParams[index][condition.field]"
                   :model-name="condition.config.valueBind"
-                  dialogType="search"
+                  dialog-type="search"
                   :custdialog="{
                     name: '请选择',
                     icon: '',
@@ -264,7 +264,7 @@
               </el-button>
             </div>
           </el-header>
-          <el-main class="custom-dialog_main" ref="customTableRef">
+          <el-main ref="customTableRef" class="custom-dialog_main">
             <el-table
               ref="orgTable"
               :data="dialogData"
@@ -1571,6 +1571,7 @@
         const this_ = this
         this_.queryParam = ''
         this.setDialogData([])
+        this.closeLoadingInstance()
         this_.customDialogShowList = false
         //判断是否是点击了确认再点击取消的  inputVal没有值则表示直接点击的取消
         if (!this_.inputVal) {

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