@quansitech/antd-admin 1.1.26 → 1.1.28

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

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

package/dist/components/Layout/New.js

@@ -24,6 +24,7 @@ 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,

package/dist/components/Layout/New.scss

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

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

@@ -19,11 +19,12 @@ import React, { useContext, useEffect, useState } from "react";
 import { TableContext } from "../../TableContext";
 import http from "../../../lib/http";
 import { modalShow, routerNavigateTo } from "../../../lib/helpers";
+import { cloneDeep } from "es-toolkit";
 export default function (props) {
   var tableContext = useContext(TableContext);
   var onClick = /*#__PURE__*/function () {
     var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
-      var rowKey, data, _props$selectedRows, _loop, _ret, key, _tableContext$getActi;
+      var rowKey, data, selectedRows, _loop, _ret, key, _tableContext$getActi;
       return _regeneratorRuntime().wrap(function _callee$(_context2) {
         while (1) switch (_context2.prev = _context2.next) {
           case 0:
@@ -36,20 +37,20 @@ export default function (props) {
             return _context2.abrupt("return");
           case 4:
             if (!props.request) {
-              _context2.next = 29;
+              _context2.next = 30;
               break;
             }
             setLoading(true);
-            data = props.request.data || {};
+            data = cloneDeep(props.request.data) || {};
             if (!props.relateSelection) {
-              _context2.next = 19;
+              _context2.next = 20;
               break;
             }
-            data.selection = (_props$selectedRows = props.selectedRows) === null || _props$selectedRows === void 0 ? void 0 : _props$selectedRows.map(function (item) {
+            selectedRows = tableContext.getSelectedRows();
+            data.selection = selectedRows === null || selectedRows === void 0 ? void 0 : selectedRows.map(function (item) {
               return item[rowKey];
             });
             _loop = /*#__PURE__*/_regeneratorRuntime().mark(function _loop() {
-              var _props$selectedRows2;
               var matches;
               return _regeneratorRuntime().wrap(function _loop$(_context) {
                 while (1) switch (_context.prev = _context.next) {
@@ -67,7 +68,7 @@ export default function (props) {
                     }
                     return _context.abrupt("return", 0);
                   case 5:
-                    data[key] = (_props$selectedRows2 = props.selectedRows) === null || _props$selectedRows2 === void 0 ? void 0 : _props$selectedRows2.map(function (item) {
+                    data[key] = selectedRows === null || selectedRows === void 0 ? void 0 : selectedRows.map(function (item) {
                       return item[matches[1]];
                     });
                   case 6:
@@ -77,65 +78,65 @@ export default function (props) {
               }, _loop);
             });
             _context2.t0 = _regeneratorRuntime().keys(data);
-          case 11:
+          case 12:
             if ((_context2.t1 = _context2.t0()).done) {
-              _context2.next = 19;
+              _context2.next = 20;
               break;
             }
             key = _context2.t1.value;
-            return _context2.delegateYield(_loop(), "t2", 14);
-          case 14:
+            return _context2.delegateYield(_loop(), "t2", 15);
+          case 15:
             _ret = _context2.t2;
             if (!(_ret === 0)) {
-              _context2.next = 17;
+              _context2.next = 18;
               break;
             }
-            return _context2.abrupt("continue", 11);
-          case 17:
-            _context2.next = 11;
+            return _context2.abrupt("continue", 12);
+          case 18:
+            _context2.next = 12;
             break;
-          case 19:
-            _context2.prev = 19;
-            _context2.next = 22;
+          case 20:
+            _context2.prev = 20;
+            _context2.next = 23;
             return http({
               url: props.request.url,
               method: props.request.method,
               headers: props.request.headers || {},
               data: data
             });
-          case 22:
-            _context2.next = 24;
+          case 23:
+            _context2.next = 25;
             return (_tableContext$getActi = tableContext.getActionRef()) === null || _tableContext$getActi === void 0 ? void 0 : _tableContext$getActi.reload();
-          case 24:
+          case 25:
             if (props.relateSelection) {
               tableContext.getActionRef().clearSelected();
             }
-          case 25:
-            _context2.prev = 25;
+          case 26:
+            _context2.prev = 26;
             setLoading(false);
-            return _context2.finish(25);
-          case 28:
-            return _context2.abrupt("return");
+            return _context2.finish(26);
           case 29:
+            return _context2.abrupt("return");
+          case 30:
             if (!props.modal) {
-              _context2.next = 35;
+              _context2.next = 36;
               break;
             }
             setLoading(true);
-            _context2.next = 33;
+            _context2.next = 34;
             return modalShow(_objectSpread(_objectSpread({}, props.modal), {}, {
               contexts: {
                 tableContext: tableContext
               }
             }));
-          case 33:
+          case 34:
             setLoading(false);
             return _context2.abrupt("return");
-          case 35:
+          case 36:
           case "end":
             return _context2.stop();
         }
-      }, _callee, null, [[19,, 25, 28]]);
+      }, _callee, null, [[20,, 26, 29]]);
     }));
     return function onClick() {
       return _ref.apply(this, arguments);
@@ -150,12 +151,12 @@ export default function (props) {
     disabled = _useState4[0],
     setDisabled = _useState4[1];
   useEffect(function () {
-    var _props$selectedRows3;
+    var _tableContext$getSele;
     if (!props.relateSelection) {
       return;
     }
-    setDisabled(((_props$selectedRows3 = props.selectedRows) === null || _props$selectedRows3 === void 0 ? void 0 : _props$selectedRows3.length) === 0);
-  }, [props.selectedRows]);
+    setDisabled(((_tableContext$getSele = tableContext.getSelectedRows()) === null || _tableContext$getSele === void 0 ? void 0 : _tableContext$getSele.length) === 0);
+  }, [tableContext.getSelectedRows()]);
   var ButtonComponent = function ButtonComponent() {
     var _props$request;
     if ((_props$request = props.request) !== null && _props$request !== void 0 && _props$request.confirm) {

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

@@ -3,6 +3,5 @@ export type TableActionProps = {
     title: string,
     props?: Record<string, any>,
     relateSelection?: boolean,
-    selectedRows?: any[],
     badge?: string | number,
 }

package/dist/components/Table/ToolbarActions.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; }
@@ -38,12 +37,8 @@ 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, _extends({}, c.props, {
-      selectedRows: selectedRows
-    }))) : /*#__PURE__*/React.createElement(c.Component, _extends({}, c.props, {
-      selectedRows: selectedRows
-    })));
+    }, /*#__PURE__*/React.createElement(c.Component, c.props)) : /*#__PURE__*/React.createElement(c.Component, c.props));
   })));
 }

