three-trees-ui 1.0.63 → 1.0.65

package/src/services/SubPagination.js

@@ -13,7 +13,9 @@ const SubPagination = {
   },
   // 销毁path对象的数据
   clear: (path) => {
-    SubPagination._map.delete(path)
+    const pInst = utils.getOnlineFormInstance(this)
+    let formUid = pInst && pInst._uid ? pInst._uid : ''
+    SubPagination._map.delete(path + formUid)
     SubPagination._map.delete(SubPagination._vueComponentKey(path))
   },
   // 消化子表数据变化，触发视图层渲染
@@ -27,16 +29,18 @@ const SubPagination = {
     return `${path}:VueComponent`
   },
   // 导入数据
-  importData: (path, importRows, mode, mergeMethod, conditionConfig) => {
+  importData: (path, importRows, mode, mergeMethod) => {
     return new Promise((resolve, reject) => {
-      if (SubPagination._map.has(path)) {
+      const pInst = utils.getOnlineFormInstance(this)
+      let formUid = pInst && pInst._uid ? pInst._uid : ''
+      if (SubPagination._map.has(path + formUid)) {
         const instKey = SubPagination._vueComponentKey(path)
 
         if (!SubPagination._map.has(instKey)) {
           reject(`未找到${path}所对应的数据实例，无法导入数据。`)
         }
 
-        const obj = SubPagination._map.get(path),
+        const obj = SubPagination._map.get(path + formUid),
           inst = SubPagination._map.get(instKey),
           array = obj.rows
         switch (mode) {
@@ -58,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)
@@ -110,11 +75,12 @@ const SubPagination = {
   exportData: (path, type, pInst, subtablePagination) => {
     return new Promise((resolve, reject) => {
       if (subtablePagination) {
-        if (SubPagination._map.has(path)) {
+        let formUid = pInst && pInst._uid ? pInst._uid : ''
+        if (SubPagination._map.has(path + formUid)) {
           if (type == 'current') {
-            resolve(SubPagination.pagingByPath(path))
+            resolve(SubPagination.pagingByPath(path, pInst))
           } else if (type == 'all') {
-            const obj = SubPagination._map.get(path)
+            const obj = SubPagination._map.get(path + formUid)
             resolve(obj.rows)
           } else {
             reject(`未知的导出类型：${type}`)
@@ -134,10 +100,10 @@ const SubPagination = {
       // 将子表数据所属的VueComponent对象实例存储（用于数据导入）
       SubPagination._map.set(instKey, inst)
     }
-
+    let formUid = inst && inst._uid ? inst._uid : ''
     // 如果有该子表路径的对象，则进行前端分页
-    if (SubPagination._map.has(path)) {
-      const obj = SubPagination._map.get(path),
+    if (SubPagination._map.has(path + formUid)) {
+      const obj = SubPagination._map.get(path + formUid),
         array = obj.rows,
         pageSize = obj.pageSize,
         offset = (obj.currentPage - 1) * pageSize
@@ -157,9 +123,10 @@ const SubPagination = {
       // 将子表数据所属的VueComponent对象实例存储（用于数据导入）
       SubPagination._map.set(instKey, inst)
     }
+    let formUid = inst && inst._uid ? inst._uid : ''
     // 如果有该子表路径的对象，则进行前端分页
-    if (SubPagination._map.has(path)) {
-      const { pageSize, currentPage } = SubPagination._map.get(path)
+    if (SubPagination._map.has(path + formUid)) {
+      const { pageSize, currentPage } = SubPagination._map.get(path + formUid)
       if (pageSize && currentPage) {
         pageOffset = (currentPage - 1) * pageSize
       }

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