@lambo-design/shared 1.0.0-beta.60 → 1.0.0-beta.61

package/package.json

@@ -1,22 +1,22 @@
-{
-  "name": "@lambo-design/shared",
-  "version": "1.0.0-beta.60",
-  "description": "",
-  "main": "index.js",
-  "scripts": {},
-  "author": "lambo",
-  "license": "ISC",
-  "publishConfig": {
-    "access": "public",
-    "registry": "https://registry.npmjs.org/"
-  },
-  "dependencies": {
-    "axios": "^0.24.0",
-    "axios-cache-plugin": "^0.1.0",
-    "qs": "^6.11.0",
-    "xlsx": "http://cicd.lambo.top/package/cdn/xlsx-0.19.1.tgz",
-    "classnames": "^2.3.1",
-    "xlsx-style": "^0.8.13",
-    "moment": "2.29.4"
-  }
-}
+{
+  "name": "@lambo-design/shared",
+  "version": "1.0.0-beta.61",
+  "description": "",
+  "main": "index.js",
+  "author": "lambo",
+  "license": "ISC",
+  "publishConfig": {
+    "access": "public",
+    "registry": "https://registry.npmjs.org/"
+  },
+  "dependencies": {
+    "axios": "^0.24.0",
+    "axios-cache-plugin": "^0.1.0",
+    "qs": "^6.11.0",
+    "xlsx": "http://cicd.lambo.top/package/cdn/xlsx-0.19.1.tgz",
+    "classnames": "^2.3.1",
+    "xlsx-style": "^0.8.13",
+    "moment": "2.29.4"
+  },
+  "scripts": {}
+}

package/utils/assist.js

@@ -1,88 +1,110 @@
-// deepCopy
-
-
-export function deepCopy(data) {
-  let i;
-  const t = typeOf(data);
-  let o;
-
-  if (t === 'array') {
-    o = [];
-  } else if (t === 'object') {
-    o = {};
-  } else {
-    return data;
-  }
-
-  if (t === 'array') {
-    for (i = 0; i < data.length; i++) {
-      o.push(deepCopy(data[i]));
-    }
-  } else if (t === 'object') {
-    for (i in data) {
-      o[i] = deepCopy(data[i]);
-    }
-  }
-  return o;
-}
-
-export function typeOf(obj) {
-  const toString = Object.prototype.toString;
-  const map = {
-    '[object Boolean]': 'boolean',
-    '[object Number]': 'number',
-    '[object String]': 'string',
-    '[object Function]': 'function',
-    '[object Array]': 'array',
-    '[object Date]': 'date',
-    '[object RegExp]': 'regExp',
-    '[object Undefined]': 'undefined',
-    '[object Null]': 'null',
-    '[object Object]': 'object'
-  };
-  return map[toString.call(obj)];
-}
-
-export function operateBtn(vm, h, currentRow, operationName, operation, type, permission) {
-    return h('Button', {
-      props: {
-        type: type,
-        size: "small",
-        ghost: true,
-      },
-      directives: [(permission === '' || permission === null) ? '' : {
-        name: "permission",
-        value: permission
-      }],
-      style: {
-        margin: '0 2px'
-      },
-      on: {
-        'click': () => {
-          operation(vm, currentRow);
-        }
-      }
-    }, operationName);
-
-}
-
-export function operateHref(vm, h, currentRow, operationName, operation, type, permission) {
-   return h('a', {
-     style: {
-       margin: '0 4px'
-     },
-     directives: [(permission === '' || permission === null) ? '' : {
-       name: "permission",
-       value: permission
-     }],
-    on: {
-      'click': () => {
-        operation(vm, currentRow);
-      }
-    }
-  }, operationName);
-}
-
-export function isJson(arg) {
-  return typeof (arg) == "object" && Object.prototype.toString.call(arg).toLowerCase() == "[object object]" && !arg.length
-};
+// deepCopy
+
+
+export function deepCopy(data) {
+  let i;
+  const t = typeOf(data);
+  let o;
+
+  if (t === 'array') {
+    o = [];
+  } else if (t === 'object') {
+    o = {};
+  } else {
+    return data;
+  }
+
+  if (t === 'array') {
+    for (i = 0; i < data.length; i++) {
+      o.push(deepCopy(data[i]));
+    }
+  } else if (t === 'object') {
+    for (i in data) {
+      o[i] = deepCopy(data[i]);
+    }
+  }
+  return o;
+}
+export function deepMerge(target, ...sources) {
+  if (!sources.length) return target;
+  const source = sources.shift();
+
+  if (isObject(target) && isObject(source)) {
+    for (const key in source) {
+      if (isObject(source[key])) {
+        if (!target[key]) Object.assign(target, { [key]: {} });
+        deepMerge(target[key], source[key]);
+      } else {
+        Object.assign(target, { [key]: source[key] });
+      }
+    }
+  }
+
+  return deepMerge(target, ...sources);
+}
+
+export function typeOf(obj) {
+  const toString = Object.prototype.toString;
+  const map = {
+    '[object Boolean]': 'boolean',
+    '[object Number]': 'number',
+    '[object String]': 'string',
+    '[object Function]': 'function',
+    '[object Array]': 'array',
+    '[object Date]': 'date',
+    '[object RegExp]': 'regExp',
+    '[object Undefined]': 'undefined',
+    '[object Null]': 'null',
+    '[object Object]': 'object'
+  };
+  return map[toString.call(obj)];
+}
+
+export function operateBtn(vm, h, currentRow, operationName, operation, type, permission) {
+    return h('Button', {
+      props: {
+        type: type,
+        size: "small",
+        ghost: true,
+      },
+      directives: [(permission === '' || permission === null) ? '' : {
+        name: "permission",
+        value: permission
+      }],
+      style: {
+        margin: '0 2px'
+      },
+      on: {
+        'click': () => {
+          operation(vm, currentRow);
+        }
+      }
+    }, operationName);
+
+}
+
+export function operateHref(vm, h, currentRow, operationName, operation, type, permission) {
+   return h('a', {
+     style: {
+       margin: '0 4px'
+     },
+     directives: [(permission === '' || permission === null) ? '' : {
+       name: "permission",
+       value: permission
+     }],
+    on: {
+      'click': () => {
+        operation(vm, currentRow);
+      }
+    }
+  }, operationName);
+}
+
+export function isJson(arg) {
+  return typeof (arg) == "object" && Object.prototype.toString.call(arg).toLowerCase() == "[object object]" && !arg.length
+};
+
+
+export function isObject(item) {
+  return (item && typeof item === 'object' && !Array.isArray(item));
+}