iv-npm 1.0.35 → 1.0.38

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "iv-npm",
-  "version": "1.0.35",
+  "version": "1.0.38",
   "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,7 +507,7 @@ function _defineProperty(obj, key, value) {
 /*
  * @Author: Mr.Cong Wei
  * @Date: 2022-08-10 10:13:38
- * @LastEditTime: 2022-08-10 10:40:12
+ * @LastEditTime: 2022-08-10 11:33:27
  */
 var BASE_URL = "https://basis.nacho.cn";
 var DEFIND_OPTION = {
@@ -525,9 +525,6 @@ var API_OPTION = {
   getIVMrpOrgDropdown: {
     url: "/api/identity/users/allOrganizationByUser",
     option: _objectSpread2({
-      params: {
-        type: 1
-      },
       method: "GET"
     }, DEFIND_OPTION)
   }
@@ -545,6 +542,43 @@ var formatHTTP = function formatHTTP(fetch) {
     });
   });
 };
+var formatUrl = function formatUrl(base, api, params) {
+  if (Object.keys(params).length === 0) return base + api;
+  var urlTemparr = [];
+
+  for (var k in params) {
+    urlTemparr.push("".concat(k, "=").concat(params[k]));
+  }
+
+  return base + api + "?" + urlTemparr.join("&");
+};
+
+// 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 assign = Object.assign;
 
 var _hoisted_1 = /*#__PURE__*/vue.createElementVNode("div", {
   "class": "text-[#0000006D] text-[14px]"
@@ -588,22 +622,34 @@ var script = /*#__PURE__*/vue.defineComponent({
     var dataV = vue.ref();
 
     var getData = /*#__PURE__*/function () {
-      var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(data) {
-        var result;
+      var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
+        var _option,
+            _a,
+            _yield$formatHTTP,
+            items,
+            _args = arguments;
+
         return _regeneratorRuntime().wrap(function _callee$(_context) {
           while (1) {
             switch (_context.prev = _context.next) {
               case 0:
-                _context.next = 2;
-                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");
-
-              case 4:
+                _option = _args.length > 0 && _args[0] !== undefined ? _args[0] : {
+                  params: {
+                    type: 1
+                  }
+                };
+                _context.next = 3;
+                return formatHTTP(fetch(formatUrl(BASE_URL, API_OPTION.getIVMrpOrgDropdown.url, _option.params), assign({
+                  data: (_a = _option.data) !== null && _a !== void 0 ? _a : null
+                }, API_OPTION.getIVMrpOrgDropdown.option)));
+
+              case 3:
+                _yield$formatHTTP = _context.sent;
+                items = _yield$formatHTTP.items;
+                console.log(items, "1238099999999999999999999");
+                dataV.value = tranListToTreeData(items);
+
+              case 7:
               case "end":
                 return _context.stop();
             }
@@ -611,7 +657,7 @@ var script = /*#__PURE__*/vue.defineComponent({
         }, _callee);
       }));
 
-      return function getData(_x) {
+      return function getData() {
         return _ref2.apply(this, arguments);
       };
     }();

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

@@ -503,7 +503,7 @@ function _defineProperty(obj, key, value) {
 /*
  * @Author: Mr.Cong Wei
  * @Date: 2022-08-10 10:13:38
- * @LastEditTime: 2022-08-10 10:40:12
+ * @LastEditTime: 2022-08-10 11:33:27
  */
 var BASE_URL = "https://basis.nacho.cn";
 var DEFIND_OPTION = {
@@ -521,9 +521,6 @@ var API_OPTION = {
   getIVMrpOrgDropdown: {
     url: "/api/identity/users/allOrganizationByUser",
     option: _objectSpread2({
-      params: {
-        type: 1
-      },
       method: "GET"
     }, DEFIND_OPTION)
   }
@@ -541,6 +538,43 @@ var formatHTTP = function formatHTTP(fetch) {
     });
   });
 };
+var formatUrl = function formatUrl(base, api, params) {
+  if (Object.keys(params).length === 0) return base + api;
+  var urlTemparr = [];
+
+  for (var k in params) {
+    urlTemparr.push("".concat(k, "=").concat(params[k]));
+  }
+
+  return base + api + "?" + urlTemparr.join("&");
+};
+
+// 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 assign = Object.assign;
 
 var _hoisted_1 = /*#__PURE__*/createElementVNode("div", {
   "class": "text-[#0000006D] text-[14px]"
@@ -584,22 +618,34 @@ var script = /*#__PURE__*/defineComponent({
     var dataV = ref();
 
     var getData = /*#__PURE__*/function () {
-      var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(data) {
-        var result;
+      var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
+        var _option,
+            _a,
+            _yield$formatHTTP,
+            items,
+            _args = arguments;
+
         return _regeneratorRuntime().wrap(function _callee$(_context) {
           while (1) {
             switch (_context.prev = _context.next) {
               case 0:
-                _context.next = 2;
-                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");
-
-              case 4:
+                _option = _args.length > 0 && _args[0] !== undefined ? _args[0] : {
+                  params: {
+                    type: 1
+                  }
+                };
+                _context.next = 3;
+                return formatHTTP(fetch(formatUrl(BASE_URL, API_OPTION.getIVMrpOrgDropdown.url, _option.params), assign({
+                  data: (_a = _option.data) !== null && _a !== void 0 ? _a : null
+                }, API_OPTION.getIVMrpOrgDropdown.option)));
+
+              case 3:
+                _yield$formatHTTP = _context.sent;
+                items = _yield$formatHTTP.items;
+                console.log(items, "1238099999999999999999999");
+                dataV.value = tranListToTreeData(items);
+
+              case 7:
               case "end":
                 return _context.stop();
             }
@@ -607,7 +653,7 @@ var script = /*#__PURE__*/defineComponent({
         }, _callee);
       }));
 
-      return function getData(_x) {
+      return function getData() {
         return _ref2.apply(this, arguments);
       };
     }();

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

@@ -507,7 +507,7 @@
   /*
    * @Author: Mr.Cong Wei
    * @Date: 2022-08-10 10:13:38
-   * @LastEditTime: 2022-08-10 10:40:12
+   * @LastEditTime: 2022-08-10 11:33:27
    */
   var BASE_URL = "https://basis.nacho.cn";
   var DEFIND_OPTION = {
@@ -525,9 +525,6 @@
     getIVMrpOrgDropdown: {
       url: "/api/identity/users/allOrganizationByUser",
       option: _objectSpread2({
-        params: {
-          type: 1
-        },
         method: "GET"
       }, DEFIND_OPTION)
     }
@@ -545,6 +542,43 @@
       });
     });
   };
+  var formatUrl = function formatUrl(base, api, params) {
+    if (Object.keys(params).length === 0) return base + api;
+    var urlTemparr = [];
+
+    for (var k in params) {
+      urlTemparr.push("".concat(k, "=").concat(params[k]));
+    }
+
+    return base + api + "?" + urlTemparr.join("&");
+  };
+
+  // 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 assign = Object.assign;
 
   var _hoisted_1 = /*#__PURE__*/vue.createElementVNode("div", {
     "class": "text-[#0000006D] text-[14px]"
@@ -588,22 +622,34 @@
       var dataV = vue.ref();
 
       var getData = /*#__PURE__*/function () {
-        var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(data) {
-          var result;
+        var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
+          var _option,
+              _a,
+              _yield$formatHTTP,
+              items,
+              _args = arguments;
+
           return _regeneratorRuntime().wrap(function _callee$(_context) {
             while (1) {
               switch (_context.prev = _context.next) {
                 case 0:
-                  _context.next = 2;
-                  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");
-
-                case 4:
+                  _option = _args.length > 0 && _args[0] !== undefined ? _args[0] : {
+                    params: {
+                      type: 1
+                    }
+                  };
+                  _context.next = 3;
+                  return formatHTTP(fetch(formatUrl(BASE_URL, API_OPTION.getIVMrpOrgDropdown.url, _option.params), assign({
+                    data: (_a = _option.data) !== null && _a !== void 0 ? _a : null
+                  }, API_OPTION.getIVMrpOrgDropdown.option)));
+
+                case 3:
+                  _yield$formatHTTP = _context.sent;
+                  items = _yield$formatHTTP.items;
+                  console.log(items, "1238099999999999999999999");
+                  dataV.value = tranListToTreeData(items);
+
+                case 7:
                 case "end":
                   return _context.stop();
               }
@@ -611,7 +657,7 @@
           }, _callee);
         }));
 
-        return function getData(_x) {
+        return function getData() {
           return _ref2.apply(this, arguments);
         };
       }();