xianniu-ui 0.3.14 → 0.3.16

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "xianniu-ui",
-  "version": "0.3.14",
+  "version": "0.3.16",
   "private": false,
   "main": "lib/xianniu-ui.umd.min.js",
   "scripts": {

package/packages/upload/main.vue

@@ -263,14 +263,8 @@ export default {
         },
       })
         .then((res) => {
-          const { name, size, ext, imgFlag, url } = res.data.data;
-          var obj = {};
-          obj.name = name;
-          obj.size = size;
-          obj.ext = ext;
-          obj.imgFlag = imgFlag;
-          obj.url = url;
-          this.successFiles.push(obj);
+          const { name, size, ext, imgFlag, url,fileId } = res.data.data;
+          this.successFiles.push({name,size,ext,imgFlag,url,fileId});
           file.onSuccess();
           this.$emit("update:fileList", this.successFiles);
           this.$emit("on-success", this.successFiles);

package/src/index.js

@@ -31,9 +31,6 @@ const components = [
     XnFooter
 ]
 const version = require('../package.json').version
-if (process.env.NODE_ENV && process.env.NODE_ENV === 'development') {
-    console.log(`doc:${doc}`);
-}
 const install = function (Vue) {
     if (install.installed) return
     if (!Vue.prototype.$ELEMENT) throw new Error('缺失 element-ui，请进行安装')

package/src/utils/index.js

@@ -6,7 +6,6 @@ import storage from './storage'
 import utils from './utils'
 import lodash from 'lodash'
 import math from './math'
-console.log('math: ', math);
 const version = () => {
     return `xianniu-tools@${require('./package.json').version}`
 }

package/src/utils/math.js

@@ -21,16 +21,32 @@ class Math {
             const list = args[0]
             const fieldKey = args[1]
             return list.map(item => item[fieldKey]).reduce((pre, cur) => {
-                let val = new Decimal(pre)
-                return val[this.type](new Decimal(cur)).toNumber()
+                let val = new Decimal(pre - 0)
+                return val[this.type](new Decimal(cur - 0)).toNumber()
             })
         } else {
-            return args.reduce((pre, cur) => new Decimal(pre)[this.type](new Decimal(cur)).toNumber())
+            return args.reduce((pre, cur) => {
+                return new Decimal(pre - 0)[this.type](new Decimal(cur - 0)).toNumber()
+            })
+        }
+    }
+    autoComputed(fields = [], fieldsRules = {}, field = '') {
+        if (!fields.length || !Object.keys(fieldsRules).length) {
+            throw new Error('error arguments: fields or fieldsRules')
         }
+        const _fields = fields
+        const _fieldsRules = fieldsRules
+        const idx = _fields.indexOf(field)
+        if (idx !== -1) {
+            _fields.splice(idx, 1)
+        }
+        _fields.push(field)
+        _fieldsRules[_fields[0]]()
+        return { fields: _fields, fieldsRules: _fieldsRules, field }
     }
 }
 
-// 加法  (1,2,3) = 6
+// 加法  (1,2,3) = 6 or ([{a:1},{a:2}],'a') = 3
 const add = function (...args) {
     return new Math('add').result(...args)
 }
@@ -45,11 +61,14 @@ const mul = function (...args) {
 const div = function (...args) {
     return new Math('div').result(...args)
 }
-
+const autoComputed = function (fields = [], fieldsRules = {}, field = '') {
+    return new Math().autoComputed(fields, fieldsRules, field)
+}
 export default {
     add,
     sub,
     mul,
     div,
+    autoComputed,
     D: Decimal
 }