wargerm 0.2.24 → 0.2.28

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

@@ -87,11 +87,7 @@ declare type Props = {
     request?: (params?: {
         pageSize?: number;
         current?: number;
-    }, sort?: any, filter?: any) => {
-        data: Record<string, any>[];
-        success: boolean;
-        total: number;
-    };
+    }, sort?: any, filter?: any) => Promise<any>;
     onLoad?: (dataSource: Record<string, any>[]) => void;
     onSubmit?: (params: Record<string, any>) => void;
     onReset?: () => void;

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

@@ -11,8 +11,9 @@ export interface ColumnProps {
     hideInSearch?: boolean;
     search?: {
         transform?: (value: any) => Record<string, any>;
+        transformSetForm?: (value: any) => Record<string, any>;
     };
-    valueType?: 'text' | 'textarea' | 'inputNumber' | 'select' | 'treeSelect' | 'date' | 'dateTime' | 'dateMonth' | 'dateYear' | 'dateRange' | 'dateTimeRange' | 'checkbox' | 'radio' | 'radioButton' | 'switch' | 'digit' | 'cascader' | 'image';
+    valueType?: 'text' | 'textarea' | 'inputNumber' | 'select' | 'treeSelect' | 'date' | 'dateTime' | 'dateMonth' | 'dateYear' | 'dateRange' | 'dateTimeRange' | 'checkbox' | 'radio' | 'radioButton' | 'switch' | 'digit' | 'cascader';
     valueEnum?: Record<string, any>;
     options?: Record<string, any>[];
     fieldProps?: Record<string, any>;
@@ -38,6 +39,7 @@ export interface Isearch {
     filterType?: 'query' | 'light';
     searchText?: string;
     resetText?: string;
+    hideResetBtn?: boolean;
     submitText?: string;
     hideSubmit?: boolean;
     transform?: (value: any) => any;

package/dist/index.esm.js

@@ -7134,11 +7134,18 @@ function Table(_ref) {
                 flex: c.width ? '0 1 auto' : '1',
                 overflow: 'hidden'
               }
+            }, /*#__PURE__*/React.createElement("div", {
+              style: {
+                width: '100%',
+                whiteSpace: 'nowrap',
+                overflow: 'hidden',
+                textOverflow: 'ellipsis'
+              }
             }, c.render ? c.render(record[c.dataIndex], record, index) : columnsFields[c.dataIndex] ? (_columnsFields$c$data = columnsFields[c.dataIndex].find(function (item) {
               return item.value == record[c.dataIndex];
-            })) === null || _columnsFields$c$data === void 0 ? void 0 : _columnsFields$c$data.label : record[c.dataIndex]));
+            })) === null || _columnsFields$c$data === void 0 ? void 0 : _columnsFields$c$data.label : record[c.dataIndex])));
           } else {
-            var _columnsFields$c$data2;
+            var _columnsFields$c$data2, _columnsFields$c$data3;
 
             return /*#__PURE__*/React.createElement("div", {
               key: c.dataIndex,
@@ -7149,9 +7156,18 @@ function Table(_ref) {
                 overflow: 'hidden'
               },
               title: record[c.dataIndex]
+            }, c.ellipsis ? /*#__PURE__*/React.createElement("div", {
+              style: {
+                width: '100%',
+                whiteSpace: 'nowrap',
+                overflow: 'hidden',
+                textOverflow: 'ellipsis'
+              }
             }, c.render ? c.render(record[c.dataIndex], record, index) : columnsFields[c.dataIndex] ? (_columnsFields$c$data2 = columnsFields[c.dataIndex].find(function (item) {
               return item.value == record[c.dataIndex];
-            })) === null || _columnsFields$c$data2 === void 0 ? void 0 : _columnsFields$c$data2.label : record[c.dataIndex]);
+            })) === null || _columnsFields$c$data2 === void 0 ? void 0 : _columnsFields$c$data2.label : record[c.dataIndex]) : c.render ? c.render(record[c.dataIndex], record, index) : columnsFields[c.dataIndex] ? (_columnsFields$c$data3 = columnsFields[c.dataIndex].find(function (item) {
+              return item.value == record[c.dataIndex];
+            })) === null || _columnsFields$c$data3 === void 0 ? void 0 : _columnsFields$c$data3.label : record[c.dataIndex]);
           }
         }
       });
