@quansitech/antd-admin 1.1.36 → 1.1.39

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

@@ -35,7 +35,7 @@ export default function (props) {
     var value = props.fieldProps.value;
     var extraData;
     if (formContext.extraRenderValues) {
-      extraData = formContext.extraRenderValues[props.fieldProps.dataIndex];
+      extraData = formContext.extraRenderValues[props.fieldProps['data-field']];
     }
     if (tableContext.extraRenderValues) {
       var _tableContext$extraRe;
@@ -43,7 +43,7 @@ export default function (props) {
       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];
+      extraData = (_tableContext$extraRe = tableContext.extraRenderValues[index]) === null || _tableContext$extraRe === void 0 ? void 0 : _tableContext$extraRe[props.fieldProps['data-field']];
     }
     if (extraData) {
       setText(findValue(extraData.options, value).join(' / '));

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

@@ -23,14 +23,14 @@ export default function (props) {
     var extraRenderValue = [];
     if (formContext && formContext.extraRenderValues) {
       var _formContext$extraRen;
-      extraRenderValue = (_formContext$extraRen = formContext.extraRenderValues[props.fieldProps.dataIndex]) !== null && _formContext$extraRen !== void 0 ? _formContext$extraRen : [];
+      extraRenderValue = (_formContext$extraRen = formContext.extraRenderValues[props.fieldProps['data-field']]) !== null && _formContext$extraRen !== void 0 ? _formContext$extraRen : [];
     } else if (tableContext && tableContext.extraRenderValues) {
       var _tableContext$extraRe, _tableContext$extraRe2;
       var key = tableContext.getTableProps().rowKey;
       var index = tableContext.dataSource.findIndex(function (item) {
         return item[key] === props.record[key];
       });
-      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 : [];
+      extraRenderValue = (_tableContext$extraRe = (_tableContext$extraRe2 = tableContext.extraRenderValues[index]) === null || _tableContext$extraRe2 === void 0 ? void 0 : _tableContext$extraRe2[props.fieldProps['data-field']]) !== null && _tableContext$extraRe !== void 0 ? _tableContext$extraRe : [];
     }
     setFileList(extraRenderValue.map(function (item) {
       return {

package/dist/components/Form.d.ts

@@ -2,6 +2,7 @@ import { ProFormColumnsType } from "@ant-design/pro-components";
 import type { FormSchema } from "@ant-design/pro-form/es/components/SchemaForm/typing";
 import React from "react";
 import { FormActionType } from "./Form/Action/types";
+import "./Form.scss";
 type SubmitRequestType = {
     url: string;
     method?: string;

package/dist/components/Form.js

@@ -20,6 +20,7 @@ import customRule from "../lib/customRule";
 import { ModalContext } from "./ModalContext";
 import { TableContext } from "./TableContext";
 import { commonHandler } from "../lib/schemaHandler";
+import "./Form.scss";
 export default function (props) {
   var formRef = useRef();
   var _useState = useState(false),
@@ -149,6 +150,7 @@ export default function (props) {
     }
   }, /*#__PURE__*/React.createElement(BetaSchemaForm, {
     columns: columns,
+    className: 'qs-form-container',
     colProps: props.colProps,
     readonly: props.readonly,
     grid: true,

package/dist/components/Form.scss

@@ -0,0 +1,15 @@
+.qs-form-container {
+  .qs-form-list-form_list {
+    .ant-pro-form-list-item {
+      border: 1px dashed #cccccc;
+      margin-top: 10px;
+      border-radius: 5px;
+      padding: 10px;
+
+      .ant-pro-form-list-container {
+        display: flex;
+        flex-wrap: wrap;
+      }
+    }
+  }
+}

package/dist/components/Layout/New.js

@@ -14,6 +14,7 @@ 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); }
+// @ts-nocheck
 import { PageContainer, ProLayout, ProProvider } from "@ant-design/pro-components";
 import { Button, Dropdown, Menu, Space } from "antd";
 import { LayoutContext } from "../LayoutContext";

package/dist/components/Table/ToolbarActions.js

@@ -28,7 +28,7 @@ export default function (_ref) {
         props: _objectSpread({}, a)
       };
     }));
-  }, []);
+  }, [actions]);
   return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(Space, {
     wrap: true
   }, components.map(function (c) {

package/dist/components/Table.js

@@ -33,7 +33,7 @@ import { TabsContext } from "./TabsContext";
 export default function (props) {
   var request = /*#__PURE__*/function () {
     var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(params, sort, filter) {
-      var data, only, res;
+      var data, res;
       return _regeneratorRuntime().wrap(function _callee$(_context) {
         while (1) switch (_context.prev = _context.next) {
           case 0:
@@ -47,26 +47,25 @@ export default function (props) {
             }
             setEditableKeys([]);
             setEditableValues([]);
+            setSelectedRows([]);
             if (modalContext.inModal) {
-              _context.next = 9;
+              _context.next = 8;
               break;
             }
             // 如果不在 modal 中，则使用 routerNavigateTo
-            only = ['dataSource', 'pagination', 'extraRenderValues'];
-            if (tabsContext.inTabs) {
-              only.push('tabs');
-            }
+
             routerNavigateTo(searchUrl, {
               method: 'get',
               data: data,
               preserveScroll: true,
               preserveState: true,
-              only: only,
               onSuccess: function onSuccess(e) {
                 var props = e.props;
                 if (tabsContext.inTabs) {
                   props = getValueByPath(props, tabsContext.propsPath);
                 }
+                setToolActions(props.actions);
+                setColumns(props.columns);
                 setLastQuery(data);
                 setDataSource(postData(props.dataSource));
                 setExtraRenderValues(props.extraRenderValues);
@@ -77,16 +76,16 @@ export default function (props) {
               }
             });
             return _context.abrupt("return");
-          case 9:
-            _context.prev = 9;
-            _context.next = 12;
+          case 8:
+            _context.prev = 8;
+            _context.next = 11;
             return http.get(searchUrl, {
               params: data,
               headers: {
                 'X-Table-Search': '1'
               }
             });
-          case 12:
+          case 11:
             res = _context.sent;
             if (res.data.pagination) {
               setPagination(_objectSpread(_objectSpread({}, res.data.pagination), {}, {
@@ -101,36 +100,25 @@ export default function (props) {
               data: res.data.dataSource || [],
               success: true
             });
-          case 17:
-            _context.prev = 17;
+          case 16:
+            _context.prev = 16;
             setLoading(false);
-            return _context.finish(17);
-          case 20:
+            return _context.finish(16);
+          case 19:
           case "end":
             return _context.stop();
         }
-      }, _callee, null, [[9,, 17, 20]]);
+      }, _callee, null, [[8,, 16, 19]]);
     }));
     return function request(_x, _x2, _x3) {
       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) {
-      c.key = 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) {
+    realColumns === null || realColumns === void 0 || realColumns.map(function (column) {
       switch (column.valueType) {
         case 'dateTime':
           data = data.map(function (row) {
@@ -195,6 +183,25 @@ export default function (props) {
     _useState20 = _slicedToArray(_useState19, 2),
     extraRenderValues = _useState20[0],
     setExtraRenderValues = _useState20[1];
+  var _useState21 = useState(props.actions),
+    _useState22 = _slicedToArray(_useState21, 2),
+    toolActions = _useState22[0],
+    setToolActions = _useState22[1];
+  var _useState23 = useState(props.columns),
+    _useState24 = _slicedToArray(_useState23, 2),
+    columns = _useState24[0],
+    setColumns = _useState24[1];
+  var realColumns = useMemo(function () {
+    var _cloneDeep;
+    return (_cloneDeep = cloneDeep(columns)) === null || _cloneDeep === void 0 ? void 0 : _cloneDeep.map(function (c) {
+      c.key = c.dataIndex;
+      commonHandler(c);
+      if (container.schemaHandler[c.valueType]) {
+        return container.schemaHandler[c.valueType](c);
+      }
+      return c;
+    });
+  }, [columns]);
   var modalContext = useContext(ModalContext);
   var tabsContext = useContext(TabsContext);
   useEffect(function () {
@@ -210,7 +217,7 @@ export default function (props) {
     if (!searchUrl) {
       var s = window.location.href;
       s = s.replace(/page=\d+&?/, '');
-      columns.filter(function (c) {
+      realColumns.filter(function (c) {
         return c.search !== false;
       }).map(function (c) {
         s = s.replace(new RegExp("".concat(c.dataIndex, "=[^&]*&?")), '');
@@ -228,6 +235,7 @@ export default function (props) {
           }
         });
         (_formRef$current = formRef.current) === null || _formRef$current === void 0 || _formRef$current.setFieldsValue(query);
+        setLastQuery(query);
       }
     }
   }, []);
@@ -255,7 +263,7 @@ export default function (props) {
   }, /*#__PURE__*/React.createElement(ProTable, {
     rowKey: props.rowKey,
     tableClassName: 'qs-antd-table',
-    columns: columns,
+    columns: realColumns,
     onDataSourceChange: setDataSource,
     dataSource: dataSource,
     pagination: pagination,
@@ -274,7 +282,7 @@ export default function (props) {
       initialValues: props.defaultSearchValue,
       onValuesChange: function onValuesChange(changedValues, allValues) {
         var _formRef$current2;
-        var submit = columns.filter(function (c) {
+        var submit = realColumns.filter(function (c) {
           if (!c.searchOnChange) {
             return false;
           }
@@ -330,7 +338,7 @@ export default function (props) {
     toolBarRender: function toolBarRender(action) {
       return [/*#__PURE__*/React.createElement(ToolbarActions, {
         key: 'actions',
-        actions: props.actions
+        actions: toolActions
       })];
     },
     editable: {

package/dist/lib/helpers.d.ts

@@ -1,5 +1,4 @@
 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>;
@@ -7,7 +6,7 @@ export declare function routerNavigateTo(url: string, config?: VisitOptions): vo
 export declare function createScript(url: string): Promise<unknown>;
 export declare function modalShow(options: ModalOptions): Promise<{
     destroy: () => void;
-    update: (configUpdate: ModalFuncProps | ((prevConfig: ModalFuncProps) => ModalFuncProps)) => void;
+    update: (configUpdate: import("antd/es/modal/confirm").ConfigUpdate) => void;
 }>;
 export declare function upperFirst(str: string): string;
 export declare function getProValueTypeMap(): any;

package/dist/lib/http.js

@@ -33,6 +33,7 @@ http.interceptors.response.use(function (response) {
     }
     return true;
   };
+  // @ts-ignore
   if ((_response$config$fetc = response.config.fetchOptions) !== null && _response$config$fetc !== void 0 && _response$config$fetc.noHandle) {
     return response;
   }

package/dist/lib/schemaHandler.js

@@ -211,5 +211,22 @@ export var schemaHandler = {
       });
     }
     return schema;
+  },
+  formList: function formList(schema) {
+    schema.columns = schema.columns.map(function (c) {
+      commonHandler(c);
+      if (container.schemaHandler[c.valueType]) {
+        return container.schemaHandler[c.valueType](c);
+      }
+      return c;
+    });
+    deepSet(schema, 'fieldProps.className', "qs-form-list-".concat(schema.mode));
+    switch (schema.mode) {
+      case 'form_list':
+        deepSet(schema, 'fieldProps.alwaysShowItemLabel', true);
+        break;
+    }
+    console.log(schema);
+    return schema;
   }
 };

package/package.json

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