@teamias/pro-layout 0.0.22 → 0.0.24

package/dist/markdowns/example1/BasicProLayout/index.js

@@ -8,6 +8,7 @@ import { sleep } from 'radash';
 import { useEffect } from 'react';
 import ReactDom from 'react-dom';
 import { MemoryRouter } from 'react-router-dom';
+import { Placeholder } from "./pages/Placeholder";
 import { menuData, pageComponentMap } from "./testData";
 import { jsx as _jsx } from "react/jsx-runtime";
 var BasicProLayout = function BasicProLayout() {
@@ -18,9 +19,7 @@ var BasicProLayout = function BasicProLayout() {
         basename: "/",
         projectId: "demo-project",
         pageComponentMap: pageComponentMap,
-        placeholderElement: /*#__PURE__*/_jsx("div", {
-          children: "\u5360\u4F4D\u5143\u7D20: \u9875\u9762\u6B63\u5728\u5F00\u53D1\u4E2D..."
-        }),
+        placeholderElement: /*#__PURE__*/_jsx(Placeholder, {}),
         requestUserInfoMenuData: /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
           return _regeneratorRuntime().wrap(function _callee$(_context) {
             while (1) switch (_context.prev = _context.next) {

package/dist/markdowns/example1/BasicProLayout/pages/Placeholder.d.ts

@@ -0,0 +1 @@
+export declare const Placeholder: () => import("react/jsx-runtime").JSX.Element;

package/dist/markdowns/example1/BasicProLayout/pages/Placeholder.js

@@ -0,0 +1,11 @@
+import { useLocation } from 'react-router-dom';
+import { jsx as _jsx } from "react/jsx-runtime";
+import { jsxs as _jsxs } from "react/jsx-runtime";
+export var Placeholder = function Placeholder() {
+  var location = useLocation();
+  return /*#__PURE__*/_jsxs("div", {
+    children: ["\u5360\u4F4D\u5143\u7D20: \u9875\u9762\u6B63\u5728\u5F00\u53D1\u4E2D...", /*#__PURE__*/_jsx("br", {}), /*#__PURE__*/_jsx("pre", {
+      children: JSON.stringify(location, null, 4)
+    })]
+  });
+};

package/dist/markdowns/example1/BasicProLayout/testData.d.ts

@@ -36,7 +36,7 @@ export declare const menuData: ({
     hidden: 0;
     menu_type: "dir";
     status_text: string;
-    children: {
+    children: ({
         id: string;
         app_id: number;
         title: string;
@@ -49,5 +49,33 @@ export declare const menuData: ({
         hidden: 0;
         menu_type: "menu";
         status_text: string;
-    }[];
+        children?: undefined;
+    } | {
+        id: string;
+        app_id: number;
+        title: string;
+        icon: string;
+        type: 1;
+        routing: string;
+        component: string;
+        pid: string;
+        permission: string;
+        hidden: 0;
+        menu_type: "menu";
+        status_text: string;
+        children: {
+            id: string;
+            app_id: number;
+            title: string;
+            icon: string;
+            type: 1;
+            routing: string;
+            component: string;
+            pid: string;
+            permission: string;
+            hidden: 0;
+            menu_type: "menu";
+            status_text: string;
+        }[];
+    })[];
 })[];

package/dist/markdowns/example1/BasicProLayout/testData.js

@@ -77,6 +77,20 @@ export var menuData = [{
     permission: '',
     hidden: 0,
     menu_type: 'menu',
-    status_text: ''
+    status_text: '',
+    children: [{
+      id: '8432',
+      app_id: 2,
+      title: '低代码页-详情',
+      icon: '',
+      type: 1,
+      routing: '/page3/detailList/:type/:operateStaffingId/:operateStaffingName/:operateFailure',
+      component: '',
+      pid: '82',
+      permission: '',
+      hidden: 0,
+      menu_type: 'menu',
+      status_text: ''
+    }]
   }]
 }];

package/dist/pro-layout/utils/menu.js

@@ -44,7 +44,9 @@ export var handleMenuData = function handleMenuData() {
       var nodePath = paths.reduce(function (def, val) {
         var reg = new RegExp("^/".concat(val, "(/)"));
         return def.replace(reg, '$1');
-      }, old.routing).replaceAll('/', '') || '/';
+      }, old.routing).replace(/\/([^:])/g, '$1') || '/';
+      // .replaceAll('/', '') || '/';
+
       var key = "/".concat([].concat(_toConsumableArray(paths), [nodePath]).join('/')).replaceAll('//', '/');
 
       /** 组装新数据 */

package/dist/pro-layout-business/components/RoleSelect.js

@@ -1,4 +1,9 @@
 function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
+function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
+function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
+function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
+function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : String(i); }
+function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
 function _regeneratorRuntime() { "use strict"; /*! regenerator-runtime -- Copyright (c) 2014-present, Facebook, Inc. -- license (MIT): https://github.com/facebook/regenerator/blob/main/LICENSE */ _regeneratorRuntime = function _regeneratorRuntime() { return e; }; var t, e = {}, r = Object.prototype, n = r.hasOwnProperty, o = Object.defineProperty || function (t, e, r) { t[e] = r.value; }, i = "function" == typeof Symbol ? Symbol : {}, a = i.iterator || "@@iterator", c = i.asyncIterator || "@@asyncIterator", u = i.toStringTag || "@@toStringTag"; function define(t, e, r) { return Object.defineProperty(t, e, { value: r, enumerable: !0, configurable: !0, writable: !0 }), t[e]; } try { define({}, ""); } catch (t) { define = function define(t, e, r) { return t[e] = r; }; } function wrap(t, e, r, n) { var i = e && e.prototype instanceof Generator ? e : Generator, a = Object.create(i.prototype), c = new Context(n || []); return o(a, "_invoke", { value: makeInvokeMethod(t, r, c) }), a; } function tryCatch(t, e, r) { try { return { type: "normal", arg: t.call(e, r) }; } catch (t) { return { type: "throw", arg: t }; } } e.wrap = wrap; var h = "suspendedStart", l = "suspendedYield", f = "executing", s = "completed", y = {}; function Generator() {} function GeneratorFunction() {} function GeneratorFunctionPrototype() {} var p = {}; define(p, a, function () { return this; }); var d = Object.getPrototypeOf, v = d && d(d(values([]))); v && v !== r && n.call(v, a) && (p = v); var g = GeneratorFunctionPrototype.prototype = Generator.prototype = Object.create(p); function defineIteratorMethods(t) { ["next", "throw", "return"].forEach(function (e) { define(t, e, function (t) { return this._invoke(e, t); }); }); } function AsyncIterator(t, e) { function invoke(r, o, i, a) { var c = tryCatch(t[r], t, o); if ("throw" !== c.type) { var u = c.arg, h = u.value; return h && "object" == _typeof(h) && n.call(h, "__await") ? e.resolve(h.__await).then(function (t) { invoke("next", t, i, a); }, function (t) { invoke("throw", t, i, a); }) : e.resolve(h).then(function (t) { u.value = t, i(u); }, function (t) { return invoke("throw", t, i, a); }); } a(c.arg); } var r; o(this, "_invoke", { value: function value(t, n) { function callInvokeWithMethodAndArg() { return new e(function (e, r) { invoke(t, n, e, r); }); } return r = r ? r.then(callInvokeWithMethodAndArg, callInvokeWithMethodAndArg) : callInvokeWithMethodAndArg(); } }); } function makeInvokeMethod(e, r, n) { var o = h; return function (i, a) { if (o === f) throw new Error("Generator is already running"); if (o === s) { if ("throw" === i) throw a; return { value: t, done: !0 }; } for (n.method = i, n.arg = a;;) { var c = n.delegate; if (c) { var u = maybeInvokeDelegate(c, n); if (u) { if (u === y) continue; return u; } } if ("next" === n.method) n.sent = n._sent = n.arg;else if ("throw" === n.method) { if (o === h) throw o = s, n.arg; n.dispatchException(n.arg); } else "return" === n.method && n.abrupt("return", n.arg); o = f; var p = tryCatch(e, r, n); if ("normal" === p.type) { if (o = n.done ? s : l, p.arg === y) continue; return { value: p.arg, done: n.done }; } "throw" === p.type && (o = s, n.method = "throw", n.arg = p.arg); } }; } function maybeInvokeDelegate(e, r) { var n = r.method, o = e.iterator[n]; if (o === t) return r.delegate = null, "throw" === n && e.iterator.return && (r.method = "return", r.arg = t, maybeInvokeDelegate(e, r), "throw" === r.method) || "return" !== n && (r.method = "throw", r.arg = new TypeError("The iterator does not provide a '" + n + "' method")), y; var i = tryCatch(o, e.iterator, r.arg); if ("throw" === i.type) return r.method = "throw", r.arg = i.arg, r.delegate = null, y; var a = i.arg; return a ? a.done ? (r[e.resultName] = a.value, r.next = e.nextLoc, "return" !== r.method && (r.method = "next", r.arg = t), r.delegate = null, y) : a : (r.method = "throw", r.arg = new TypeError("iterator result is not an object"), r.delegate = null, y); } function pushTryEntry(t) { var e = { tryLoc: t[0] }; 1 in t && (e.catchLoc = t[1]), 2 in t && (e.finallyLoc = t[2], e.afterLoc = t[3]), this.tryEntries.push(e); } function resetTryEntry(t) { var e = t.completion || {}; e.type = "normal", delete e.arg, t.completion = e; } function Context(t) { this.tryEntries = [{ tryLoc: "root" }], t.forEach(pushTryEntry, this), this.reset(!0); } function values(e) { if (e || "" === e) { var r = e[a]; if (r) return r.call(e); if ("function" == typeof e.next) return e; if (!isNaN(e.length)) { var o = -1, i = function next() { for (; ++o < e.length;) if (n.call(e, o)) return next.value = e[o], next.done = !1, next; return next.value = t, next.done = !0, next; }; return i.next = i; } } throw new TypeError(_typeof(e) + " is not iterable"); } return GeneratorFunction.prototype = GeneratorFunctionPrototype, o(g, "constructor", { value: GeneratorFunctionPrototype, configurable: !0 }), o(GeneratorFunctionPrototype, "constructor", { value: GeneratorFunction, configurable: !0 }), GeneratorFunction.displayName = define(GeneratorFunctionPrototype, u, "GeneratorFunction"), e.isGeneratorFunction = function (t) { var e = "function" == typeof t && t.constructor; return !!e && (e === GeneratorFunction || "GeneratorFunction" === (e.displayName || e.name)); }, e.mark = function (t) { return Object.setPrototypeOf ? Object.setPrototypeOf(t, GeneratorFunctionPrototype) : (t.__proto__ = GeneratorFunctionPrototype, define(t, u, "GeneratorFunction")), t.prototype = Object.create(g), t; }, e.awrap = function (t) { return { __await: t }; }, defineIteratorMethods(AsyncIterator.prototype), define(AsyncIterator.prototype, c, function () { return this; }), e.AsyncIterator = AsyncIterator, e.async = function (t, r, n, o, i) { void 0 === i && (i = Promise); var a = new AsyncIterator(wrap(t, r, n, o), i); return e.isGeneratorFunction(r) ? a : a.next().then(function (t) { return t.done ? t.value : a.next(); }); }, defineIteratorMethods(g), define(g, u, "Generator"), define(g, a, function () { return this; }), define(g, "toString", function () { return "[object Generator]"; }), e.keys = function (t) { var e = Object(t), r = []; for (var n in e) r.push(n); return r.reverse(), function next() { for (; r.length;) { var t = r.pop(); if (t in e) return next.value = t, next.done = !1, next; } return next.done = !0, next; }; }, e.values = values, Context.prototype = { constructor: Context, reset: function reset(e) { if (this.prev = 0, this.next = 0, this.sent = this._sent = t, this.done = !1, this.delegate = null, this.method = "next", this.arg = t, this.tryEntries.forEach(resetTryEntry), !e) for (var r in this) "t" === r.charAt(0) && n.call(this, r) && !isNaN(+r.slice(1)) && (this[r] = t); }, stop: function stop() { this.done = !0; var t = this.tryEntries[0].completion; if ("throw" === t.type) throw t.arg; return this.rval; }, dispatchException: function dispatchException(e) { if (this.done) throw e; var r = this; function handle(n, o) { return a.type = "throw", a.arg = e, r.next = n, o && (r.method = "next", r.arg = t), !!o; } for (var o = this.tryEntries.length - 1; o >= 0; --o) { var i = this.tryEntries[o], a = i.completion; if ("root" === i.tryLoc) return handle("end"); if (i.tryLoc <= this.prev) { var c = n.call(i, "catchLoc"), u = n.call(i, "finallyLoc"); if (c && u) { if (this.prev < i.catchLoc) return handle(i.catchLoc, !0); if (this.prev < i.finallyLoc) return handle(i.finallyLoc); } else if (c) { if (this.prev < i.catchLoc) return handle(i.catchLoc, !0); } else { if (!u) throw new Error("try statement without catch or finally"); if (this.prev < i.finallyLoc) return handle(i.finallyLoc); } } } }, abrupt: function abrupt(t, e) { for (var r = this.tryEntries.length - 1; r >= 0; --r) { var o = this.tryEntries[r]; if (o.tryLoc <= this.prev && n.call(o, "finallyLoc") && this.prev < o.finallyLoc) { var i = o; break; } } i && ("break" === t || "continue" === t) && i.tryLoc <= e && e <= i.finallyLoc && (i = null); var a = i ? i.completion : {}; return a.type = t, a.arg = e, i ? (this.method = "next", this.next = i.finallyLoc, y) : this.complete(a); }, complete: function complete(t, e) { if ("throw" === t.type) throw t.arg; return "break" === t.type || "continue" === t.type ? this.next = t.arg : "return" === t.type ? (this.rval = this.arg = t.arg, this.method = "return", this.next = "end") : "normal" === t.type && e && (this.next = e), y; }, finish: function finish(t) { for (var e = this.tryEntries.length - 1; e >= 0; --e) { var r = this.tryEntries[e]; if (r.finallyLoc === t) return this.complete(r.completion, r.afterLoc), resetTryEntry(r), y; } }, catch: function _catch(t) { for (var e = this.tryEntries.length - 1; e >= 0; --e) { var r = this.tryEntries[e]; if (r.tryLoc === t) { var n = r.completion; if ("throw" === n.type) { var o = n.arg; resetTryEntry(r); } return o; } } throw new Error("illegal catch attempt"); }, delegateYield: function delegateYield(e, r, n) { return this.delegate = { iterator: values(e), resultName: r, nextLoc: n }, "next" === this.method && (this.arg = t), y; } }, e; }
 function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) { try { var info = gen[key](arg); var value = info.value; } catch (error) { reject(error); return; } if (info.done) { resolve(value); } else { Promise.resolve(value).then(_next, _throw); } }
 function _asyncToGenerator(fn) { return function () { var self = this, args = arguments; return new Promise(function (resolve, reject) { var gen = fn.apply(self, args); function _next(value) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "next", value); } function _throw(err) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "throw", err); } _next(undefined); }); }; }
