iv-npm 1.0.34 → 1.0.37

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "iv-npm",
-  "version": "1.0.34",
+  "version": "1.0.37",
   "description": "公共通用包",
   "author": "Mr.Cong",
   "license": "ISC",

package/packages/shared/dist/utils/index.d.ts

@@ -23,4 +23,11 @@ declare function findTree<T extends {
  * */
 declare function isPlainObject(obj: object): boolean;
 
-export { arrToTree, findTree, isPlainObject, tranListToTreeData };
+declare const assign: {
+    <T extends {}, U>(target: T, source: U): T & U;
+    <T_1 extends {}, U_1, V>(target: T_1, source1: U_1, source2: V): T_1 & U_1 & V;
+    <T_2 extends {}, U_2, V_1, W>(target: T_2, source1: U_2, source2: V_1, source3: W): T_2 & U_2 & V_1 & W;
+    (target: object, ...sources: any[]): any;
+};
+
+export { arrToTree, assign, findTree, isPlainObject, tranListToTreeData };

package/packages/shared/dist/utils/index.mjs

@@ -58,8 +58,12 @@ function isPlainObject(obj) {
   Ctor = {}.hasOwnProperty.call(proto, "constructor") && proto.constructor;
   return typeof Ctor === "function" && {}.hasOwnProperty.toString.call(Ctor) === {}.hasOwnProperty.toString.call(Object);
 }
+
+// utils/obj/cache.ts
+var assign = Object.assign;
 export {
   arrToTree,
+  assign,
   findTree,
   isPlainObject,
   tranListToTreeData

package/packages/ui/dist/index.cjs.js

@@ -507,13 +507,14 @@ function _defineProperty(obj, key, value) {
 /*
  * @Author: Mr.Cong Wei
  * @Date: 2022-08-10 10:13:38
- * @LastEditTime: 2022-08-10 10:19:01
+ * @LastEditTime: 2022-08-10 10:56:41
  */
 var BASE_URL = "https://basis.nacho.cn";
 var DEFIND_OPTION = {
   headers: {
     "Content-Type": "application/json;charset=UTF-8",
-    "Accept-Language": "zh-Hans"
+    "Accept-Language": "zh-Hans",
+    authorization: localStorage.getItem("token") ? "Bearer " + localStorage.getItem("token") : null
   },
   cache: "no-cache",
   credentials: "include",
@@ -531,6 +532,43 @@ var API_OPTION = {
     }, DEFIND_OPTION)
   }
 };
+var formatHTTP = function formatHTTP(fetch) {
+  return new Promise(function (resolve, reject) {
+    fetch.then(function (data) {
+      data.json().then(function (data) {
+        return resolve(data);
+      })["catch"](function (err) {
+        return reject(err);
+      });
+    })["catch"](function (err) {
+      return reject(err);
+    });
+  });
+};
+
+// utils/arr/tree.ts
+
+function _loadChildren(obj, list) {
+  var arr = list.filter(function (x) {
+    return x.parentId == obj.id;
+  });
+  if (!arr.length) return;
+  obj.children = arr;
+  obj.children.forEach(function (x) {
+    _loadChildren(x, list);
+  });
+  return obj;
+}
+
+function tranListToTreeData(list) {
+  var results = list.filter(function (x) {
+    return x.parentId == null;
+  });
+  results.forEach(function (x) {
+    return _loadChildren(x, list);
+  });
+  return results;
+}
 
 var _hoisted_1 = /*#__PURE__*/vue.createElementVNode("div", {
   "class": "text-[#0000006D] text-[14px]"
@@ -575,21 +613,22 @@ var script = /*#__PURE__*/vue.defineComponent({
 
     var getData = /*#__PURE__*/function () {
       var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(data) {
-        var result;
+        var _yield$formatHTTP, items;
+
         return _regeneratorRuntime().wrap(function _callee$(_context) {
           while (1) {
             switch (_context.prev = _context.next) {
               case 0:
                 _context.next = 2;
-                return fetch(BASE_URL + API_OPTION.getIVMrpOrgDropdown.url, API_OPTION.getIVMrpOrgDropdown.option);
+                return formatHTTP(fetch(BASE_URL + API_OPTION.getIVMrpOrgDropdown.url, API_OPTION.getIVMrpOrgDropdown.option));
 
               case 2:
-                result = _context.sent;
-                // console.log(result);
-                // const result = getIVMrpOrgDropdown(data);
-                console.log(result, "1238099999999999999999999");
+                _yield$formatHTTP = _context.sent;
+                items = _yield$formatHTTP.items;
+                console.log(items, "1238099999999999999999999");
+                dataV.value = tranListToTreeData(items);
 
-              case 4:
+              case 6:
               case "end":
                 return _context.stop();
             }

package/packages/ui/dist/index.esm.js

@@ -503,13 +503,14 @@ function _defineProperty(obj, key, value) {
 /*
  * @Author: Mr.Cong Wei
  * @Date: 2022-08-10 10:13:38
- * @LastEditTime: 2022-08-10 10:19:01
+ * @LastEditTime: 2022-08-10 10:56:41
  */
 var BASE_URL = "https://basis.nacho.cn";
 var DEFIND_OPTION = {
   headers: {
     "Content-Type": "application/json;charset=UTF-8",
-    "Accept-Language": "zh-Hans"
+    "Accept-Language": "zh-Hans",
+    authorization: localStorage.getItem("token") ? "Bearer " + localStorage.getItem("token") : null
   },
   cache: "no-cache",
   credentials: "include",
@@ -527,6 +528,43 @@ var API_OPTION = {
     }, DEFIND_OPTION)
   }
 };
+var formatHTTP = function formatHTTP(fetch) {
+  return new Promise(function (resolve, reject) {
+    fetch.then(function (data) {
+      data.json().then(function (data) {
+        return resolve(data);
+      })["catch"](function (err) {
+        return reject(err);
+      });
+    })["catch"](function (err) {
+      return reject(err);
+    });
+  });
+};
+
+// utils/arr/tree.ts
+
+function _loadChildren(obj, list) {
+  var arr = list.filter(function (x) {
+    return x.parentId == obj.id;
+  });
+  if (!arr.length) return;
+  obj.children = arr;
+  obj.children.forEach(function (x) {
+    _loadChildren(x, list);
+  });
+  return obj;
+}
+
+function tranListToTreeData(list) {
+  var results = list.filter(function (x) {
+    return x.parentId == null;
+  });
+  results.forEach(function (x) {
+    return _loadChildren(x, list);
+  });
+  return results;
+}
 
 var _hoisted_1 = /*#__PURE__*/createElementVNode("div", {
   "class": "text-[#0000006D] text-[14px]"
@@ -571,21 +609,22 @@ var script = /*#__PURE__*/defineComponent({
 
     var getData = /*#__PURE__*/function () {
       var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(data) {
-        var result;
+        var _yield$formatHTTP, items;
+
         return _regeneratorRuntime().wrap(function _callee$(_context) {
           while (1) {
             switch (_context.prev = _context.next) {
               case 0:
                 _context.next = 2;
-                return fetch(BASE_URL + API_OPTION.getIVMrpOrgDropdown.url, API_OPTION.getIVMrpOrgDropdown.option);
+                return formatHTTP(fetch(BASE_URL + API_OPTION.getIVMrpOrgDropdown.url, API_OPTION.getIVMrpOrgDropdown.option));
 
               case 2:
-                result = _context.sent;
-                // console.log(result);
-                // const result = getIVMrpOrgDropdown(data);
-                console.log(result, "1238099999999999999999999");
+                _yield$formatHTTP = _context.sent;
+                items = _yield$formatHTTP.items;
+                console.log(items, "1238099999999999999999999");
+                dataV.value = tranListToTreeData(items);
 
-              case 4:
+              case 6:
               case "end":
                 return _context.stop();
             }

package/packages/ui/dist/index.umd.js

@@ -507,13 +507,14 @@
   /*
    * @Author: Mr.Cong Wei
    * @Date: 2022-08-10 10:13:38
-   * @LastEditTime: 2022-08-10 10:19:01
+   * @LastEditTime: 2022-08-10 10:56:41
    */
   var BASE_URL = "https://basis.nacho.cn";
   var DEFIND_OPTION = {
     headers: {
       "Content-Type": "application/json;charset=UTF-8",
-      "Accept-Language": "zh-Hans"
+      "Accept-Language": "zh-Hans",
+      authorization: localStorage.getItem("token") ? "Bearer " + localStorage.getItem("token") : null
     },
     cache: "no-cache",
     credentials: "include",
@@ -531,6 +532,43 @@
       }, DEFIND_OPTION)
     }
   };
+  var formatHTTP = function formatHTTP(fetch) {
+    return new Promise(function (resolve, reject) {
+      fetch.then(function (data) {
+        data.json().then(function (data) {
+          return resolve(data);
+        })["catch"](function (err) {
+          return reject(err);
+        });
+      })["catch"](function (err) {
+        return reject(err);
+      });
+    });
+  };
+
+  // utils/arr/tree.ts
+
+  function _loadChildren(obj, list) {
+    var arr = list.filter(function (x) {
+      return x.parentId == obj.id;
+    });
+    if (!arr.length) return;
+    obj.children = arr;
+    obj.children.forEach(function (x) {
+      _loadChildren(x, list);
+    });
+    return obj;
+  }
+
+  function tranListToTreeData(list) {
+    var results = list.filter(function (x) {
+      return x.parentId == null;
+    });
+    results.forEach(function (x) {
+      return _loadChildren(x, list);
+    });
+    return results;
+  }
 
   var _hoisted_1 = /*#__PURE__*/vue.createElementVNode("div", {
     "class": "text-[#0000006D] text-[14px]"
@@ -575,21 +613,22 @@
 
       var getData = /*#__PURE__*/function () {
         var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(data) {
-          var result;
+          var _yield$formatHTTP, items;
+
           return _regeneratorRuntime().wrap(function _callee$(_context) {
             while (1) {
               switch (_context.prev = _context.next) {
                 case 0:
                   _context.next = 2;
-                  return fetch(BASE_URL + API_OPTION.getIVMrpOrgDropdown.url, API_OPTION.getIVMrpOrgDropdown.option);
+                  return formatHTTP(fetch(BASE_URL + API_OPTION.getIVMrpOrgDropdown.url, API_OPTION.getIVMrpOrgDropdown.option));
 
                 case 2:
-                  result = _context.sent;
-                  // console.log(result);
-                  // const result = getIVMrpOrgDropdown(data);
-                  console.log(result, "1238099999999999999999999");
+                  _yield$formatHTTP = _context.sent;
+                  items = _yield$formatHTTP.items;
+                  console.log(items, "1238099999999999999999999");
+                  dataV.value = tranListToTreeData(items);
 
-                case 4:
+                case 6:
                 case "end":
                   return _context.stop();
               }