@quansitech/antd-admin 1.1.3 → 1.1.4

package/dist/components/Table.js

@@ -3,7 +3,6 @@ function _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableTo
 function _nonIterableSpread() { throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
 function _iterableToArray(iter) { if (typeof Symbol !== "undefined" && iter[Symbol.iterator] != null || iter["@@iterator"] != null) return Array.from(iter); }
 function _arrayWithoutHoles(arr) { if (Array.isArray(arr)) return _arrayLikeToArray(arr); }
-function _extends() { _extends = Object.assign ? Object.assign.bind() : function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends.apply(this, arguments); }
 function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
 function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
 function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
@@ -18,9 +17,9 @@ function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol"
 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 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); }); }; }
-import React, { lazy, useContext, useEffect, useRef, useState } from "react";
-import { ProSkeleton, ProTable } from "@ant-design/pro-components";
-import { cloneDeep, isArray, uniqueId, upperFirst } from "es-toolkit/compat";
+import React, { useContext, useEffect, useMemo, useRef, useState } from "react";
+import { ProTable } from "@ant-design/pro-components";
+import { cloneDeep, isArray, uniqueId } from "es-toolkit/compat";
 import { TableContext } from "./TableContext";
 import ToolbarActions from "./Table/ToolbarActions";
 import container from "../lib/container";
@@ -61,19 +60,22 @@ export default function (props) {
                 current: params.current
               }));
             }
+            if (res.data.extraRenderValues) {
+              setExtraRenderValues(res.data.extraRenderValues);
+            }
             return _context.abrupt("return", {
               data: res.data.dataSource || [],
               success: true
             });
-          case 11:
-            _context.prev = 11;
+          case 12:
+            _context.prev = 12;
             setLoading(false);
-            return _context.finish(11);
-          case 14:
+            return _context.finish(12);
+          case 15:
           case "end":
             return _context.stop();
         }
