wargerm 0.2.4 → 0.2.8

package/dist/components/WForm/index.d.ts

@@ -48,6 +48,7 @@ export interface WFormProps extends FormProps {
     style?: React.CSSProperties;
     columns: ColumnProps[];
     disabled?: boolean;
+    disabledHideInSearch?: boolean;
     onSubmit?: (params: Record<string, any>) => void;
     onReset?: () => void;
     formRef?: MutableRefObject<FormInstance>;

package/dist/index.esm.js

@@ -38,7 +38,7 @@ import _TreeSelect from 'antd/es/tree-select';
 import uniqBy from 'lodash/uniqBy';
 import CountUp from 'react-countup';
 import { Swiper, SwiperSlide } from 'swiper/react';
-import SwiperCore, { Pagination, Navigation } from 'swiper';
+import SwiperCore, { Pagination, Navigation, Autoplay } from 'swiper';
 import 'antd/es/breadcrumb/style';
 import _Breadcrumb from 'antd/es/breadcrumb';
 import ReactDOM from 'react-dom';
@@ -7532,7 +7532,7 @@ Table.defaultProps = {
   rowKey: 'key'
 };
 
-var _excluded$5 = ["columns", "className", "style", "search", "disabled", "onSubmit", "onReset"];
+var _excluded$5 = ["columns", "className", "style", "search", "disabled", "disabledHideInSearch", "onSubmit", "onReset"];
 var RangePicker$2 = Index$2.RangePicker;
 
 var WForm = function WForm(props, ref) {
@@ -7541,6 +7541,7 @@ var WForm = function WForm(props, ref) {
       style = props.style,
       search = props.search,
       disabled = props.disabled,
+      disabledHideInSearch = props.disabledHideInSearch,
       onSubmit = props.onSubmit,
       onReset = props.onReset,
       extraProps = _objectWithoutProperties(props, _excluded$5);
@@ -7560,7 +7561,7 @@ var WForm = function WForm(props, ref) {
       setColumnsFields = _useState4[1];
 
   var filterFormColumns = columns.filter(function (c) {
-    return !c.hideInSearch;
+    return !c.hideInSearch || disabledHideInSearch;
   }).sort(function (a, b) {
     return (b.order || 0) - (a.order || 0);
   });
@@ -8482,7 +8483,7 @@ var Index$8 = function Index(_ref) {
 
 var _excluded$9 = ["data", "onClick", "renderItem"];
 
-SwiperCore.use([Pagination, Navigation]);
+SwiperCore.use([Pagination, Navigation, Autoplay]);
 
 var Index$9 = function Index(props) {
   var data = props.data,
@@ -9545,6 +9546,7 @@ var ModalForm = function ModalForm(props, ref) {
     ref: formRef,
     disabled: disabled,
     onSubmit: onSubmit,
+    disabledHideInSearch: true,
     search: search,
     columns: columns
   }));
@@ -9552,7 +9554,7 @@ var ModalForm = function ModalForm(props, ref) {
 
 var ModalForm$1 = /*#__PURE__*/React.forwardRef(ModalForm);
 
-var _excluded$e = ["columns", "request", "modalFormSearch", "tableAction", "renderTableBar", "className", "style", "modalConfig"];
+var _excluded$e = ["columns", "request", "modalFormSearch", "tableAction", "renderTableBar", "className", "style", "modalConfig", "optionColumnConfig"];
 
 var TabelCard = function TabelCard(props, ref) {
   var columns = props.columns,
@@ -9563,6 +9565,7 @@ var TabelCard = function TabelCard(props, ref) {
       className = props.className,
       style = props.style,
       modalConfig = props.modalConfig,
+      optionColumnConfig = props.optionColumnConfig,
       extraProps = _objectWithoutProperties(props, _excluded$e);
 
   var actionRef = useRef();
@@ -9616,7 +9619,7 @@ var TabelCard = function TabelCard(props, ref) {
 
                             loading();
                             actionRef === null || actionRef === void 0 ? void 0 : (_actionRef$current = actionRef.current) === null || _actionRef$current === void 0 ? void 0 : _actionRef$current.reload();
-                          });
+                          }, record);
 
                         case 3:
                         case "end":
@@ -9848,7 +9851,6 @@ var TabelCard = function TabelCard(props, ref) {
     search: modalFormSearch
   }, modalConfig), {}, {
     columns: (columns || []).filter(function (item) {
-      delete item.hideInSearch;
       return !item.hiddenInModalForm;
     })
   })), /*#__PURE__*/React.createElement(ProTable, _objectSpread2({
@@ -9858,14 +9860,15 @@ var TabelCard = function TabelCard(props, ref) {
     options: false,
     toolBarRender: false,
     request: request,
-    columns: tableAction && (tableAction === null || tableAction === void 0 ? void 0 : tableAction.length) > 0 ? [].concat(_toConsumableArray(columns || []), [{
+    columns: tableAction && (tableAction === null || tableAction === void 0 ? void 0 : tableAction.length) > 0 ? [].concat(_toConsumableArray(columns || []), [_objectSpread2({
       title: '操作',
       dataIndex: 'option',
       valueType: 'option',
+      align: 'center',
       render: function render(_, record, index) {
         return tableActionDom(record, index);
       }
-    }]) : columns || [],
+    }, optionColumnConfig)]) : columns || [],
     search: {
       labelWidth: 'auto',
       optionRender: function optionRender(searchConfig, formProps, dom) {

package/dist/index.js

@@ -7565,7 +7565,7 @@ Table.defaultProps = {
   rowKey: 'key'
 };
 
-var _excluded$5 = ["columns", "className", "style", "search", "disabled", "onSubmit", "onReset"];
+var _excluded$5 = ["columns", "className", "style", "search", "disabled", "disabledHideInSearch", "onSubmit", "onReset"];
 var RangePicker$2 = Index$2.RangePicker;
 
 var WForm = function WForm(props, ref) {
@@ -7574,6 +7574,7 @@ var WForm = function WForm(props, ref) {
       style = props.style,
       search = props.search,
       disabled = props.disabled,
+      disabledHideInSearch = props.disabledHideInSearch,
       onSubmit = props.onSubmit,
       onReset = props.onReset,
       extraProps = _objectWithoutProperties(props, _excluded$5);
@@ -7593,7 +7594,7 @@ var WForm = function WForm(props, ref) {
       setColumnsFields = _useState4[1];
 
   var filterFormColumns = columns.filter(function (c) {
-    return !c.hideInSearch;
+    return !c.hideInSearch || disabledHideInSearch;
   }).sort(function (a, b) {
     return (b.order || 0) - (a.order || 0);
   });
@@ -8515,7 +8516,7 @@ var Index$8 = function Index(_ref) {
 
 var _excluded$9 = ["data", "onClick", "renderItem"];
 
-SwiperCore__default['default'].use([SwiperCore.Pagination, SwiperCore.Navigation]);
+SwiperCore__default['default'].use([SwiperCore.Pagination, SwiperCore.Navigation, SwiperCore.Autoplay]);
 
 var Index$9 = function Index(props) {
   var data = props.data,
@@ -9578,6 +9579,7 @@ var ModalForm = function ModalForm(props, ref) {
     ref: formRef,
     disabled: disabled,
     onSubmit: onSubmit,
+    disabledHideInSearch: true,
     search: search,
     columns: columns
   }));
@@ -9585,7 +9587,7 @@ var ModalForm = function ModalForm(props, ref) {
 
 var ModalForm$1 = /*#__PURE__*/React__default['default'].forwardRef(ModalForm);
 
-var _excluded$e = ["columns", "request", "modalFormSearch", "tableAction", "renderTableBar", "className", "style", "modalConfig"];
+var _excluded$e = ["columns", "request", "modalFormSearch", "tableAction", "renderTableBar", "className", "style", "modalConfig", "optionColumnConfig"];
 
 var TabelCard = function TabelCard(props, ref) {
   var columns = props.columns,
@@ -9596,6 +9598,7 @@ var TabelCard = function TabelCard(props, ref) {
       className = props.className,
       style = props.style,
       modalConfig = props.modalConfig,
+      optionColumnConfig = props.optionColumnConfig,
       extraProps = _objectWithoutProperties(props, _excluded$e);
 
   var actionRef = React.useRef();
@@ -9649,7 +9652,7 @@ var TabelCard = function TabelCard(props, ref) {
 
                             loading();
                             actionRef === null || actionRef === void 0 ? void 0 : (_actionRef$current = actionRef.current) === null || _actionRef$current === void 0 ? void 0 : _actionRef$current.reload();
-                          });
+                          }, record);
 
                         case 3:
                         case "end":
@@ -9881,7 +9884,6 @@ var TabelCard = function TabelCard(props, ref) {
     search: modalFormSearch
   }, modalConfig), {}, {
     columns: (columns || []).filter(function (item) {
-      delete item.hideInSearch;
       return !item.hiddenInModalForm;
     })
   })), /*#__PURE__*/React__default['default'].createElement(ProTable__default['default'], _objectSpread2({
@@ -9891,14 +9893,15 @@ var TabelCard = function TabelCard(props, ref) {
     options: false,
     toolBarRender: false,
     request: request,
-    columns: tableAction && (tableAction === null || tableAction === void 0 ? void 0 : tableAction.length) > 0 ? [].concat(_toConsumableArray(columns || []), [{
+    columns: tableAction && (tableAction === null || tableAction === void 0 ? void 0 : tableAction.length) > 0 ? [].concat(_toConsumableArray(columns || []), [_objectSpread2({
       title: '操作',
       dataIndex: 'option',
       valueType: 'option',
+      align: 'center',
       render: function render(_, record, index) {
         return tableActionDom(record, index);
       }
-    }]) : columns || [],
+    }, optionColumnConfig)]) : columns || [],
     search: {
       labelWidth: 'auto',
       optionRender: function optionRender(searchConfig, formProps, dom) {

package/package.json

@@ -1,7 +1,7 @@
 {
   "private": false,
   "name": "wargerm",
-  "version": "0.2.4",
+  "version": "0.2.8",
   "scripts": {
     "dev": "dumi dev",
     "docs:build": "dumi build",