@quansitech/antd-admin 1.1.16 → 1.1.18

package/dist/components/Column/Cascader.js

@@ -31,8 +31,11 @@ export default function (props) {
       var option = options[i];
       if (option.value === value) {
         return [option.value];
-      } else if ((_option$children = option.children) !== null && _option$children !== void 0 && _option$children.length) {
-        return [option.value].concat(_toConsumableArray(findValue(option.children, value)));
+      }
+      if ((_option$children = option.children) !== null && _option$children !== void 0 && _option$children.length) {
+        if (findValue(option.children, value).length) {
+          return [option.value].concat(_toConsumableArray(findValue(option.children, value)));
+        }
       }
     }
     return [];

package/dist/components/Table.js

@@ -27,11 +27,15 @@ import http from "../lib/http";
 import "./Table.scss";
 import { ModalContext } from "./ModalContext";
 import { commonHandler } from "../lib/schemaHandler";
-import { diffTree } from "../lib/helpers";
+import { diffTree, getValueByPath } from "../lib/helpers";
+import { router } from "@inertiajs/react";
+import qs from 'qs';
+import { TabsContext } from "./TabsContext";
 export default function (props) {
+  var searchUrl = props.searchUrl;
   var request = /*#__PURE__*/function () {
     var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(params, sort, filter) {
-      var data, res;
+      var data, only, res;
       return _regeneratorRuntime().wrap(function _callee$(_context) {
         while (1) switch (_context.prev = _context.next) {
           case 0:
@@ -46,15 +50,42 @@ export default function (props) {
             }
             setEditableKeys([]);
             setEditableValues([]);
-            _context.prev = 5;
-            _context.next = 8;
-            return http.get(props.searchUrl, {
+            if (modalContext.inModal) {
+              _context.next = 10;
+              break;
+            }
+            only = ['dataSource', 'pagination'];
+            if (tabsContext.inTabs) {
+              only.push('tabs');
+            }
+            router.get(searchUrl, data, {
+              preserveScroll: true,
+              preserveState: true,
+              only: only,
+              onSuccess: function onSuccess(e) {
+                var props = e.props;
+                if (tabsContext.inTabs) {
+                  props = getValueByPath(props, tabsContext.propsPath);
+                }
+                console.log(props);
+                setDataSource(postData(props.dataSource));
+                setPagination(props.pagination);
+              },
+              onFinish: function onFinish() {
+                setLoading(false);
+              }
+            });
+            return _context.abrupt("return");
+          case 10:
+            _context.prev = 10;
+            _context.next = 13;
+            return http.get(searchUrl, {
               params: data,
               headers: {
                 'X-Table-Search': '1'
               }
             });
-          case 8:
+          case 13:
             res = _context.sent;
             if (res.data.pagination) {
               setPagination(_objectSpread(_objectSpread({}, res.data.pagination), {}, {
@@ -68,15 +99,15 @@ export default function (props) {
               data: res.data.dataSource || [],
               success: true
             });
-          case 12:
-            _context.prev = 12;
+          case 17:
+            _context.prev = 17;
             setLoading(false);
-            return _context.finish(12);
-          case 15:
+            return _context.finish(17);
+          case 20:
           case "end":
             return _context.stop();
         }
-      }, _callee, null, [[5,, 12, 15]]);
+      }, _callee, null, [[10,, 17, 20]]);
     }));
     return function request(_x, _x2, _x3) {
       return _ref.apply(this, arguments);
@@ -85,11 +116,7 @@ export default function (props) {
   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);
@@ -159,6 +186,7 @@ export default function (props) {
     extraRenderValues = _useState16[0],
     setExtraRenderValues = _useState16[1];
   var modalContext = useContext(ModalContext);
+  var tabsContext = useContext(TabsContext);
   useEffect(function () {
     setLoading(false);
     if (!modalContext.inModal) {
@@ -167,6 +195,23 @@ export default function (props) {
         offsetHeader: ((_document$querySelect = document.querySelector('.ant-layout-header')) === null || _document$querySelect === void 0 ? void 0 : _document$querySelect.clientHeight) || 56
       });
     }
+
+    // 搜索
+    if (!searchUrl) {
+      searchUrl = window.location.href;
+    }
+    if (props.defaultSearchValue !== undefined) {
+      formRef.current.setFieldsValue(props.defaultSearchValue);
+    }
+    var query = qs.parse(window.location.search.replace(/^\?/, ''));
+    if (query && Object.keys(query).length) {
+      Object.keys(query).forEach(function (key) {
+        if (typeof query[key] === 'string') {
+          /^\d+$/.test(query[key]) && (query[key] = parseInt(query[key]));
+        }
+      });
+      formRef.current.setFieldsValue(query);
+    }
   }, []);
   return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(TableContext.Provider, {
     value: {

package/dist/components/Tabs.js

@@ -7,13 +7,16 @@ function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 import { Tabs } from "antd";
 import React, { Suspense, useEffect, useMemo, useState } from "react";
 import container from "../lib/container";
-import { routerNavigateTo } from "../lib/helpers";
+import { findValuePath, routerNavigateTo } from "../lib/helpers";
 import { upperFirst } from "es-toolkit";
+import { TabsContext } from "./TabsContext";
+import { usePage } from "@inertiajs/react";
 export default function (props) {
   var _useState = useState(),
     _useState2 = _slicedToArray(_useState, 2),
     activeKey = _useState2[0],
     setActiveKey = _useState2[1];
+  var pageProps = usePage().props;
   var items = useMemo(function () {
     return Object.keys(props.tabs).map(function (key) {
       var _t$pane;
@@ -29,7 +32,12 @@ export default function (props) {
       return {
         key: key,
         label: t.title,
-        children: /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(Suspense, null, /*#__PURE__*/React.createElement(Component, t.pane.props)))
+        children: /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(TabsContext.Provider, {
+          value: {
+            inTabs: true,
+            propsPath: findValuePath(pageProps, t.pane.props)
+          }
+        }, /*#__PURE__*/React.createElement(Suspense, null, /*#__PURE__*/React.createElement(Component, t.pane.props))))
       };
     });
   }, [props.tabs]);

package/dist/components/TabsContext.d.ts

@@ -0,0 +1,6 @@
+/// <reference types="react" />
+export type TabsContextValue = {
+    inTabs: boolean;
+    propsPath: string[] | null;
+};
+export declare const TabsContext: import("react").Context<TabsContextValue>;

package/dist/components/TabsContext.js

@@ -0,0 +1,2 @@
+import { createContext } from "react";
+export var TabsContext = /*#__PURE__*/createContext({});

package/dist/lib/helpers.d.ts

@@ -14,3 +14,5 @@ export declare function handleCondition(condition: Condition, data: any): any;
 export declare function deepSet(obj: any, path: string, value: any): void;
 export declare function filterObjectKeys(obj: Record<string, any>, keysToFilter: string[]): Record<string, any>;
 export declare function diffTree(tree1: any[], tree2: any[], childKey: string): any[];
+export declare function findValuePath(obj: any, target: any, path?: string[]): string[] | null;
+export declare function getValueByPath(obj: any, path: string[]): any;

package/dist/lib/helpers.js

@@ -1,4 +1,5 @@
 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 _createForOfIteratorHelper(o, allowArrayLike) { var it = typeof Symbol !== "undefined" && o[Symbol.iterator] || o["@@iterator"]; if (!it) { if (Array.isArray(o) || (it = _unsupportedIterableToArray(o)) || allowArrayLike && o && typeof o.length === "number") { if (it) o = it; var i = 0; var F = function F() {}; return { s: F, n: function n() { if (i >= o.length) return { done: true }; return { done: false, value: o[i++] }; }, e: function e(_e) { throw _e; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var normalCompletion = true, didErr = false, err; return { s: function s() { it = it.call(o); }, n: function n() { var step = it.next(); normalCompletion = step.done; return step; }, e: function e(_e2) { didErr = true; err = _e2; }, f: function f() { try { if (!normalCompletion && it.return != null) it.return(); } finally { if (didErr) throw err; } } }; }
 function _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread(); }
 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 _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); }
@@ -101,6 +102,11 @@ function _modalShow() {
           }
           throw new Error('modal props is empty');
         case 10:
+          if (props.type === 'table') {
+            if (typeof props.ajaxRequest === 'undefined') {
+              props.ajaxRequest = true;
+            }
+          }
           Component = container.get('Modal.' + upperFirst(props.type));
           _afterClose = function afterClose() {};
           modal = global.modal.info(_objectSpread(_objectSpread({}, options), {}, {
@@ -128,7 +134,7 @@ function _modalShow() {
             destroy: modal.destroy,
             update: modal.update
           });
-        case 14:
+        case 15:
         case "end":
           return _context.stop();
       }
@@ -236,4 +242,44 @@ export function diffTree(tree1, tree2, childKey) {
     _loop();
   }
   return res;
+}
+export function findValuePath(obj, target) {
+  var path = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : [];
+  for (var key in obj) {
+    if (obj.hasOwnProperty(key)) {
+      var currentPath = [].concat(_toConsumableArray(path), [key]);
+      if (obj[key] === target) {
+        return currentPath;
+      } else if (_typeof(obj[key]) === 'object' && obj[key] !== null) {
+        var result = findValuePath(obj[key], target, currentPath);
+        if (result) {
+          return result;
+        }
+      }
+    }
+  }
+  return null;
+}
+export function getValueByPath(obj, path) {
+  if (!Array.isArray(path) || path.length === 0) {
+    return undefined; // 如果路径无效，返回 undefined
+  }
+  var current = obj;
+  var _iterator = _createForOfIteratorHelper(path),
+    _step;
+  try {
+    for (_iterator.s(); !(_step = _iterator.n()).done;) {
+      var key = _step.value;
+      if (current && _typeof(current) === 'object' && key in current) {
+        current = current[key];
+      } else {
+        return undefined; // 如果路径中的某个键不存在，返回 undefined
+      }
+    }
+  } catch (err) {
+    _iterator.e(err);
+  } finally {
+    _iterator.f();
+  }
+  return current;
 }

package/dist/lib/schemaHandler.js

@@ -42,6 +42,14 @@ var uploadTransform = function uploadTransform(value, _name) {
 };
 export var commonHandler = function commonHandler(schema) {
   if (schema.valueEnum) {
+    var _schema$valueEnum;
+    (_schema$valueEnum = schema.valueEnum) === null || _schema$valueEnum === void 0 || _schema$valueEnum.map(function (item) {
+      var key = item[0];
+      if (typeof key === 'string' && /^\d+$/.test(key)) {
+        key = Number(key);
+      }
+      return [key, item[1]];
+    });
     schema.valueEnum = new Map(schema.valueEnum);
   }
   // 有些表单项宽度并不能撑满，这里强制设置宽度
@@ -139,14 +147,20 @@ export var schemaHandler = {
           return _regeneratorRuntime().wrap(function _callee$(_context) {
             while (1) switch (_context.prev = _context.next) {
               case 0:
-                if (!(value.slice(0, 7) === '[抓取图片中]')) {
+                if (value) {
                   _context.next = 2;
                   break;
                 }
-                throw new Error('请等待图片抓取完成');
+                return _context.abrupt("return", true);
               case 2:
+                if (!(value.slice(0, 7) === '[抓取图片中]')) {
+                  _context.next = 4;
+                  break;
+                }
+                throw new Error('请等待图片抓取完成');
+              case 4:
                 return _context.abrupt("return", true);
-              case 3:
+              case 5:
               case "end":
                 return _context.stop();
             }

package/package.json

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