@quansitech/antd-admin 1.1.4 → 1.1.6

package/dist/components/Column/Cascader.js

@@ -98,7 +98,7 @@ export default function (props) {
       return;
     }
     var value = values[values.length - 1];
-    (_props$fieldProps2 = props.fieldProps) === null || _props$fieldProps2 === void 0 || _props$fieldProps2.onChange(props.dataIndex, value);
+    (_props$fieldProps2 = props.fieldProps) === null || _props$fieldProps2 === void 0 || _props$fieldProps2.onChange(value);
   };
   return /*#__PURE__*/React.createElement("div", {
     className: props.className

package/dist/components/Column/File.js

@@ -74,6 +74,19 @@ export default function (props) {
       return _ref2.apply(this, arguments);
     };
   }();
+  useEffect(function () {
+    var _props$fieldProps;
+    if (loading) {
+      return;
+    }
+    var values = fileList.map(function (file) {
+      if (file.status === 'done') {
+        file.url = file.response.url || file.response.file_url;
+      }
+      return file;
+    });
+    (_props$fieldProps = props.fieldProps) === null || _props$fieldProps === void 0 || _props$fieldProps.onChange(values);
+  }, [fileList]);
   useEffect(function () {
     var extraRenderValue = [];
     if (formContext && formContext.extraRenderValues) {
@@ -87,6 +100,10 @@ export default function (props) {
       });
       extraRenderValue = (_tableContext$extraRe = (_tableContext$extraRe2 = tableContext.extraRenderValues[index]) === null || _tableContext$extraRe2 === void 0 ? void 0 : _tableContext$extraRe2[props.fieldProps.dataIndex]) !== null && _tableContext$extraRe !== void 0 ? _tableContext$extraRe : [];
     }
+    if (!extraRenderValue.length) {
+      setLoading(false);
+      return;
+    }
     setFileList(extraRenderValue.map(function (item) {
       return {
         uid: item.id,
@@ -102,16 +119,6 @@ export default function (props) {
     }));
     setLoading(false);
   }, []);
-  useEffect(function () {
-    var _props$fieldProps;
-    var values = fileList.map(function (file) {
-      if (file.status === 'done') {
-        file.url = file.response.url || file.response.file_url;
-      }
-      return file;
-    });
-    (_props$fieldProps = props.fieldProps) === null || _props$fieldProps === void 0 || _props$fieldProps.onChange(values);
-  }, [fileList]);
   var uploadButton = /*#__PURE__*/React.createElement(Tooltip, {
     title: fileList.length >= (((_props$fieldProps2 = props.fieldProps) === null || _props$fieldProps2 === void 0 ? void 0 : _props$fieldProps2.maxCount) || 1) ? '最多只能上传' + (((_props$fieldProps3 = props.fieldProps) === null || _props$fieldProps3 === void 0 ? void 0 : _props$fieldProps3.maxCount) || 1) + '个文件' : ''
   }, /*#__PURE__*/React.createElement(Button, {

package/dist/components/Column/Readonly/Action.d.ts

@@ -1,11 +1,10 @@
 import React from "react";
 import { ColumnReadonlyProps } from "./types";
-import { Rules } from "@rc-component/async-validator/lib/interface";
 declare const _default: (props: ColumnReadonlyProps & {
     actions?: {
         type: string;
         title: string;
-        showRules?: Rules;
+        showCondition?: Condition;
         badge?: any;
     }[];
 }) => React.JSX.Element;

package/dist/components/Column/Readonly/Action.js

@@ -5,72 +5,39 @@ function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t =
 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); }); }; }
-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); }
-function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
-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 React, { useEffect, useState } from "react";
+import React, { useMemo } from "react";
 import container from "../../../lib/container";
 import { Badge, Flex } from "antd";