@@ -33,6 +38,9 @@ export var RoleSelect = function RoleSelect() {
     }),
     state = _useStateData.state,
     update = _useStateData.update;
+  var initSelectId = useMemo(function () {
+    return "".concat(state.modelId[0], "-").concat(state.jobId[0]);
+  }, []);
   var findLabel = useMemo(function () {
     if (state.loading) return '';
     var jobId = state.jobId[0];
@@ -134,6 +142,9 @@ export var RoleSelect = function RoleSelect() {
   }, [state.searchText, state.jobList], {
     wait: 16
   });
+
+  // console.log(state.searchList.map((ii) => ({ ...ii, key: `${state.modelId[0]}-${ii.key}` })));
+
   return /*#__PURE__*/_jsx(Popover, {
     placement: "bottomRight"
     // styles={{
@@ -170,10 +181,14 @@ export var RoleSelect = function RoleSelect() {
                 }
               })
             }), /*#__PURE__*/_jsx(Menu, {
-              selectedKeys: state.jobId,
-              items: state.searchList,
+              selectedKeys: [initSelectId],
+              items: state.searchList.map(function (ii) {
+                return _objectSpread(_objectSpread({}, ii), {}, {
+                  key: "".concat(state.modelId[0], "-").concat(ii.key)
+                });
+              }),
               onSelect: function onSelect(info) {
-                console.log(info);
+                // console.log(info);
 
                 // state.jobId = key.selectedKeys;
                 // update();
@@ -181,7 +196,8 @@ export var RoleSelect = function RoleSelect() {
                   title: '切换角色确认',
                   content: '切换角色后需要刷新页面，是否确认？',
                   onOk: function onOk() {
-                    service.toggleJobApi(state.modelId[0], Number(info.selectedKeys[0])).then(function (res) {
+                    var keyPath = info.selectedKeys[0].split('-');
+                    service.toggleJobApi(keyPath[0], Number(keyPath[1])).then(function (res) {
                       var token = res.data.token;
                       if (token) {
                         setLocalStorageItem(LOCAL_STORAGE.ACCESS_TOKEN, token);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@teamias/pro-layout",
-  "version": "0.0.22",
+  "version": "0.0.24",
   "description": "A react library developed with dumi",
   "license": "MIT",
   "module": "dist/index.js",