@@ -8751,7 +8767,21 @@ var WForm = function WForm(props, ref) {
   };
 
   var setFieldsValue = function setFieldsValue(record) {
-    form.setFieldsValue(record);
+    var setFieldsValues = _objectSpread2({}, record);
+
+    filterFormColumns.forEach(function (c) {
+      if (c.search && c.search.transformSetForm) {
+        var transformObj = c.search.transformSetForm(setFieldsValues[c.dataIndex]);
+        setFieldsValues = _objectSpread2(_objectSpread2({}, setFieldsValues), transformObj);
+
+        if (!transformObj[c.dataIndex]) {
+          delete setFieldsValues[c.dataIndex];
+        }
+
+        return false;
+      }
+    });
+    form.setFieldsValue(setFieldsValues);
   };
 
   useImperativeHandle(ref, function () {
@@ -8765,7 +8795,8 @@ var WForm = function WForm(props, ref) {
   });
   return /*#__PURE__*/React.createElement(_Form, _objectSpread2({
     style: {
-      marginBottom: '20px'
+      marginBottom: '20px',
+      width: '100%'
     },
     onFinish: handleSearch,
     onValuesChange: function onValuesChange(changedValues, allValues) {
@@ -8773,9 +8804,7 @@ var WForm = function WForm(props, ref) {
       setchangedValues(changedValues);
     },
     form: form
-  }, extraProps), /*#__PURE__*/React.createElement(_Row, null, filterForm), /*#__PURE__*/React.createElement(_Row, null, filterExtraColumnsForm), search && search.hideSubmit ? null : /*#__PURE__*/React.createElement(_Row, {
-    justify: "end"
-  }, /*#__PURE__*/React.createElement(_Col, {
+  }, extraProps), /*#__PURE__*/React.createElement(_Row, null, filterForm, filterExtraColumnsForm, search && search.hideSubmit ? null : /*#__PURE__*/React.createElement(_Col, {
     style: {
       paddingLeft: '12px',
       paddingRight: '12px'
@@ -8791,14 +8820,14 @@ var WForm = function WForm(props, ref) {
     },
     htmlType: "submit",
     icon: /*#__PURE__*/React.createElement(SearchOutlined, null)
-  }, search && search.searchText ? search.searchText : '提交'), /*#__PURE__*/React.createElement(WButton, {
+  }, search && search.searchText ? search.searchText : '提交')].concat(_toConsumableArray(search.hideResetBtn ? [] : [/*#__PURE__*/React.createElement(WButton, {
     type: "primary",
     style: {
       marginRight: '20px'
     },
     onClick: handleRest,
     icon: /*#__PURE__*/React.createElement(ReloadOutlined, null)
-  }, search && search.resetText ? search.resetText : '重置')]), !search ? /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(WButton, {
+  }, search && search.resetText ? search.resetText : '重置')]))), !search ? /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(WButton, {
     type: "primary",
     style: {
       marginRight: '20px'
@@ -8819,14 +8848,14 @@ var WForm = function WForm(props, ref) {
     },
     htmlType: "submit",
     icon: /*#__PURE__*/React.createElement(SearchOutlined, null)
-  }, "\u63D0\u4EA4"), /*#__PURE__*/React.createElement(WButton, {
+  }, search && search.searchText ? search.searchText : '提交'), search.hideResetBtn ? null : /*#__PURE__*/React.createElement(WButton, {
     type: "primary",
     style: {
       marginRight: '20px'
     },
     icon: /*#__PURE__*/React.createElement(ReloadOutlined, null),
     onClick: handleRest
-  }, "\u91CD\u7F6E")) : null)))));
+  }, search && search.resetText ? search.resetText : '重置')) : null)))));
 };
 
 var WForm$1 = /*#__PURE__*/React.forwardRef(WForm);

package/dist/index.js

@@ -7168,11 +7168,18 @@ function Table(_ref) {
                 flex: c.width ? '0 1 auto' : '1',
                 overflow: 'hidden'
               }
+            }, /*#__PURE__*/React__default['default'].createElement("div", {
+              style: {
+                width: '100%',
+                whiteSpace: 'nowrap',
+                overflow: 'hidden',
+                textOverflow: 'ellipsis'
+              }
             }, c.render ? c.render(record[c.dataIndex], record, index) : columnsFields[c.dataIndex] ? (_columnsFields$c$data = columnsFields[c.dataIndex].find(function (item) {
               return item.value == record[c.dataIndex];
-            })) === null || _columnsFields$c$data === void 0 ? void 0 : _columnsFields$c$data.label : record[c.dataIndex]));
+            })) === null || _columnsFields$c$data === void 0 ? void 0 : _columnsFields$c$data.label : record[c.dataIndex])));
           } else {
-            var _columnsFields$c$data2;
+            var _columnsFields$c$data2, _columnsFields$c$data3;
 
             return /*#__PURE__*/React__default['default'].createElement("div", {
               key: c.dataIndex,
@@ -7183,9 +7190,18 @@ function Table(_ref) {
                 overflow: 'hidden'
               },
               title: record[c.dataIndex]
+            }, c.ellipsis ? /*#__PURE__*/React__default['default'].createElement("div", {
+              style: {
+                width: '100%',
+                whiteSpace: 'nowrap',
+                overflow: 'hidden',
+                textOverflow: 'ellipsis'
+              }
             }, c.render ? c.render(record[c.dataIndex], record, index) : columnsFields[c.dataIndex] ? (_columnsFields$c$data2 = columnsFields[c.dataIndex].find(function (item) {
               return item.value == record[c.dataIndex];
-            })) === null || _columnsFields$c$data2 === void 0 ? void 0 : _columnsFields$c$data2.label : record[c.dataIndex]);
+            })) === null || _columnsFields$c$data2 === void 0 ? void 0 : _columnsFields$c$data2.label : record[c.dataIndex]) : c.render ? c.render(record[c.dataIndex], record, index) : columnsFields[c.dataIndex] ? (_columnsFields$c$data3 = columnsFields[c.dataIndex].find(function (item) {
+              return item.value == record[c.dataIndex];
+            })) === null || _columnsFields$c$data3 === void 0 ? void 0 : _columnsFields$c$data3.label : record[c.dataIndex]);
           }
         }
       });