-import { asyncFilter, handleRules } from "../../../lib/helpers";
+import { handleCondition } from "../../../lib/helpers";
 import { upperFirst } from "es-toolkit";
 export default (function (props) {
   var actions = props.fieldProps.actions;
   var record = props.record;
-  var _useState = useState([]),
-    _useState2 = _slicedToArray(_useState, 2),
-    Components = _useState2[0],
-    setComponents = _useState2[1];
-  useEffect(function () {
-    if (actions) {
-      asyncFilter(actions, /*#__PURE__*/function () {
-        var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(Component) {
-          return _regeneratorRuntime().wrap(function _callee$(_context) {
-            while (1) switch (_context.prev = _context.next) {
-              case 0:
-                if (Component.showRules) {
-                  _context.next = 2;
-                  break;
-                }
-                return _context.abrupt("return", true);
-              case 2:
-                _context.next = 4;
-                return handleRules(Component.showRules, record);
-              case 4:
-                return _context.abrupt("return", _context.sent);
-              case 5:
-              case "end":
-                return _context.stop();
-            }
-          }, _callee);
-        }));
-        return function (_x) {
-          return _ref.apply(this, arguments);
-        };
-      }()).then(function (Components) {
-        return setComponents(Components.map(function (a) {
-          var badge = a.badge;
-          var matches = (badge + '').match(/^__(\w+)__$/);
-          if (matches) {
-            badge = record[matches[1]];
-          }
-          var c = "Column.Readonly.Action.".concat(upperFirst(a.type));
-          return {
-            props: _objectSpread(_objectSpread({}, a), {}, {
-              record: record,
-              badge: badge
-            }),
-            component: container.get(c)
-          };
-        }));
-      });
+  var Components = useMemo(function () {
+    if (!(actions !== null && actions !== void 0 && actions.length)) {
+      return [];
     }
-  }, []);
+    return actions.filter(function (Component) {
+      if (!Component.showCondition) {
+        return true;
+      }
+      return handleCondition(Component.showCondition, record);
+    }).map(function (a) {
+      var badge = a.badge;
+      var matches = (badge + '').match(/^__(\w+)__$/);
+      if (matches) {
+        badge = record[matches[1]];
+      }
+      var c = "Column.Readonly.Action.".concat(upperFirst(a.type));
+      return {
+        props: _objectSpread(_objectSpread({}, a), {}, {
+          record: record,
+          badge: badge
+        }),
+        component: container.get(c)
+      };
+    });
+  }, [actions, record]);
   return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(Flex, {
     wrap: true
   }, Components.map(function (Component) {

package/dist/components/Column/Readonly/File.js

@@ -46,7 +46,7 @@ export default function (props) {
       };
     }));
     setLoading(false);
-  }, []);
+  }, [props.record]);
   return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(Spin, {
     spinning: loading
   }, /*#__PURE__*/React.createElement(Upload, {

package/dist/components/Column/Ueditor.d.ts

@@ -14,7 +14,6 @@ export default class Ueditor extends Component<ColumnProps & {
 }, any> {
     modalContext: ModalContextProps;
     editor: any;
-    catching: boolean;
     containerRef: HTMLElement | null;
     state: {
         loading: boolean;

package/dist/components/Column/Ueditor.js

@@ -31,7 +31,6 @@ var Ueditor = /*#__PURE__*/function (_Component) {
     _this = _super.call.apply(_super, [this].concat(args));
     _defineProperty(_assertThisInitialized(_this), "modalContext", {});
     _defineProperty(_assertThisInitialized(_this), "editor", null);
-    _defineProperty(_assertThisInitialized(_this), "catching", false);
     _defineProperty(_assertThisInitialized(_this), "containerRef", null);
     _defineProperty(_assertThisInitialized(_this), "state", {
       loading: true,
@@ -61,6 +60,7 @@ var Ueditor = /*#__PURE__*/function (_Component) {
         var that = _this2;
         window.UE.plugins['forceCatchRemoteImg'] = function () {
           if (this.options.forcecatchremote) {
+            // @ts-ignore
             this.addListener("afterpaste", function (t, a) {
               var load_src = that.props.fieldProps.ueditorPath + '/img/load.gif';
               var domUtils = window.UE.dom.domUtils;
@@ -95,16 +95,22 @@ var Ueditor = /*#__PURE__*/function (_Component) {
                 }
               }
               if (catchGo) {
-                var _that$props$form;
+                var _that$editor, _that$props$form;
                 //     $('.submit').trigger('startHandlePostData', '正在抓取图片');
-                that.catching = true;
+                that.setState({
+                  loading: true
+                });
+                that.props.fieldProps.onChange('[抓取图片中]' + ((_that$editor = that.editor) === null || _that$editor === void 0 ? void 0 : _that$editor.getContent().replace(/^\[抓取图片中]/, '')));
                 that.props.dataIndex && ((_that$props$form = that.props.form) === null || _that$props$form === void 0 ? void 0 : _that$props$form.validateFields([that.props.dataIndex]));
               }
             });
             this.addListener("catchremotesuccess", function () {
-              var _that$props$form2;
-              that.catching = false;
+              var _that$editor2, _that$props$form2;
+              that.props.fieldProps.onChange((_that$editor2 = that.editor) === null || _that$editor2 === void 0 ? void 0 : _that$editor2.getContent().replace(/^\[抓取图片中]/, ''));
               that.props.dataIndex && ((_that$props$form2 = that.props.form) === null || _that$props$form2 === void 0 ? void 0 : _that$props$form2.validateFields([that.props.dataIndex]));
+              that.setState({
+                loading: false
+              });
               //     $('.submit').trigger('endHandlePostData');
             });
           }
@@ -230,14 +236,16 @@ var Ueditor = /*#__PURE__*/function (_Component) {
           return {
             bindEvents: {
               'afterInsertRichText': function afterInsertRichText(e, html) {
-                var _that$props$form3;
+                var _that$editor3, _that$props$form3;
                 me.execCommand('cleardoc');
                 filter.call(me, html);
                 me.document.body.innerHTML = "<section>".concat(html, "</section>");
                 me.fireEvent('catchremoteimage');
-                that.catching = true;
+                that.setState({
+                  loading: true
+                });
+                that.props.fieldProps.onChange('[抓取图片中]' + ((_that$editor3 = that.editor) === null || _that$editor3 === void 0 ? void 0 : _that$editor3.getContent().replace(/^\[抓取图片中]/, '')));
                 that.props.dataIndex && ((_that$props$form3 = that.props.form) === null || _that$props$form3 === void 0 ? void 0 : _that$props$form3.validateFields([that.props.dataIndex]));
-                // $('.submit').trigger('startHandlePostData', '正在抓取图片');
               }
             },
             commands: {}
@@ -289,7 +297,7 @@ var Ueditor = /*#__PURE__*/function (_Component) {
           }
         }, /*#__PURE__*/React.createElement(Spin, {
           spinning: _this3.state.loading
-        }, /*#__PURE__*/React.createElement("div", {
+        }, /*#__PURE__*/React.createElement("textarea", {
           id: _this3.state.containerId,
           style: {
             width: _this3.state.width

package/dist/components/Layout/New.js

@@ -47,10 +47,25 @@ export default function (_ref) {
     _useState2 = _slicedToArray(_useState, 2),
     openKeys = _useState2[0],
     setOpenKeys = _useState2[1];
-  var _useState3 = useState(),
-    _useState4 = _slicedToArray(_useState3, 2),
-    route = _useState4[0],
-    setRoute = _useState4[1];
+  var route = useMemo(function () {
+    var _layoutProps$menuList;
+    return {
+      key: '/',
+      routes: (_layoutProps$menuList = layoutProps.menuList) === null || _layoutProps$menuList === void 0 ? void 0 : _layoutProps$menuList.map(function (menu) {
+        var _menu$children;
+        return {
+          name: menu.name,
+          key: menu.key,
+          children: (_menu$children = menu.children) === null || _menu$children === void 0 ? void 0 : _menu$children.map(function (child) {
+            return {
+              name: child.name,
+              key: child.key
+            };
+          })
+        };
+      })
+    };
+  }, [layoutProps.menuList]);
   useEffect(function () {
     function findKeyPath(key, list) {
       for (var i = 0; i < list.length; i++) {
@@ -91,25 +106,6 @@ export default function (_ref) {
     }
   }, [pageProps.layoutProps]);
   useEffect(function () {
-    var _layoutProps$menuList;
-    var r = {
-      key: '/',
-      routes: (_layoutProps$menuList = layoutProps.menuList) === null || _layoutProps$menuList === void 0 ? void 0 : _layoutProps$menuList.map(function (menu) {
-        var _menu$children;
-        return {
-          name: menu.name,
-          key: menu.key,
-          children: (_menu$children = menu.children) === null || _menu$children === void 0 ? void 0 : _menu$children.map(function (child) {
-            return {
-              name: child.name,
-              key: child.key
-            };
-          })
-        };
-      })
-    };
-    setRoute(r);
-
     // 设置内容高度
     function onResize() {
       if (contentRef.current) {
@@ -165,7 +161,7 @@ export default function (_ref) {
     }, proContext.dark ? /*#__PURE__*/React.createElement(MoonOutlined, null) : /*#__PURE__*/React.createElement(SunOutlined, null))));
   };
   return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(ProLayout, {
-    title: siteTitle,
+    title: layoutProps.title,
     loading: layoutContext.props.loading,
     layout: "mix",
     actionsRender: actionsRender,
@@ -174,7 +170,7 @@ export default function (_ref) {
     logo: layoutContext.props.logo,
     headerContentRender: headerContentRender,
     pageTitleRender: function pageTitleRender(p) {
-      return "".concat(pageTitle, " | ").concat(siteTitle, " \u540E\u53F0\u7BA1\u7406");
+      return "".concat(pageTitle, " | ").concat(layoutProps.title, " \u540E\u53F0\u7BA1\u7406");
     },
     footerRender: function footerRender() {
       return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(Space, null, /*#__PURE__*/React.createElement("a", {

package/dist/components/Layout.js

@@ -27,6 +27,7 @@ function ChildApp(props) {
   return /*#__PURE__*/React.createElement(React.Fragment, null, props.enableNewLayout ? /*#__PURE__*/React.createElement(New, props) : /*#__PURE__*/React.createElement(Blank, props));
 }
 export default function (props) {
+  var _pageProps$layoutProp, _pageProps$layoutProp2, _pageProps$layoutProp3, _pageProps$layoutProp4, _pageProps$layoutProp5, _pageProps$layoutProp6, _pageProps$layoutProp7;
   var _useState = useState(false),
     _useState2 = _slicedToArray(_useState, 2),
     darkMode = _useState2[0],
@@ -35,35 +36,8 @@ export default function (props) {
     _useState4 = _slicedToArray(_useState3, 2),
     enableNewLayout = _useState4[0],
     setEnableNewLayout = _useState4[1];
-  var _useState5 = useState(''),
-    _useState6 = _slicedToArray(_useState5, 2),
-    pageTitle = _useState6[0],
-    setPageTitle = _useState6[1];
-  var _useState7 = useState(''),
-    _useState8 = _slicedToArray(_useState7, 2),
-    siteTitle = _useState8[0],
-    setSiteTitle = _useState8[1];
   var pageProps = usePage().props;
-  var _useState9 = useState({
-      title: '',
-      metaTitle: '',
-      topMenuActiveKey: '',
-      menuActiveKey: '',
-      loading: false,
-      topMenu: [],
-      menuList: [],
-      logo: '',
-      userMenu: []
-    }),
-    _useState10 = _slicedToArray(_useState9, 2),
-    layoutProps = _useState10[0],
-    setLayoutProps = _useState10[1];
-  var assignProps = function assignProps(newProps) {
-    setLayoutProps(Object.assign(layoutProps, newProps));
-  };
-  useEffect(function () {
-    var _pageProps$layoutProp, _pageProps$layoutProp2, _pageProps$layoutProp3, _pageProps$layoutProp4, _pageProps$layoutProp5, _pageProps$layoutProp6, _pageProps$layoutProp7;
-    setLayoutProps({
+  var _useState5 = useState({
       title: ((_pageProps$layoutProp = pageProps.layoutProps) === null || _pageProps$layoutProp === void 0 ? void 0 : _pageProps$layoutProp.title) || '',
       metaTitle: '',
       topMenuActiveKey: (_pageProps$layoutProp2 = pageProps.layoutProps) === null || _pageProps$layoutProp2 === void 0 ? void 0 : _pageProps$layoutProp2.topMenuActiveKey,
@@ -73,17 +47,28 @@ export default function (props) {
       menuList: (_pageProps$layoutProp5 = pageProps.layoutProps) === null || _pageProps$layoutProp5 === void 0 ? void 0 : _pageProps$layoutProp5.menuList,
       logo: (_pageProps$layoutProp6 = pageProps.layoutProps) === null || _pageProps$layoutProp6 === void 0 ? void 0 : _pageProps$layoutProp6.logo,
       userMenu: (_pageProps$layoutProp7 = pageProps.layoutProps) === null || _pageProps$layoutProp7 === void 0 ? void 0 : _pageProps$layoutProp7.userMenu
-    });
+    }),
+    _useState6 = _slicedToArray(_useState5, 2),
+    layoutProps = _useState6[0],
+    setLayoutProps = _useState6[1];
+  var assignProps = function assignProps(newProps) {
+    setLayoutProps(Object.assign(layoutProps, newProps));
+  };
+  useEffect(function () {
+    var _pageProps$layoutProp8;
+    console.log('props=>', pageProps);
+    if ((_pageProps$layoutProp8 = pageProps.layoutProps) !== null && _pageProps$layoutProp8 !== void 0 && _pageProps$layoutProp8.enableNewLayout) {
+      setEnableNewLayout(true);
+    }
     var listener = function listener(e) {
-      var _e$detail$page$props$, _e$detail$page$props$2, _e$detail$page$props$3, _e$detail$page$props$4;
-      // @ts-ignore
-      setPageTitle(((_e$detail$page$props$ = e.detail.page.props.layoutProps) === null || _e$detail$page$props$ === void 0 ? void 0 : _e$detail$page$props$.metaTitle) || '');
-      // @ts-ignore
-      ((_e$detail$page$props$2 = e.detail.page.props.layoutProps) === null || _e$detail$page$props$2 === void 0 ? void 0 : _e$detail$page$props$2.title) && setSiteTitle(((_e$detail$page$props$3 = e.detail.page.props.layoutProps) === null || _e$detail$page$props$3 === void 0 ? void 0 : _e$detail$page$props$3.title) + '');
-
-      // @ts-ignore
-      if ((_e$detail$page$props$4 = e.detail.page.props.layoutProps) !== null && _e$detail$page$props$4 !== void 0 && _e$detail$page$props$4.enableNewLayout) {
-        setEnableNewLayout(true);
+      var layoutProps = e.detail.page.props.layoutProps;
+      assignProps({
+        metaTitle: (layoutProps === null || layoutProps === void 0 ? void 0 : layoutProps.metaTitle) || ''
+      });
+      if (layoutProps !== null && layoutProps !== void 0 && layoutProps.title) {
+        assignProps({
+          title: layoutProps === null || layoutProps === void 0 ? void 0 : layoutProps.title
+        });
       }
     };
     document.addEventListener('inertia:navigate', listener);
@@ -92,7 +77,7 @@ export default function (props) {
     };
   }, []);
   return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(Head, {
-    title: pageTitle + ' | ' + siteTitle + ' 后台管理'
+    title: layoutProps.metaTitle + ' | ' + layoutProps.title + ' 后台管理'
   }), /*#__PURE__*/React.createElement(LayoutContext.Provider, {
     value: {
       assignProps: assignProps,
@@ -103,8 +88,7 @@ export default function (props) {
     dark: darkMode
   }, /*#__PURE__*/React.createElement(AntdApp, null, /*#__PURE__*/React.createElement(ChildApp, _extends({}, props, {
     setDarkMode: setDarkMode,
-    pageTitle: pageTitle,
-    siteTitle: siteTitle,
+    pageTitle: layoutProps.metaTitle,
     enableNewLayout: enableNewLayout
   }))))));
 }

package/dist/components/Table/Action/Button.js

@@ -18,8 +18,7 @@ export default function (props) {
   var tableContext = useContext(TableContext);
   var onClick = /*#__PURE__*/function () {
     var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
-      var _tableContext$actionR;
-      var rowKey, data, _props$selectedRows, _loop, _ret, key;
+      var rowKey, data, _props$selectedRows, _loop, _ret, key, _tableContext$actionR;
       return _regeneratorRuntime().wrap(function _callee$(_context2) {
         while (1) switch (_context2.prev = _context2.next) {
           case 0:
@@ -32,7 +31,7 @@ export default function (props) {
             return _context2.abrupt("return");
           case 4:
             if (!props.request) {
-              _context2.next = 26;
+              _context2.next = 28;
               break;
             }
             setLoading(true);
@@ -100,28 +99,28 @@ export default function (props) {
               data: data
             });
           case 22:
-            _context2.prev = 22;
+            _context2.next = 24;
+            return (_tableContext$actionR = tableContext.actionRef) === null || _tableContext$actionR === void 0 ? void 0 : _tableContext$actionR.reload();
+          case 24:
+            _context2.prev = 24;
             setLoading(false);
-            return _context2.finish(22);
-          case 25:
+            return _context2.finish(24);
+          case 27:
             return _context2.abrupt("return");
-          case 26:
+          case 28:
             if (!props.modal) {
-              _context2.next = 30;
+              _context2.next = 32;
               break;
             }
-            _context2.next = 29;
+            _context2.next = 31;
             return modalShow(props.modal);
-          case 29:
+          case 31:
             return _context2.abrupt("return");
-          case 30:
-            _context2.next = 32;
-            return (_tableContext$actionR = tableContext.actionRef) === null || _tableContext$actionR === void 0 ? void 0 : _tableContext$actionR.reload();
           case 32:
           case "end":
             return _context2.stop();
         }
-      }, _callee, null, [[19,, 22, 25]]);
+      }, _callee, null, [[19,, 24, 27]]);
     }));
     return function onClick() {
       return _ref.apply(this, arguments);

package/dist/components/Table/Action/StartEditable.d.ts

@@ -6,5 +6,6 @@ export default function (props: TableActionProps & {
     saveRequest: {
         url: string;
         method: string;
+        data?: Record<string, any>;
     };
 }): React.JSX.Element;

package/dist/components/Table/Action/StartEditable.js

@@ -35,32 +35,78 @@ export default function (props) {
     setLoading = _useState2[1];
   var onSaveClick = /*#__PURE__*/function () {
     var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
-      var _tableContext$actionR3;
-      return _regeneratorRuntime().wrap(function _callee$(_context) {
-        while (1) switch (_context.prev = _context.next) {
+      var data, _loop, dataKey, _tableContext$actionR3;
+      return _regeneratorRuntime().wrap(function _callee$(_context2) {
+        while (1) switch (_context2.prev = _context2.next) {
           case 0:
             setLoading(true);
-            _context.prev = 1;
-            _context.next = 4;
+            data = tableContext.getEditedValues();
+            if (!props.saveRequest.data) {
+              _context2.next = 13;
+              break;
+            }
+            data = {};
+            _loop = /*#__PURE__*/_regeneratorRuntime().mark(function _loop(dataKey) {
+              var match;
+              return _regeneratorRuntime().wrap(function _loop$(_context) {
+                while (1) switch (_context.prev = _context.next) {
+                  case 0:
+                    data[dataKey] = [];
+                    match = props.saveRequest.data[dataKey].match(/^__(\w+)__$/);
+                    if (match) {
+                      _context.next = 4;
+                      break;
+                    }
+                    return _context.abrupt("return", 1);
+                  case 4:
+                    tableContext.getEditedValues().forEach(function (item) {
+                      data[dataKey].push(item[match[1]]);
+                    });
+                  case 5:
+                  case "end":
+                    return _context.stop();
+                }
+              }, _loop);
+            });
+            _context2.t0 = _regeneratorRuntime().keys(props.saveRequest.data);
+          case 6:
+            if ((_context2.t1 = _context2.t0()).done) {
+              _context2.next = 13;
+              break;
+            }
+            dataKey = _context2.t1.value;
+            return _context2.delegateYield(_loop(dataKey), "t2", 9);
+          case 9:
+            if (!_context2.t2) {
+              _context2.next = 11;
+              break;
+            }
+            return _context2.abrupt("continue", 6);
+          case 11:
+            _context2.next = 6;
+            break;
+          case 13:
+            _context2.prev = 13;
+            _context2.next = 16;
             return http({
               method: props.saveRequest.method,
               url: props.saveRequest.url,
-              data: tableContext.getEditedValues()
+              data: data
             });
-          case 4:
-            _context.next = 6;
+          case 16:
+            _context2.next = 18;
             return (_tableContext$actionR3 = tableContext.actionRef) === null || _tableContext$actionR3 === void 0 ? void 0 : _tableContext$actionR3.reload();
-          case 6:
-            _context.prev = 6;
+          case 18:
+            _context2.prev = 18;
             setLoading(false);
-            return _context.finish(6);
-          case 9:
+            return _context2.finish(18);
+          case 21:
             onCancelClick();
-          case 10:
+          case 22:
           case "end":
-            return _context.stop();
+            return _context2.stop();
         }
-      }, _callee, null, [[1,, 6, 9]]);
+      }, _callee, null, [[13,, 18, 21]]);
     }));
     return function onSaveClick() {
       return _ref.apply(this, arguments);

package/dist/components/Table.js

@@ -81,6 +81,45 @@ export default function (props) {
       return _ref.apply(this, arguments);
     };
   }();
+  var columns = useMemo(function () {
+    var _cloneDeep;
+    return (_cloneDeep = cloneDeep(props.columns)) === null || _cloneDeep === void 0 ? void 0 : _cloneDeep.map(function (c) {
+      var _props$defaultSearchV;
+      c.key = c.dataIndex;
+      if (((_props$defaultSearchV = props.defaultSearchValue) === null || _props$defaultSearchV === void 0 ? void 0 : _props$defaultSearchV[c.dataIndex]) !== undefined) {
+        c.initialValue = props.defaultSearchValue[c.dataIndex];
+      }
+      commonHandler(c);
+      if (container.schemaHandler[c.valueType]) {
+        return container.schemaHandler[c.valueType](c);
+      }
+      return c;
+    });
+  }, [props.columns]);
+  var postData = function postData(data) {
+    if (!isArray(data)) {
+      return data;
+    }
+    columns.map(function (column) {
+      switch (column.valueType) {
+        case 'dateTime':
+          data = data.map(function (row) {
+            var v = row[column.dataIndex];
+            if (parseInt(v) == v && v < 4102444800) {
+              row[column.dataIndex] *= 1000;
+            }
+            return row;
+          });
+          break;
+      }
+    });
+    return data.map(function (row) {
+      if (typeof row[props.rowKey] === 'undefined') {
+        row[props.rowKey] = uniqueId('row_');
+      }
+      return row;
+    });
+  };
   var formRef = useRef();
   var actionRef = useRef();
   var _useState = useState(function () {
@@ -101,11 +140,12 @@ export default function (props) {
     _useState8 = _slicedToArray(_useState7, 2),
     loading = _useState8[0],
     setLoading = _useState8[1];
-  var _useState9 = useState(),
+  // @ts-ignore
+  var _useState9 = useState(props.pagination),
     _useState10 = _slicedToArray(_useState9, 2),
     pagination = _useState10[0],
     setPagination = _useState10[1];
-  var _useState11 = useState([]),
+  var _useState11 = useState(postData(props.dataSource)),
     _useState12 = _slicedToArray(_useState11, 2),
     dataSource = _useState12[0],
     setDataSource = _useState12[1];
@@ -113,31 +153,12 @@ export default function (props) {
     _useState14 = _slicedToArray(_useState13, 2),
     sticky = _useState14[0],
     setSticky = _useState14[1];
-  var _useState15 = useState([]),
+  var _useState15 = useState(props.extraRenderValues),
     _useState16 = _slicedToArray(_useState15, 2),
     extraRenderValues = _useState16[0],
     setExtraRenderValues = _useState16[1];
-  var columns = useMemo(function () {
-    var _cloneDeep;
-    return (_cloneDeep = cloneDeep(props.columns)) === null || _cloneDeep === void 0 ? void 0 : _cloneDeep.map(function (c) {
-      var _props$defaultSearchV;
-      c.key = c.dataIndex;
-      if (((_props$defaultSearchV = props.defaultSearchValue) === null || _props$defaultSearchV === void 0 ? void 0 : _props$defaultSearchV[c.dataIndex]) !== undefined) {
-        c.initialValue = props.defaultSearchValue[c.dataIndex];
-      }
-      commonHandler(c);
-      if (container.schemaHandler[c.valueType]) {
-        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);
     if (!modalContext.inModal) {
       var _document$querySelect;
@@ -146,30 +167,6 @@ export default function (props) {
       });
     }
   }, []);
-  var postData = function postData(data) {
-    if (!isArray(data)) {
-      return data;
-    }
-    columns.map(function (column) {
-      switch (column.valueType) {
-        case 'dateTime':
-          data = data.map(function (row) {
-            var v = row[column.dataIndex];
-            if (parseInt(v) == v && v < 4102444800) {
-              row[column.dataIndex] *= 1000;
-            }
-            return row;
-          });
-          break;
-      }
-    });
-    return data.map(function (row) {
-      if (typeof row[props.rowKey] === 'undefined') {
-        row[props.rowKey] = uniqueId('row_');
-      }
-      return row;
-    });
-  };
   return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(TableContext.Provider, {
     value: {
       getTableProps: function getTableProps() {

package/dist/components/TableContext.d.ts

@@ -2,7 +2,7 @@ import React from "react";
 import { ActionType } from "@ant-design/pro-components";
 import { TableProps } from "./Table";
 import { FormInstance } from "antd/lib/form";
-type TableContextValue = {
+export type TableContextValue = {
     getTableProps: () => TableProps;
     getEditedValues: () => Record<string, any>[];
     editableKeys: React.Key[];
@@ -15,4 +15,3 @@ type TableContextValue = {
     dataSource: any[];
 };
 export declare const TableContext: React.Context<TableContextValue>;
-export {};

package/dist/lib/helpers.d.ts

@@ -1,12 +1,8 @@
 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;
-export declare function handleRules(dataRules: Rules, data: any): Promise<unknown>;
-export declare function asyncFilter(arr: any[], predicate: (item: any) => PromiseLike<any>): Promise<any[]>;
-export declare function filterObjectKeys(obj: Record<string, any>, keysToKeep: string[]): Record<string, any>;
 export declare function createScript(url: string): Promise<unknown>;
 export declare function modalShow(options: ModalOptions): Promise<{
     destroy: () => void;
@@ -14,3 +10,4 @@ export declare function modalShow(options: ModalOptions): Promise<{
 }>;
 export declare function upperFirst(str: string): string;
 export declare function getProValueTypeMap(): any;
+export declare function handleCondition(condition: Condition, data: any): any;

package/dist/lib/helpers.js

@@ -8,7 +8,6 @@ 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 _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); }
 import { router } from "@inertiajs/react";
-import Schema from '@rc-component/async-validator';
 import http from "./http";
 import container from "./container";
 import React, { Suspense } from "react";
@@ -38,53 +37,6 @@ export function replaceParams(params, data) {
 export function routerNavigateTo(url, config) {
   return router.visit(url, _objectSpread({}, config));
 }
-export function handleRules(dataRules, data) {
-  return new Promise(function (resolve) {
-    var validator = new Schema(dataRules);
-    validator.validate(data, function (errors, fields) {
-      if (errors) {
-        resolve(false);
-        return;
-      }
-      resolve(true);
-    });
-  });
-}
-export function asyncFilter(_x, _x2) {
-  return _asyncFilter.apply(this, arguments);
-}
-function _asyncFilter() {
-  _asyncFilter = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(arr, predicate) {
-    return _regeneratorRuntime().wrap(function _callee$(_context) {
-      while (1) switch (_context.prev = _context.next) {
-        case 0:
-          _context.next = 2;
-          return Promise.all(arr.map(predicate)).then(function (results) {
-            return arr.filter(function (_v, index) {
-              return results[index];
-            });
-          });
-        case 2:
-          return _context.abrupt("return", _context.sent);
-        case 3:
-        case "end":
-          return _context.stop();
-      }
-    }, _callee);
-  }));
-  return _asyncFilter.apply(this, arguments);
-}
-export function filterObjectKeys(obj, keysToKeep) {
-  if (_typeof(obj) !== 'object' || !obj) {
-    return obj;
-  }
-  return Object.keys(obj).filter(function (key) {
-    return !keysToKeep.includes(key);
-  }).reduce(function (newObj, key) {
-    newObj[key] = obj[key];
-    return newObj;
-  }, {});
-}
 export function createScript(url) {
   var scriptTags = window.document.querySelectorAll('script');
   var len = scriptTags.length;
@@ -104,21 +56,21 @@ export function createScript(url) {
     document.body.appendChild(node);
   });
 }
-export function modalShow(_x3) {
+export function modalShow(_x) {
   return _modalShow.apply(this, arguments);
 }
 function _modalShow() {
-  _modalShow = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(options) {
+  _modalShow = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(options) {
     var props, res, Component, _afterClose, modal;
-    return _regeneratorRuntime().wrap(function _callee2$(_context2) {
-      while (1) switch (_context2.prev = _context2.next) {
+    return _regeneratorRuntime().wrap(function _callee$(_context) {
+      while (1) switch (_context.prev = _context.next) {
         case 0:
           props = options.content.props;
           if (!options.content.url) {
-            _context2.next = 8;
+            _context.next = 8;
             break;
           }
-          _context2.next = 4;
+          _context.next = 4;
           return http({
             method: 'get',
             url: options.content.url,
@@ -127,9 +79,9 @@ function _modalShow() {
             }
           });
         case 4:
-          res = _context2.sent;
+          res = _context.sent;
           if (!(typeof res.data === 'string')) {
-            _context2.next = 7;
+            _context.next = 7;
             break;
           }
           throw new Error('modal response is not vail');
@@ -137,7 +89,7 @@ function _modalShow() {
           props = res.data;
         case 8:
           if (props) {
-            _context2.next = 10;
+            _context.next = 10;
             break;
           }
           throw new Error('modal props is empty');
@@ -165,15 +117,15 @@ function _modalShow() {
               _afterClose && _afterClose();
             }
           }));
-          return _context2.abrupt("return", {
+          return _context.abrupt("return", {
             destroy: modal.destroy,
             update: modal.update
           });
         case 14:
         case "end":
-          return _context2.stop();
+          return _context.stop();
       }
-    }, _callee2);
+    }, _callee);
   }));
   return _modalShow.apply(this, arguments);
 }
@@ -205,4 +157,32 @@ export function getProValueTypeMap() {
     };
     return map;
   }, {});
+}
+export function handleCondition(condition, data) {
+  switch (condition.operator) {
+    case 'eq':
+    case '=':
+      return data[condition.field] == condition.value;
+    case 'neq':
+    case '!=':
+    case '<>':
+      return data[condition.field] != condition.value;
+    case 'gt':
+    case '>':
+      return data[condition.field] > condition.value;
+    case 'gte':
+    case '>=':
+      return data[condition.field] >= condition.value;
+    case 'lt':
+    case '<':
+      return data[condition.field] < condition.value;
+    case 'elt':
+    case '<=':
+      return data[condition.field] <= condition.value;
+    case 'in':
+      return data[condition.field] && condition.value.includes(data[condition.field]);
+    case 'not in':
+      return data[condition.field] && !condition.value.includes(data[condition.field]);
+  }
+  return false;
 }

package/dist/lib/http.js

@@ -13,6 +13,7 @@ http.interceptors.request.use(function (config) {
   config.headers['X-Requested-With'] = 'XMLHttpRequest';
   return config;
 });
+var timer;
 http.interceptors.response.use(function (response) {
   var _response$config$fetc;
   var checkInfo = function checkInfo(data) {
@@ -37,8 +38,12 @@ http.interceptors.response.use(function (response) {
   }
   var showInfo = checkInfo(response.data);
   if (response.data.url) {
-    setTimeout(function () {
+    if (timer) {
+      clearTimeout(timer);
+    }
+    timer = setTimeout(function () {
       routerNavigateTo(response.data.url);
+      timer = null;
     }, showInfo ? 2000 : 0);
   }
   if (response.data.status == 0) {

package/dist/lib/schemaHandler.js

@@ -8,6 +8,7 @@ function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key i
 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); }
 import http from "./http";
+import { handleCondition } from "./helpers";
 var uploadValidator = function uploadValidator(_, value) {
   return new Promise(function (resolve, reject) {
     if (!value) {
@@ -100,21 +101,49 @@ export var schemaHandler = {
     };
     return schema;
   },
+  dependency: function dependency(schema) {
+    var _columns = schema.columns,
+      valueType = schema.valueType;
+    return {
+      valueType: valueType,
+      name: [schema.showCondition.field],
+      columns: function columns(fields) {
+        return handleCondition(schema.showCondition, fields) ? _columns : [];
+      }
+    };
+  },
   ueditor: function ueditor(schema) {
     if (!schema.formItemProps) {
       schema.formItemProps = {};
     }
-    if (!schema.fieldProps.rules) {
-      schema.fieldProps.rules = [];
+    if (!schema.formItemProps.rules) {
+      schema.formItemProps.rules = [];
     }
-    // schema.formItemProps.rules.push({
-    //     validator: async (rule: any, value: any) => {
-    //         if (this.catching) {
-    //             throw new Error('正在抓取图片')
-    //         }
-    //         return true
-    //     }
-    // })
+    schema.formItemProps.rules.push({
+      validator: function () {
+        var _validator = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(rule, value) {
+          return _regeneratorRuntime().wrap(function _callee$(_context) {
+            while (1) switch (_context.prev = _context.next) {
+              case 0:
+                if (!(value.slice(0, 7) === '[抓取图片中]')) {
+                  _context.next = 2;
+                  break;
+                }
+                throw new Error('请等待图片抓取完成');
+              case 2:
+                return _context.abrupt("return", true);
+              case 3:
+              case "end":
+                return _context.stop();
+            }
+          }, _callee);
+        }));
+        function validator(_x, _x2) {
+          return _validator.apply(this, arguments);
+        }
+        return validator;
+      }()
+    });
     return _objectSpread({}, schema);
   },
   select: function select(schema) {
@@ -123,18 +152,18 @@ export var schemaHandler = {
     if ((_schema$fieldProps = schema.fieldProps) !== null && _schema$fieldProps !== void 0 && _schema$fieldProps.searchUrl) {
       return _objectSpread(_objectSpread({}, schema), {}, {
         request: function () {
-          var _request = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(params) {
+          var _request = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(params) {
             var res;
-            return _regeneratorRuntime().wrap(function _callee$(_context) {
-              while (1) switch (_context.prev = _context.next) {
+            return _regeneratorRuntime().wrap(function _callee2$(_context2) {
+              while (1) switch (_context2.prev = _context2.next) {
                 case 0:
-                  _context.next = 2;
+                  _context2.next = 2;
                   return http(schema.fieldProps.searchUrl, {
                     params: params
                   });
                 case 2:
-                  res = _context.sent;
-                  return _context.abrupt("return", res.data.map(function (item) {
+                  res = _context2.sent;
+                  return _context2.abrupt("return", res.data.map(function (item) {
                     return {
                       label: item.label || item.value,
                       value: item.value
@@ -142,11 +171,11 @@ export var schemaHandler = {
                   }));
                 case 4:
                 case "end":
-                  return _context.stop();
+                  return _context2.stop();
               }
-            }, _callee);
+            }, _callee2);
           }));
-          function request(_x) {
+          function request(_x3) {
             return _request.apply(this, arguments);
           }
           return request;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@quansitech/antd-admin",
-  "version": "1.1.4",
+  "version": "1.1.6",
   "type": "module",
   "files": [
     "dist"