-      }, _callee, null, [[5,, 11, 14]]);
+      }, _callee, null, [[5,, 12, 15]]);
     }));
     return function request(_x, _x2, _x3) {
       return _ref.apply(this, arguments);
@@ -89,81 +91,37 @@ export default function (props) {
     setEditableKeys = _useState2[1];
   var _useState3 = useState([]),
     _useState4 = _slicedToArray(_useState3, 2),
-    columns = _useState4[0],
-    setColumns = _useState4[1];
+    selectedRows = _useState4[0],
+    setSelectedRows = _useState4[1];
   var _useState5 = useState([]),
     _useState6 = _slicedToArray(_useState5, 2),
-    selectedRows = _useState6[0],
-    setSelectedRows = _useState6[1];
-  var _useState7 = useState([]),
+    editableValues = _useState6[0],
+    setEditableValues = _useState6[1];
+  var _useState7 = useState(false),
     _useState8 = _slicedToArray(_useState7, 2),
-    editableValues = _useState8[0],
-    setEditableValues = _useState8[1];
-  var _useState9 = useState(false),
+    loading = _useState8[0],
+    setLoading = _useState8[1];
+  var _useState9 = useState(),
     _useState10 = _slicedToArray(_useState9, 2),
-    loading = _useState10[0],
-    setLoading = _useState10[1];
-  var _useState11 = useState(false),
+    pagination = _useState10[0],
+    setPagination = _useState10[1];
+  var _useState11 = useState([]),
     _useState12 = _slicedToArray(_useState11, 2),
-    initialized = _useState12[0],
-    setInitialized = _useState12[1];
-  var _useState13 = useState(),
+    dataSource = _useState12[0],
+    setDataSource = _useState12[1];
+  var _useState13 = useState(true),
     _useState14 = _slicedToArray(_useState13, 2),
-    pagination = _useState14[0],
-    setPagination = _useState14[1];
+    sticky = _useState14[0],
+    setSticky = _useState14[1];
   var _useState15 = useState([]),
     _useState16 = _slicedToArray(_useState15, 2),
-    dataSource = _useState16[0],
-    setDataSource = _useState16[1];
-  var _useState17 = useState(true),
-    _useState18 = _slicedToArray(_useState17, 2),
-    sticky = _useState18[0],
-    setSticky = _useState18[1];
-  var modalContext = useContext(ModalContext);
-  useEffect(function () {
+    extraRenderValues = _useState16[0],
+    setExtraRenderValues = _useState16[1];
+  var columns = useMemo(function () {
     var _cloneDeep;
-    // @ts-ignore
-    setPagination(props.pagination || false);
-    setDataSource(postData(props.dataSource));
-
-    // 重新定义列
-    setColumns((_cloneDeep = cloneDeep(props.columns)) === null || _cloneDeep === void 0 ? void 0 : _cloneDeep.map(function (c) {
+    return (_cloneDeep = cloneDeep(props.columns)) === null || _cloneDeep === void 0 ? void 0 : _cloneDeep.map(function (c) {
       var _props$defaultSearchV;
       c.key = c.dataIndex;
-
-      // 列render
-      var renderComponent = 'Column.Readonly.' + upperFirst(c.valueType);
-      if (container.check(renderComponent)) {
-        var Component = /*#__PURE__*/lazy(function () {
-          return container.get(renderComponent);
-        });
-        c.render = function (dom, record, index, action) {
-          return /*#__PURE__*/React.createElement(Component, _extends({}, c, {
-            schema: c,
-            key: c.title,
-            index: index,
-            record: record
-          }));
-        };
-      }
-
-      // 列查询及编辑render
-      var formItemComponent = 'Column.' + upperFirst(c.valueType);
-      if (container.check(formItemComponent)) {
-        var _Component = /*#__PURE__*/lazy(function () {
-          return container.get(formItemComponent);
-        });
-        c.renderFormItem = function (schema, config, form) {
-          return /*#__PURE__*/React.createElement(_Component, {
-            config: config,
-            form: form,
-            index: schema.index,
-            schema: schema,
-            fieldProps: c.fieldProps,
-            key: c.title
-          });
-        };
-      }
       if (((_props$defaultSearchV = props.defaultSearchValue) === null || _props$defaultSearchV === void 0 ? void 0 : _props$defaultSearchV[c.dataIndex]) !== undefined) {
         c.initialValue = props.defaultSearchValue[c.dataIndex];
       }
@@ -172,9 +130,15 @@ export default function (props) {
         return container.schemaHandler[c.valueType](c);
       }
       return c;
-    }));
+    });
+  }, [props.columns]);
+  var modalContext = useContext(ModalContext);
+  useEffect(function () {
+    // @ts-ignore
+    setPagination(props.pagination || false);
+    setDataSource(postData(props.dataSource));
+    setExtraRenderValues(props.extraRenderValues);
     setLoading(false);
-    setInitialized(true);
     if (!modalContext.inModal) {
       var _document$querySelect;
       setSticky({
@@ -186,7 +150,7 @@ export default function (props) {
     if (!isArray(data)) {
       return data;
     }
-    props.columns.map(function (column) {
+    columns.map(function (column) {
       switch (column.valueType) {
         case 'dateTime':
           data = data.map(function (row) {
@@ -217,16 +181,11 @@ export default function (props) {
       editableKeys: editableKeys,
       actionRef: actionRef.current,
       formRef: formRef.current,
-      extraRenderValues: props.extraRenderValues
+      extraRenderValues: extraRenderValues,
+      dataSource: dataSource
     }
-  }, !initialized && /*#__PURE__*/React.createElement(ProSkeleton, {
-    type: "list",
-    list: 2
-  }), /*#__PURE__*/React.createElement(ProTable, {
+  }, /*#__PURE__*/React.createElement(ProTable, {
     rowKey: props.rowKey,
-    style: {
-      display: initialized ? 'block' : 'none'
-    },
     tableClassName: 'qs-antd-table',
     columns: columns,
     onDataSourceChange: setDataSource,
@@ -250,6 +209,7 @@ export default function (props) {
         // 是否立即搜索
         if (c.searchOnChange) {
           var _formRef$current;
+          // @ts-ignore
           (_formRef$current = formRef.current) === null || _formRef$current === void 0 || _formRef$current.submit();
         }
       }

package/dist/components/TableContext.d.ts

@@ -6,9 +6,13 @@ type TableContextValue = {
     getTableProps: () => TableProps;
     getEditedValues: () => Record<string, any>[];
     editableKeys: React.Key[];
-    actionRef?: ActionType;
+    actionRef?: ActionType & {
+        startEditable: (key: React.Key, row?: any) => boolean;
+        cancelEditable: (key: React.Key) => void;
+    };
     formRef?: FormInstance;
     extraRenderValues?: Record<string, any>[];
+    dataSource: any[];
 };
 export declare const TableContext: React.Context<TableContextValue>;
 export {};

package/dist/components/Tabs.js

@@ -5,53 +5,44 @@ function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len
 function _iterableToArrayLimit(r, l) { var t = null == r ? null : "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (null != t) { var e, n, i, u, a = [], f = !0, o = !1; try { if (i = (t = t.call(r)).next, 0 === l) { if (Object(t) !== t) return; f = !1; } else for (; !(f = (e = i.call(t)).done) && (a.push(e.value), a.length !== l); f = !0); } catch (r) { o = !0, n = r; } finally { try { if (!f && null != t.return && (u = t.return(), Object(u) !== u)) return; } finally { if (o) throw n; } } return a; } }
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 import { Tabs } from "antd";
-import React, { lazy, Suspense, useEffect, useState } from "react";
+import React, { Suspense, useEffect, useMemo, useState } from "react";
 import container from "../lib/container";
 import { routerNavigateTo } from "../lib/helpers";
 import { upperFirst } from "es-toolkit";
-import { ProSkeleton } from "@ant-design/pro-components";
 export default function (props) {
-  var _useState = useState([]),
+  var _useState = useState(),
     _useState2 = _slicedToArray(_useState, 2),
-    items = _useState2[0],
-    setItems = _useState2[1];
-  var _useState3 = useState(),
-    _useState4 = _slicedToArray(_useState3, 2),
-    activeKey = _useState4[0],
-    setActiveKey = _useState4[1];
-  useEffect(function () {
-    setActiveKey(props.defaultActiveKey || Object.keys(props.tabs)[0]);
-    setItems(Object.keys(props.tabs).map(function (key) {
+    activeKey = _useState2[0],
+    setActiveKey = _useState2[1];
+  var items = useMemo(function () {
+    return Object.keys(props.tabs).map(function (key) {
+      var _t$pane;
       var t = props.tabs[key];
       if (!t.pane) {
         return {
           key: key,
           label: t.title,
-          children: /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(ProSkeleton, {
-            list: 2
-          }))
+          children: /*#__PURE__*/React.createElement(React.Fragment, null)
         };
       }
-      var Component = /*#__PURE__*/lazy(function () {
-        var _t$pane;
-        return container.get('Tab.Pane.' + upperFirst((_t$pane = t.pane) === null || _t$pane === void 0 ? void 0 : _t$pane.component));
-      });
+      var Component = container.get('Tab.Pane.' + upperFirst((_t$pane = t.pane) === null || _t$pane === void 0 ? void 0 : _t$pane.component));
       return {
         key: key,
         label: t.title,
-        children: /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(Suspense, {
-          fallback: /*#__PURE__*/React.createElement(ProSkeleton, {
-            list: 2
-          })
-        }, /*#__PURE__*/React.createElement(Component, t.pane.props)))
+        children: /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(Suspense, null, /*#__PURE__*/React.createElement(Component, t.pane.props)))
       };
-    }));
+    });
+  }, [props.tabs]);
+  useEffect(function () {
+    setActiveKey(props.defaultActiveKey || Object.keys(props.tabs)[0]);
   }, []);
   var onChange = function onChange(key) {
     setActiveKey(key);
     var tab = props.tabs[key];
     if (tab.url) {
-      routerNavigateTo(tab.url);
+      routerNavigateTo(tab.url, {
+        preserveState: true
+      });
     }
   };
   return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(Tabs, {

package/dist/index.d.ts

@@ -2,6 +2,6 @@ import container from "./lib/container";
 import Layout from "./components/Layout";
 import http from "./lib/http";
 export { container, Layout, http, };
-export declare const Form: Promise<typeof import("./components/Form")>;
-export declare const Table: Promise<typeof import("./components/Table")>;
-export declare const Tabs: Promise<typeof import("./components/Tabs")>;
+export declare const Form: () => Promise<typeof import("./components/Form")>;
+export declare const Table: () => Promise<typeof import("./components/Table")>;
+export declare const Tabs: () => Promise<typeof import("./components/Tabs")>;

package/dist/index.js

@@ -2,6 +2,12 @@ import container from "./lib/container";
 import Layout from "./components/Layout";
 import http from "./lib/http";
 export { container, Layout, http };
-export var Form = import("./components/Form");
-export var Table = import("./components/Table");
-export var Tabs = import("./components/Tabs");
+export var Form = function Form() {
+  return import("./components/Form");
+};
+export var Table = function Table() {
+  return import("./components/Table");
+};
+export var Tabs = function Tabs() {
+  return import("./components/Tabs");
+};

package/dist/lib/container.d.ts

@@ -3,6 +3,7 @@ declare const container: {
     register(name: string, componentLoader: any): void;
     get(name: string): any;
     check(name: string): boolean;
+    list(prefix: string): Record<string, any>;
     schemaHandler: Record<string, (schema: any) => import("@ant-design/pro-utils").ProSchema | import("@ant-design/pro-table").ProColumnType>;
     routerNavigateTo: typeof routerNavigateTo;
 };

package/dist/lib/container.js

@@ -15,13 +15,15 @@ import columnReadonly from "../components/Column/Readonly";
 import columnReadonlyAction from "../components/Column/Readonly/Action/index";
 import tableAction from "../components/Table/Action";
 import formAction from "../components/Form/Action";
+import { lazy } from "react";
+import { lowerFirst } from "lodash";
 var components = {};
 var container = {
   register: function register(name, componentLoader) {
     if (this.check(name)) {
       throw new Error("Component ".concat(name, " already registered"));
     }
-    components[name] = componentLoader;
+    components[name] = /*#__PURE__*/lazy(componentLoader);
   },
   get: function get(name) {
     if (!this.check(name)) {
@@ -32,6 +34,19 @@ var container = {
   check: function check(name) {
     return !!components[name];
   },
+  list: function list(prefix) {
+    var _this = this;
+    prefix = prefix.replace(/\.$/, '');
+    var keys = Object.keys(components).filter(function (key) {
+      return key.match(new RegExp("^".concat(prefix, "\\.\\w+$")));
+    }).map(function (key) {
+      return key.replace(new RegExp("^".concat(prefix, "\\.")), '');
+    });
+    return keys.reduce(function (acc, key) {
+      acc[lowerFirst(key)] = _this.get(prefix + '.' + key);
+      return acc;
+    }, {});
+  },
   schemaHandler: schemaHandler,
   routerNavigateTo: routerNavigateTo
 };
@@ -66,14 +81,25 @@ function _autoRegister() {
 
 // -------- 弹窗 -----------
 {
-  container.register('Modal.Table', import("../components/Table"));
-  container.register('Modal.Form', import("../components/Form"));
+  container.register('Modal.Table', function () {
+    return import("../components/Table");
+  });
+  container.register('Modal.Form', function () {
+    return import("../components/Form");
+  });
+  container.register('Modal.Tabs', function () {
+    return import("../components/Tabs");
+  });
 }
 
 // -------- Tabs -----------
 {
-  container.register('Tab.Pane.Table', import("../components/Table"));
-  container.register('Tab.Pane.Form', import("../components/Form"));
+  container.register('Tab.Pane.Table', function () {
+    return import("../components/Table");
+  });
+  container.register('Tab.Pane.Form', function () {
+    return import("../components/Form");
+  });
 }
 
 // -------- 表格 -----------

package/dist/lib/helpers.d.ts

@@ -1,5 +1,6 @@
 import { VisitOptions } from "@inertiajs/core/types/types";
 import { Rules } from "@rc-component/async-validator/lib/interface";
+import { ModalFuncProps } from "antd";
 export declare function replaceUrl(url: string, params: any): string;
 export declare function replaceParams(params: Record<string, any>, data: Record<string, any>): Record<string, any>;
 export declare function routerNavigateTo(url: string, config?: VisitOptions): void;
@@ -9,6 +10,7 @@ export declare function filterObjectKeys(obj: Record<string, any>, keysToKeep: s
 export declare function createScript(url: string): Promise<unknown>;
 export declare function modalShow(options: ModalOptions): Promise<{
     destroy: () => void;
-    update: (configUpdate: import("antd").ModalFuncProps | ((prevConfig: import("antd").ModalFuncProps) => import("antd").ModalFuncProps)) => void;
+    update: (configUpdate: ModalFuncProps | ((prevConfig: ModalFuncProps) => ModalFuncProps)) => void;
 }>;
 export declare function upperFirst(str: string): string;
+export declare function getProValueTypeMap(): any;

package/dist/lib/helpers.js

@@ -11,9 +11,10 @@ import { router } from "@inertiajs/react";
 import Schema from '@rc-component/async-validator';
 import http from "./http";
 import container from "./container";
-import React, { lazy } from "react";
+import React, { Suspense } from "react";
 import global from "./global";
 import { ModalContext } from "../components/ModalContext";
+import { uniq } from "lodash";
 export function replaceUrl(url, params) {
   return url.replace(/__([\w]+)__/g, function (match, key) {
     return params[key] || match;
@@ -141,9 +142,7 @@ function _modalShow() {
           }
           throw new Error('modal props is empty');
         case 10:
-          Component = /*#__PURE__*/lazy(function () {
-            return container.get('Modal.' + upperFirst(props.type));
-          });
+          Component = container.get('Modal.' + upperFirst(props.type));
           _afterClose = function afterClose() {};
           modal = global.modal.info(_objectSpread(_objectSpread({}, options), {}, {
             closable: true,
@@ -161,7 +160,7 @@ function _modalShow() {
                   _afterClose = callback;
                 }
               }
-            }, /*#__PURE__*/React.createElement(Component, props)),
+            }, /*#__PURE__*/React.createElement(Suspense, null, /*#__PURE__*/React.createElement(Component, props))),
             afterClose: function afterClose() {
               _afterClose && _afterClose();
             }
@@ -180,4 +179,30 @@ function _modalShow() {
 }
 export function upperFirst(str) {
   return str.charAt(0).toUpperCase() + str.slice(1);
+}
+export function getProValueTypeMap() {
+  var columnKeys = Object.keys(container.list('Column.'));
+  var readonlyKeys = Object.keys(container.list('Column.Readonly.'));
+  var types = uniq(columnKeys.concat(readonlyKeys));
+  return types.reduce(function (map, type) {
+    map[type] = {
+      render: function render(text, props) {
+        var renderComponent = 'Column.Readonly.' + upperFirst(type);
+        if (container.check(renderComponent)) {
+          var Component = container.get(renderComponent);
+          return /*#__PURE__*/React.createElement(Suspense, null, /*#__PURE__*/React.createElement(Component, props));
+        }
+        return /*#__PURE__*/React.createElement(React.Fragment, null, text);
+      },
+      renderFormItem: function renderFormItem(text, props) {
+        var renderComponent = 'Column.' + upperFirst(type);
+        if (container.check(renderComponent)) {
+          var Component = container.get(renderComponent);
+          return /*#__PURE__*/React.createElement(Suspense, null, /*#__PURE__*/React.createElement(Component, props));
+        }
+        return /*#__PURE__*/React.createElement(React.Fragment, null, text);
+      }
+    };
+    return map;
+  }, {});
 }

package/dist/lib/schemaHandler.js

@@ -80,6 +80,7 @@ export var schemaHandler = {
     schema.formItemProps.rules.push({
       validator: uploadValidator
     });
+    schema.fieldProps.dataIndex = schema.dataIndex;
     return _objectSpread(_objectSpread({}, schema), {}, {
       transform: uploadTransform
     });
@@ -88,10 +89,34 @@ export var schemaHandler = {
     schema.formItemProps.rules.push({
       validator: uploadValidator
     });
+    schema.fieldProps.dataIndex = schema.dataIndex;
     return _objectSpread(_objectSpread({}, schema), {}, {
       transform: uploadTransform
     });
   },
+  action: function action(schema) {
+    schema.fieldProps = {
+      actions: schema.actions
+    };
+    return schema;
+  },
+  ueditor: function ueditor(schema) {
+    if (!schema.formItemProps) {
+      schema.formItemProps = {};
+    }
+    if (!schema.fieldProps.rules) {
+      schema.fieldProps.rules = [];
+    }
+    // schema.formItemProps.rules.push({
+    //     validator: async (rule: any, value: any) => {
+    //         if (this.catching) {
+    //             throw new Error('正在抓取图片')
+    //         }
+    //         return true
+    //     }
+    // })
+    return _objectSpread({}, schema);
+  },
   select: function select(schema) {
     var _schema$fieldProps;
     schema.searchOnChange = true;

package/dist/lib/writeExtra.js

@@ -20,7 +20,7 @@ export default function () {
   var extra_script = "\nimport {container} from \"@quansitech/antd-admin\";\n\n".concat(extras.map(function (e) {
     var cs = [];
     for (var componentKey in e.component) {
-      cs.push("container.register('".concat(componentKey, "', () => import('../../../vendor").concat(path.join('/', e.path, e.component[componentKey]), "'));"));
+      cs.push("container.register('".concat(componentKey, "', ()=>import('../../../vendor").concat(path.join('/', e.path, e.component[componentKey]), "'));"));
     }
     return cs.join('\n');
   }), "\n");

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@quansitech/antd-admin",
-  "version": "1.1.3",
+  "version": "1.1.4",
   "type": "module",
   "files": [
     "dist"
@@ -25,6 +25,7 @@
     "@types/react": "^18.3.0",
     "@types/react-dom": "^18.3.0",
     "father": "^4.5.1",
+    "jest": "^29.7.0",
     "sass-embedded": "^1.80.6",
     "typescript": "^5.6.3"
   },