@quansitech/antd-admin 1.1.27 → 1.1.29

package/dist/components/Column/Cascader.js

@@ -14,8 +14,10 @@ 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 { Cascader } from "antd";
-import React, { useEffect, useState } from "react";
+import React, { useContext, useEffect, useState } from "react";
 import http from "../../lib/http";
+import { FormContext } from "../FormContext";
+import { TableContext } from "../TableContext";
 export default function (props) {
   var _useState = useState(),
     _useState2 = _slicedToArray(_useState, 2),
@@ -25,6 +27,8 @@ export default function (props) {
     _useState4 = _slicedToArray(_useState3, 2),
     values = _useState4[0],
     setValues = _useState4[1];
+  var formContext = useContext(FormContext);
+  var tableContext = useContext(TableContext);
   var findValue = function findValue(options, value) {
     for (var i = 0; i < options.length; i++) {
       var _option$children;
@@ -57,6 +61,21 @@ export default function (props) {
         setValues(findValue(props.fieldProps.options, value));
       }
     }
+    var extraData;
+    if (formContext.extraRenderValues) {
+      extraData = formContext.extraRenderValues[props.fieldProps.dataIndex];
+    }
+    if (tableContext.extraRenderValues) {
+      var _tableContext$extraRe;
+      extraData = (_tableContext$extraRe = tableContext.extraRenderValues[props.index]) === null || _tableContext$extraRe === void 0 ? void 0 : _tableContext$extraRe[props.fieldProps.dataIndex];
+    }
+    if (extraData) {
+      setOptions(extraData.options);
+      if (value) {
+        setValues(findValue(extraData.options, value));
+      }
+      return;
+    }
 
     // 远程获取数据
     if (props.fieldProps.loadDataUrl) {

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

@@ -1,5 +1,6 @@
 import React from "react";
 import { TableColumnActionProps } from "./types";
+import { ModalOptions, RequestOptions } from "../../../../types";
 type Props = TableColumnActionProps & {
     href?: string;
     request?: RequestOptions;

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

@@ -1,5 +1,6 @@
 import React from "react";
 import { ColumnReadonlyProps } from "./types";
+import { Condition } from "../../../types";
 declare const _default: (props: ColumnReadonlyProps & {
     actions?: {
         type: string;

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

@@ -8,43 +8,64 @@ function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o =
 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, { useContext, useEffect, useState } from "react";
 import http from "../../../lib/http";
+import { FormContext } from "../../FormContext";
+import { TableContext } from "../../TableContext";
 export default function (props) {
   var _useState = useState('-'),
     _useState2 = _slicedToArray(_useState, 2),
     text = _useState2[0],
     setText = _useState2[1];
+  var formContext = useContext(FormContext);
+  var tableContext = useContext(TableContext);
+  var findValue = function findValue(options, value) {
+    for (var i = 0; i < options.length; i++) {
+      var option = options[i];
+      if (option.value === value) {
+        return [option.label];
+      } else if (option.children) {
+        return [option.label].concat(_toConsumableArray(findValue(option.children, value)));
+      }
+    }
+  };
   useEffect(function () {
     var _props$fieldProps;
     setText(props.fieldProps.value);
     var value = props.fieldProps.value;
+    var extraData;
+    if (formContext.extraRenderValues) {
+      extraData = formContext.extraRenderValues[props.fieldProps.dataIndex];
+    }
+    if (tableContext.extraRenderValues) {
+      var _tableContext$extraRe;
+      var key = tableContext.getTableProps().rowKey;
+      var index = tableContext.dataSource.findIndex(function (item) {
+        return item[key] === props.record[key];
+      });
+      extraData = (_tableContext$extraRe = tableContext.extraRenderValues[index]) === null || _tableContext$extraRe === void 0 ? void 0 : _tableContext$extraRe[props.fieldProps.dataIndex];
+    }
+    if (extraData) {
+      setText(findValue(extraData.options, value).join(' / '));
+      return;
+    }
 
     // 远程获取数据
-    if ((_props$fieldProps = props.fieldProps) !== null && _props$fieldProps !== void 0 && _props$fieldProps.loadDataUrl) {
-      http({
-        url: props.fieldProps.loadDataUrl,
-        method: 'get',
-        params: {
-          value: value
-        }
-      }).then(function (res) {
-        if (!value) {
-          return;
-        }
-        var findValue = function findValue(options, value) {
-          for (var i = 0; i < options.length; i++) {
-            var option = options[i];
-            if (option.value === value) {
-              return [option.label];
-            } else if (option.children) {
-              return [option.label].concat(_toConsumableArray(findValue(option.children, value)));
-            }
-          }
-        };
-        setText(findValue(res.data, value).join(' / '));
-      });
+    if (!((_props$fieldProps = props.fieldProps) !== null && _props$fieldProps !== void 0 && _props$fieldProps.loadDataUrl)) {
+      return;
     }
+    http({
+      url: props.fieldProps.loadDataUrl,
+      method: 'get',
+      params: {
+        value: value
+      }
+    }).then(function (res) {
+      if (!value) {
+        return;
+      }
+      setText(findValue(res.data, value).join(' / '));
+    });
   }, []);
   return /*#__PURE__*/React.createElement("div", null, text);
 }

package/dist/components/Form/Action/Button.d.ts

@@ -1,5 +1,6 @@
 import { FormActionType } from "./types";
 import React from "react";
+import { ModalOptions, RequestOptions } from "../../../types";
 export default function (props: FormActionType & {
     props: any;
     submit?: boolean | {

package/dist/components/Layout/New.d.ts

@@ -1,5 +1,6 @@
 import React from "react";
-export default function ({ children, pageTitle, siteTitle, setDarkMode }: {
+import './New.scss';
+export default function ({ children, pageTitle, setDarkMode }: {
     children: React.ReactNode;
     pageTitle: string;
     siteTitle: string;

package/dist/components/Layout/New.js

@@ -24,11 +24,11 @@ import http from "../../lib/http";
 
 import { MoonOutlined, SunOutlined } from "@ant-design/icons";
 import { usePage } from "@inertiajs/react";
+import "./New.scss";
 export default function (_ref) {
   var _layoutContext$props$;
   var children = _ref.children,
     pageTitle = _ref.pageTitle,
-    siteTitle = _ref.siteTitle,
     setDarkMode = _ref.setDarkMode;
   var contentRef = useRef(null);
   var layoutContext = useContext(LayoutContext);
@@ -173,7 +173,7 @@ export default function (_ref) {
   };
   var proContext = useContext(ProProvider);
   var actionsRender = function actionsRender() {
-    return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(Space, null, /*#__PURE__*/React.createElement(Button, {
+    return /*#__PURE__*/React.createElement(React.Fragment, null, layoutProps.headerActions, /*#__PURE__*/React.createElement(Space, null, /*#__PURE__*/React.createElement(Button, {
       type: 'text',
       onClick: function onClick() {
         setDarkMode(!proContext.dark);
@@ -193,7 +193,7 @@ export default function (_ref) {
       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", {
+      return /*#__PURE__*/React.createElement(React.Fragment, null, layoutProps.footer !== undefined ? /*#__PURE__*/React.createElement(React.Fragment, null, layoutProps.footer) : /*#__PURE__*/React.createElement(Space, null, /*#__PURE__*/React.createElement("a", {
         href: "https://www.quansitech.com/",
         target: '_blank'
       }, "\u5168\u601D\u79D1\u6280"), /*#__PURE__*/React.createElement("a", {
@@ -202,7 +202,7 @@ export default function (_ref) {
       }, "Github")));
     },
     avatarProps: {
-      title: 'admin',
+      title: layoutProps.userName,
       render: function render(p, dom) {
         var _layoutContext$props$4;
         return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(Dropdown, {

package/dist/components/Layout/New.scss

@@ -0,0 +1,3 @@
+.ant-pro-global-header .ant-menu {
+  background: none;
+}

package/dist/components/Layout.d.ts

@@ -1,2 +1,6 @@
 import React from "react";
-export default function (props: any): React.JSX.Element;
+type ExportLayoutProps = {
+    footer?: React.ReactNode;
+};
+export default function (props: Record<string, any> & React.PropsWithChildren<ExportLayoutProps>): React.JSX.Element;
+export {};

package/dist/components/Layout.js

@@ -1,5 +1,4 @@
 function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
-function _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 ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
@@ -30,10 +29,16 @@ function ChildApp(props) {
     global.notification = notification;
     global.message = message;
   }, []);
-  return /*#__PURE__*/React.createElement(React.Fragment, null, props.enableNewLayout ? /*#__PURE__*/React.createElement(New, props) : /*#__PURE__*/React.createElement(Blank, props));
+  return /*#__PURE__*/React.createElement(React.Fragment, null, props.enableNewLayout ? /*#__PURE__*/React.createElement(New, {
+    pageTitle: props.pageTitle,
+    siteTitle: props.siteTitle,
+    setDarkMode: props.setDarkMode
+  }, props.children) : /*#__PURE__*/React.createElement(Blank, {
+    pageTitle: props.pageTitle
+  }, props.children));
 }
 export default function (props) {
-  var _pageProps$layoutProp, _pageProps$layoutProp2, _pageProps$layoutProp3, _pageProps$layoutProp4, _pageProps$layoutProp5, _pageProps$layoutProp6, _pageProps$layoutProp7;
+  var _pageProps$layoutProp, _pageProps$layoutProp2, _pageProps$layoutProp3, _pageProps$layoutProp4, _pageProps$layoutProp5, _pageProps$layoutProp6, _pageProps$layoutProp7, _pageProps$layoutProp8, _pageProps$layoutProp10;
   var _useState = useState(false),
     _useState2 = _slicedToArray(_useState, 2),
     darkMode = _useState2[0],
@@ -52,7 +57,10 @@ export default function (props) {
       topMenu: (_pageProps$layoutProp4 = pageProps.layoutProps) === null || _pageProps$layoutProp4 === void 0 ? void 0 : _pageProps$layoutProp4.topMenu,
       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
+      userMenu: (_pageProps$layoutProp7 = pageProps.layoutProps) === null || _pageProps$layoutProp7 === void 0 ? void 0 : _pageProps$layoutProp7.userMenu,
+      userName: (_pageProps$layoutProp8 = pageProps.layoutProps) === null || _pageProps$layoutProp8 === void 0 ? void 0 : _pageProps$layoutProp8.userName,
+      footer: props.footer,
+      headerActions: props.headerActions
     }),
     _useState6 = _slicedToArray(_useState5, 2),
     layoutProps = _useState6[0],
@@ -61,9 +69,9 @@ export default function (props) {
     setLayoutProps(Object.assign(layoutProps, newProps));
   };
   useEffect(function () {
-    var _pageProps$layoutProp8;
+    var _pageProps$layoutProp9;
     console.log('props=>', pageProps);
-    if ((_pageProps$layoutProp8 = pageProps.layoutProps) !== null && _pageProps$layoutProp8 !== void 0 && _pageProps$layoutProp8.enableNewLayout) {
+    if ((_pageProps$layoutProp9 = pageProps.layoutProps) !== null && _pageProps$layoutProp9 !== void 0 && _pageProps$layoutProp9.enableNewLayout) {
       setEnableNewLayout(true);
     }
     var listener = function listener(e) {
@@ -116,9 +124,10 @@ export default function (props) {
   }, /*#__PURE__*/React.createElement(ProConfigProvider, {
     valueTypeMap: getProValueTypeMap(),
     dark: darkMode
-  }, /*#__PURE__*/React.createElement(AntdApp, null, /*#__PURE__*/React.createElement(ChildApp, _extends({}, props, {
+  }, /*#__PURE__*/React.createElement(AntdApp, null, /*#__PURE__*/React.createElement(ChildApp, {
     setDarkMode: setDarkMode,
+    siteTitle: (_pageProps$layoutProp10 = pageProps.layoutProps) === null || _pageProps$layoutProp10 === void 0 ? void 0 : _pageProps$layoutProp10.siteTitle,
     pageTitle: layoutProps.metaTitle,
     enableNewLayout: enableNewLayout
-  }))))));
+  }, props.children)))));
 }

package/dist/components/LayoutContext.d.ts

@@ -1,4 +1,4 @@
-/// <reference types="react" />
+import { ReactNode } from "react";
 import { MenuDataItem } from "@ant-design/pro-components";
 declare type LayoutContextValue = {
     assignProps: (props: LayoutProps) => void;
@@ -16,11 +16,14 @@ export declare type LayoutProps = {
     }[];
     menuList?: MenuDataItem[];
     logo?: string;
+    userName?: string;
     userMenu?: {
         title: string;
         url: string;
         type: string;
     }[];
+    footer?: ReactNode;
+    headerActions?: ReactNode;
 };
 export declare const LayoutContext: import("react").Context<LayoutContextValue>;
 export {};

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

@@ -1,5 +1,6 @@
 import React from "react";
 import { TableActionProps } from "./types";
+import { ModalOptions, RequestOptions } from "../../../types";
 export default function (props: TableActionProps & {
     props: Record<string, any>;
     link?: {

package/dist/components/Table/ToolbarActions.js

@@ -37,7 +37,7 @@ export default function (_ref) {
     }, c.props.badge ? /*#__PURE__*/React.createElement(Badge, {
       count: c.props.badge,
       style: {
-        zIndex: 100
+        zIndex: 2
       }
     }, /*#__PURE__*/React.createElement(c.Component, c.props)) : /*#__PURE__*/React.createElement(c.Component, c.props));
   })));

package/dist/components/Table.js

@@ -27,26 +27,24 @@ import http from "../lib/http";
 import "./Table.scss";
 import { ModalContext } from "./ModalContext";
 import { commonHandler } from "../lib/schemaHandler";
-import { diffTree, getValueByPath } from "../lib/helpers";
-import { router } from "@inertiajs/react";
+import { diffTree, getValueByPath, routerNavigateTo } from "../lib/helpers";
 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 _formRef$current;
       var data, only, res;
       return _regeneratorRuntime().wrap(function _callee$(_context) {
         while (1) switch (_context.prev = _context.next) {
           case 0:
             setLoading(true);
-            data = _objectSpread(_objectSpread(_objectSpread({}, params), filter), {}, {
+            data = _objectSpread(_objectSpread(_objectSpread({}, filter), (_formRef$current = formRef.current) === null || _formRef$current === void 0 ? void 0 : _formRef$current.getFieldsValue()), {}, {
               sort: sort
             });
             if (props.pagination) {
-              data[props.pagination.paramName || 'page'] = data.current;
-              delete data.current;
-              delete data.pageSize;
+              data[props.pagination.paramName || 'page'] = params.current;
             }
             setEditableKeys([]);
             setEditableValues([]);
@@ -58,7 +56,9 @@ export default function (props) {
             if (tabsContext.inTabs) {
               only.push('tabs');
             }
-            router.get(searchUrl, data, {
+            routerNavigateTo(searchUrl, {
+              method: 'get',
+              data: data,
               preserveScroll: true,
               preserveState: true,
               only: only,
@@ -67,6 +67,7 @@ export default function (props) {
                 if (tabsContext.inTabs) {
                   props = getValueByPath(props, tabsContext.propsPath);
                 }
+                setLastQuery(data);
                 setDataSource(postData(props.dataSource));
                 setExtraRenderValues(props.extraRenderValues);
                 setPagination(props.pagination);
@@ -95,19 +96,20 @@ export default function (props) {
             if (res.data.extraRenderValues) {
               setExtraRenderValues(res.data.extraRenderValues);
             }
+            setLastQuery(data);
             return _context.abrupt("return", {
               data: res.data.dataSource || [],
               success: true
             });
-          case 17:
-            _context.prev = 17;
+          case 18:
+            _context.prev = 18;
             setLoading(false);
-            return _context.finish(17);
-          case 20:
+            return _context.finish(18);
+          case 21:
           case "end":
             return _context.stop();
         }
-      }, _callee, null, [[10,, 17, 20]]);
+      }, _callee, null, [[10,, 18, 21]]);
     }));
     return function request(_x, _x2, _x3) {
       return _ref.apply(this, arguments);
@@ -150,41 +152,45 @@ export default function (props) {
   };
   var formRef = useRef();
   var actionRef = useRef();
-  var _useState = useState(function () {
+  var _useState = useState({}),
+    _useState2 = _slicedToArray(_useState, 2),
+    lastQuery = _useState2[0],
+    setLastQuery = _useState2[1];
+  var _useState3 = useState(function () {
       return [];
     }),
-    _useState2 = _slicedToArray(_useState, 2),
-    editableKeys = _useState2[0],
-    setEditableKeys = _useState2[1];
-  var _useState3 = useState([]),
     _useState4 = _slicedToArray(_useState3, 2),
-    selectedRows = _useState4[0],
-    setSelectedRows = _useState4[1];
+    editableKeys = _useState4[0],
+    setEditableKeys = _useState4[1];
   var _useState5 = useState([]),
     _useState6 = _slicedToArray(_useState5, 2),
-    editableValues = _useState6[0],
-    setEditableValues = _useState6[1];
-  var _useState7 = useState(false),
+    selectedRows = _useState6[0],
+    setSelectedRows = _useState6[1];
+  var _useState7 = useState([]),
     _useState8 = _slicedToArray(_useState7, 2),
-    loading = _useState8[0],
-    setLoading = _useState8[1];
-  // @ts-ignore
-  var _useState9 = useState(props.pagination),
+    editableValues = _useState8[0],
+    setEditableValues = _useState8[1];
+  var _useState9 = useState(false),
     _useState10 = _slicedToArray(_useState9, 2),
-    pagination = _useState10[0],
-    setPagination = _useState10[1];
-  var _useState11 = useState(postData(props.dataSource)),
+    loading = _useState10[0],
+    setLoading = _useState10[1];
+  // @ts-ignore
+  var _useState11 = useState(props.pagination),
     _useState12 = _slicedToArray(_useState11, 2),
-    dataSource = _useState12[0],
-    setDataSource = _useState12[1];
-  var _useState13 = useState(true),
+    pagination = _useState12[0],
+    setPagination = _useState12[1];
+  var _useState13 = useState(postData(props.dataSource)),
     _useState14 = _slicedToArray(_useState13, 2),
-    sticky = _useState14[0],
-    setSticky = _useState14[1];
-  var _useState15 = useState(props.extraRenderValues),
+    dataSource = _useState14[0],
+    setDataSource = _useState14[1];
+  var _useState15 = useState(true),
     _useState16 = _slicedToArray(_useState15, 2),
-    extraRenderValues = _useState16[0],
-    setExtraRenderValues = _useState16[1];
+    sticky = _useState16[0],
+    setSticky = _useState16[1];
+  var _useState17 = useState(props.extraRenderValues),
+    _useState18 = _slicedToArray(_useState17, 2),
+    extraRenderValues = _useState18[0],
+    setExtraRenderValues = _useState18[1];
   var modalContext = useContext(ModalContext);
   var tabsContext = useContext(TabsContext);
   useEffect(function () {
@@ -200,10 +206,7 @@ export default function (props) {
     if (!searchUrl) {
       searchUrl = window.location.href;
     }
-    if (props.defaultSearchValue !== undefined) {
-      var _formRef$current;
-      (_formRef$current = formRef.current) === null || _formRef$current === void 0 || _formRef$current.setFieldsValue(props.defaultSearchValue);
-    }
+    setLastQuery(props.defaultSearchValue);
     if (!modalContext.inModal) {
       var query = qs.parse(window.location.search.replace(/^\?/, ''));
       if (query && Object.keys(query).length) {
@@ -252,20 +255,20 @@ export default function (props) {
     postData: postData,
     sticky: sticky,
     form: {
-      onValuesChange: function onValuesChange(changedValues) {
-        var key = Object.keys(changedValues)[0];
-        var c = columns.find(function (c) {
-          return c.dataIndex === key;
-        });
-        if (!c) {
+      initialValues: props.defaultSearchValue,
+      onValuesChange: function onValuesChange(changedValues, allValues) {
+        var _formRef$current3;
+        var submit = columns.filter(function (c) {
+          if (!c.searchOnChange) {
+            return false;
+          }
+          return lastQuery[c.dataIndex] !== allValues[c.dataIndex];
+        }).length;
+        if (!submit) {
           return;
         }
         // 是否立即搜索
-        if (c.searchOnChange) {
-          var _formRef$current3;
-          // @ts-ignore
-          (_formRef$current3 = formRef.current) === null || _formRef$current3 === void 0 || _formRef$current3.submit();
-        }
+        (_formRef$current3 = formRef.current) === null || _formRef$current3 === void 0 || _formRef$current3.submit();
       }
     },
     rowSelection: props.rowSelection && {

package/dist/lib/container.d.ts

@@ -4,7 +4,7 @@ declare const container: {
     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>;
+    schemaHandler: Record<string, (schema: any) => import("@ant-design/pro-table").ProColumnType | import("@ant-design/pro-utils").ProSchema>;
     routerNavigateTo: typeof routerNavigateTo;
 };
 export default container;

package/dist/lib/helpers.d.ts

@@ -1,5 +1,6 @@
 import { VisitOptions } from "@inertiajs/core/types/types";
 import { ModalFuncProps } from "antd";
+import { Condition, ModalOptions } from "../types";
 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;

package/dist/lib/helpers.js

@@ -43,6 +43,10 @@ export function replaceParams(params, data) {
   return res;
 }
 export function routerNavigateTo(url, config) {
+  if (url.indexOf('javascript:') !== -1) {
+    window.location.href = url;
+    return;
+  }
   return router.visit(url, _objectSpread({}, config));
 }
 export function createScript(url) {

package/dist/lib/schemaHandler.js

@@ -54,6 +54,7 @@ export var commonHandler = function commonHandler(schema) {
   }
   // 有些表单项宽度并不能撑满，这里强制设置宽度
   deepSet(schema, 'fieldProps.style.width', '100%');
+  deepSet(schema, 'fieldProps.dataIndex', schema.dataIndex);
   return schema;
 };
 export var schemaHandler = {
@@ -101,7 +102,6 @@ export var schemaHandler = {
     schema.formItemProps.rules.push({
       validator: uploadValidator
     });
-    schema.fieldProps.dataIndex = schema.dataIndex;
     return _objectSpread(_objectSpread({}, schema), {}, {
       transform: uploadTransform
     });

package/dist/types.d.ts

@@ -1,3 +1,5 @@
+import {TableContextValue} from "./components/TableContext";
+
 type RequestOptions = {
     url: string,
     method: string,
@@ -14,7 +16,7 @@ type Condition = {
 }
 
 type ModalOptions = {
-    tableContext: TableContext,
+    tableContext: TableContextValue,
     contexts?: Record<string, any>
     title?: string,
     content: {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@quansitech/antd-admin",
-  "version": "1.1.27",
+  "version": "1.1.29",
   "type": "module",
   "files": [
     "dist"
@@ -12,7 +12,7 @@
   },
   "dependencies": {
     "@ant-design/pro-components": "^2.7.15",
-    "@inertiajs/react": "^1.2.0",
+    "@inertiajs/react": "^1.2.0 || ^2.0.0",
     "antd": "^5.20.5",
     "antd-img-crop": "^4.23.0",
     "axios": "^1.7.7",

package/readme.md

@@ -10,6 +10,33 @@ npm install @quansitech/antd-admin
 
 ## 使用参考
 
+### Layout组件Props
+
+| 属性            | 说明   | 类型        | 默认值           |
+|---------------|------|-----------|---------------|
+| headerActions | 顶部操作 | ReactNode | -             |
+| footer        | 底部内容 | ReactNode | 全思科技 - Github |
+
+可在项目目录 `/resources/js/backend/app.tsx` 中修改，如：
+
+```tsx
+createInertiaApp({
+    resolve: async name => {
+        const pages = import.meta.glob('./Pages/**/*.tsx')
+        const page: any = await pages[`./Pages/${name}.tsx`]()
+        page.default.layout = page.default.layout || ((page: ReactNode) => <Layout
+
+                headerActions={<HeaderActions/>} //顶部操作
+                footer={<>这是底部内容</>} // 底部内容
+
+                children={page}/>
+        )
+        return page
+    },
+    //...
+})
+```
+
 ### valueType列表
 
 参考 [ant-design-pro#valueType](https://procomponents.ant.design/components/schema#valuetype-%E5%88%97%E8%A1%A8)