three-trees-ui 1.0.66 → 1.0.67

package/src/services/SubPagination.js

@@ -29,7 +29,7 @@ const SubPagination = {
     return `${path}:VueComponent`
   },
   // 导入数据
-  importData: (path, importRows, mode, mergeMethod, conditionConfig) => {
+  importData: (path, importRows, mode, mergeMethod) => {
     return new Promise((resolve, reject) => {
       const pInst = utils.getOnlineFormInstance(this)
       let formUid = pInst && pInst._uid ? pInst._uid : ''
@@ -62,45 +62,6 @@ const SubPagination = {
             utils.setValueByPath(inst, path, newRows)
             break
           }
-          case 'condition': {
-            importRows.forEach((item) => {
-              let index = array.findIndex((sub) => {
-                let orArr = conditionConfig.conditionArr.filter((condition) => {
-                  return condition.relation == 'or'
-                })
-                let andArr = conditionConfig.conditionArr.filter(
-                  (condition) => {
-                    return condition.relation == 'and'
-                  }
-                )
-                let orFlag = true
-                let andFlag = true
-                if (orArr.length) {
-                  orFlag = orArr.some((j) => {
-                    return sub[j.subField] == item[j.exportField]
-                  })
-                }
-                if (andArr.length) {
-                  andFlag = andArr.every((j) => {
-                    return sub[j.subField] == item[j.exportField]
-                  })
-                }
-                return orFlag && andFlag
-              })
-              if (index != -1) {
-                let updateArr = conditionConfig.backField.split(',')
-                updateArr.forEach((field) => {
-                  array[index][field] = item[field]
-                })
-              } else {
-                // 未匹配到时是否新增
-                if (conditionConfig.conditionType == 'add') {
-                  array.push(item)
-                }
-              }
-            })
-            utils.setValueByPath(inst, path, array)
-          }
         }
         obj.rows = utils.getValueByPath(inst, path)
         SubPagination._digest(obj.rows)

package/src/utils.js

@@ -955,7 +955,7 @@ var utils = {
     }
     const keyPath = config[key]
     // 获取当前组件所在的表单
-    const formInst = utils.getOnlineFormInstance(inst)
+    const formInst = utils.getOnlineFormInstance(inst.$parent)
     // 获取当前组件是否在子表中的某一行
     const { subScopeEl, index, subname } = utils.getSubScopeElAndIndex(inst.$el)
     if (subScopeEl) {
@@ -1256,35 +1256,4 @@ Date.prototype.format = function(format) {
   return format
 }
 
-//精确四舍五入
-Number.prototype.toFixedRound = function(d) {
-  d = Number(d)
-  var s = this + ''
-  if (!d) d = 0
-  if (s.indexOf('.') == -1) s += '.'
-  s += new Array(d + 1).join('0')
-  if (new RegExp('^(-|\\+)?(\\d+(\\.\\d{0,' + (d + 1) + '})?)\\d*$').test(s)) {
-    var s = '0' + RegExp.$2,
-      pm = RegExp.$1,
-      a = RegExp.$3.length,
-      b = true
-    if (a == d + 2) {
-      a = s.match(/\d/g)
-      if (parseInt(a[a.length - 1]) > 4) {
-        for (var i = a.length - 2; i >= 0; i--) {
-          a[i] = parseInt(a[i]) + 1
-          if (a[i] == 10) {
-            a[i] = 0
-            b = i != 1
-          } else break
-        }
-      }
-      s = a.join('').replace(new RegExp('(\\d+)(\\d{' + d + '})\\d$'), '$1.$2')
-    }
-    if (b) s = s.substr(1)
-    return (pm + s).replace(/\.$/, '')
-  }
-  return this + ''
-}
-
 export default utils