package/dist/components/Table.js

@@ -27,8 +27,7 @@ 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) {
@@ -58,7 +57,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,
@@ -233,7 +234,10 @@ export default function (props) {
         return formRef.current;
       },
       extraRenderValues: extraRenderValues,
-      dataSource: dataSource
+      dataSource: dataSource,
+      getSelectedRows: function getSelectedRows() {
+        return selectedRows;
+      }
     }
   }, /*#__PURE__*/React.createElement(ProTable, {
     rowKey: props.rowKey,
@@ -308,8 +312,7 @@ export default function (props) {
     toolBarRender: function toolBarRender(action) {
       return [/*#__PURE__*/React.createElement(ToolbarActions, {
         key: 'actions',
-        actions: props.actions,
-        selectedRows: selectedRows
+        actions: props.actions
       })];
     },
     editable: {

package/dist/components/TableContext.d.ts

@@ -13,5 +13,6 @@ export type TableContextValue = {
     getFormRef: () => FormInstance;
     extraRenderValues?: Record<string, any>[];
     dataSource: any[];
+    getSelectedRows: () => any[];
 };
 export declare const TableContext: React.Context<TableContextValue>;

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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@quansitech/antd-admin",
-  "version": "1.1.26",
+  "version": "1.1.28",
   "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",