@@ -8785,7 +8801,21 @@ var WForm = function WForm(props, ref) {
   };
 
   var setFieldsValue = function setFieldsValue(record) {
-    form.setFieldsValue(record);
+    var setFieldsValues = _objectSpread2({}, record);
+
+    filterFormColumns.forEach(function (c) {
+      if (c.search && c.search.transformSetForm) {
+        var transformObj = c.search.transformSetForm(setFieldsValues[c.dataIndex]);
+        setFieldsValues = _objectSpread2(_objectSpread2({}, setFieldsValues), transformObj);
+
+        if (!transformObj[c.dataIndex]) {
+          delete setFieldsValues[c.dataIndex];
+        }
+
+        return false;
+      }
+    });
+    form.setFieldsValue(setFieldsValues);
   };
 
   React.useImperativeHandle(ref, function () {
@@ -8799,7 +8829,8 @@ var WForm = function WForm(props, ref) {
   });
   return /*#__PURE__*/React__default['default'].createElement(_Form__default['default'], _objectSpread2({
     style: {
-      marginBottom: '20px'
+      marginBottom: '20px',
+      width: '100%'
     },
     onFinish: handleSearch,
     onValuesChange: function onValuesChange(changedValues, allValues) {
@@ -8807,9 +8838,7 @@ var WForm = function WForm(props, ref) {
       setchangedValues(changedValues);
     },
     form: form
-  }, extraProps), /*#__PURE__*/React__default['default'].createElement(_Row__default['default'], null, filterForm), /*#__PURE__*/React__default['default'].createElement(_Row__default['default'], null, filterExtraColumnsForm), search && search.hideSubmit ? null : /*#__PURE__*/React__default['default'].createElement(_Row__default['default'], {
-    justify: "end"
-  }, /*#__PURE__*/React__default['default'].createElement(_Col__default['default'], {
+  }, extraProps), /*#__PURE__*/React__default['default'].createElement(_Row__default['default'], null, filterForm, filterExtraColumnsForm, search && search.hideSubmit ? null : /*#__PURE__*/React__default['default'].createElement(_Col__default['default'], {
     style: {
       paddingLeft: '12px',
       paddingRight: '12px'
@@ -8825,14 +8854,14 @@ var WForm = function WForm(props, ref) {
     },
     htmlType: "submit",
     icon: /*#__PURE__*/React__default['default'].createElement(icons.SearchOutlined, null)
-  }, search && search.searchText ? search.searchText : '提交'), /*#__PURE__*/React__default['default'].createElement(WButton, {
+  }, search && search.searchText ? search.searchText : '提交')].concat(_toConsumableArray(search.hideResetBtn ? [] : [/*#__PURE__*/React__default['default'].createElement(WButton, {
     type: "primary",
     style: {
       marginRight: '20px'
     },
     onClick: handleRest,
     icon: /*#__PURE__*/React__default['default'].createElement(icons.ReloadOutlined, null)
-  }, search && search.resetText ? search.resetText : '重置')]), !search ? /*#__PURE__*/React__default['default'].createElement(React__default['default'].Fragment, null, /*#__PURE__*/React__default['default'].createElement(WButton, {
+  }, search && search.resetText ? search.resetText : '重置')]))), !search ? /*#__PURE__*/React__default['default'].createElement(React__default['default'].Fragment, null, /*#__PURE__*/React__default['default'].createElement(WButton, {
     type: "primary",
     style: {
       marginRight: '20px'
@@ -8853,14 +8882,14 @@ var WForm = function WForm(props, ref) {
     },
     htmlType: "submit",
     icon: /*#__PURE__*/React__default['default'].createElement(icons.SearchOutlined, null)
-  }, "\u63D0\u4EA4"), /*#__PURE__*/React__default['default'].createElement(WButton, {
+  }, search && search.searchText ? search.searchText : '提交'), search.hideResetBtn ? null : /*#__PURE__*/React__default['default'].createElement(WButton, {
     type: "primary",
     style: {
       marginRight: '20px'
     },
     icon: /*#__PURE__*/React__default['default'].createElement(icons.ReloadOutlined, null),
     onClick: handleRest
-  }, "\u91CD\u7F6E")) : null)))));
+  }, search && search.resetText ? search.resetText : '重置')) : null)))));
 };
 
 var WForm$1 = /*#__PURE__*/React__default['default'].forwardRef(WForm);

package/package.json

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