wargerm 0.2.23 → 0.2.27

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (5) hide show
  1. package/dist/components/Table/index.d.ts +1 -5
  2. package/dist/components/WForm/index.d.ts +3 -1
  3. package/dist/index.esm.js +46 -12
  4. package/dist/index.js +46 -12
  5. package/package.json +1 -1
package/dist/components/Table/index.d.ts CHANGED
@@ -87,11 +87,7 @@ declare type Props = {
87
87
  request?: (params?: {
88
88
  pageSize?: number;
89
89
  current?: number;
90
- }, sort?: any, filter?: any) => {
91
- data: Record<string, any>[];
92
- success: boolean;
93
- total: number;
94
- };
90
+ }, sort?: any, filter?: any) => Promise<any>;
95
91
  onLoad?: (dataSource: Record<string, any>[]) => void;
96
92
  onSubmit?: (params: Record<string, any>) => void;
97
93
  onReset?: () => void;
package/dist/components/WForm/index.d.ts CHANGED
@@ -11,8 +11,9 @@ export interface ColumnProps {
11
11
  hideInSearch?: boolean;
12
12
  search?: {
13
13
  transform?: (value: any) => Record<string, any>;
14
+ transformSetForm?: (value: any) => Record<string, any>;
14
15
  };
15
- valueType?: 'text' | 'textarea' | 'inputNumber' | 'select' | 'treeSelect' | 'date' | 'dateTime' | 'dateMonth' | 'dateYear' | 'dateRange' | 'dateTimeRange' | 'checkbox' | 'radio' | 'radioButton' | 'switch' | 'digit' | 'cascader' | 'image';
16
+ valueType?: 'text' | 'textarea' | 'inputNumber' | 'select' | 'treeSelect' | 'date' | 'dateTime' | 'dateMonth' | 'dateYear' | 'dateRange' | 'dateTimeRange' | 'checkbox' | 'radio' | 'radioButton' | 'switch' | 'digit' | 'cascader';
16
17
  valueEnum?: Record<string, any>;
17
18
  options?: Record<string, any>[];
18
19
  fieldProps?: Record<string, any>;
@@ -38,6 +39,7 @@ export interface Isearch {
38
39
  filterType?: 'query' | 'light';
39
40
  searchText?: string;
40
41
  resetText?: string;
42
+ hideResetBtn?: boolean;
41
43
  submitText?: string;
42
44
  hideSubmit?: boolean;
43
45
  transform?: (value: any) => any;
package/dist/index.esm.js CHANGED
@@ -7134,11 +7134,18 @@ function Table(_ref) {
7134
7134
  flex: c.width ? '0 1 auto' : '1',
7135
7135
  overflow: 'hidden'
7136
7136
  }
7137
+ }, /*#__PURE__*/React.createElement("div", {
7138
+ style: {
7139
+ width: '100%',
7140
+ whiteSpace: 'nowrap',
7141
+ overflow: 'hidden',
7142
+ textOverflow: 'ellipsis'
7143
+ }
7137
7144
  }, c.render ? c.render(record[c.dataIndex], record, index) : columnsFields[c.dataIndex] ? (_columnsFields$c$data = columnsFields[c.dataIndex].find(function (item) {
7138
7145
  return item.value == record[c.dataIndex];
7139
- })) === null || _columnsFields$c$data === void 0 ? void 0 : _columnsFields$c$data.label : record[c.dataIndex]));
7146
+ })) === null || _columnsFields$c$data === void 0 ? void 0 : _columnsFields$c$data.label : record[c.dataIndex])));
7140
7147
  } else {
7141
- var _columnsFields$c$data2;
7148
+ var _columnsFields$c$data2, _columnsFields$c$data3;
7142
7149
 
7143
7150
  return /*#__PURE__*/React.createElement("div", {
7144
7151
  key: c.dataIndex,
@@ -7149,9 +7156,18 @@ function Table(_ref) {
7149
7156
  overflow: 'hidden'
7150
7157
  },
7151
7158
  title: record[c.dataIndex]
7159
+ }, c.ellipsis ? /*#__PURE__*/React.createElement("div", {
7160
+ style: {
7161
+ width: '100%',
7162
+ whiteSpace: 'nowrap',
7163
+ overflow: 'hidden',
7164
+ textOverflow: 'ellipsis'
7165
+ }
7152
7166
  }, c.render ? c.render(record[c.dataIndex], record, index) : columnsFields[c.dataIndex] ? (_columnsFields$c$data2 = columnsFields[c.dataIndex].find(function (item) {
7153
7167
  return item.value == record[c.dataIndex];
7154
- })) === null || _columnsFields$c$data2 === void 0 ? void 0 : _columnsFields$c$data2.label : record[c.dataIndex]);
7168
+ })) === 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) {
7169
+ return item.value == record[c.dataIndex];
7170
+ })) === null || _columnsFields$c$data3 === void 0 ? void 0 : _columnsFields$c$data3.label : record[c.dataIndex]);
7155
7171
  }
7156
7172
  }
7157
7173
  });
@@ -8751,7 +8767,21 @@ var WForm = function WForm(props, ref) {
8751
8767
  };
8752
8768
 
8753
8769
  var setFieldsValue = function setFieldsValue(record) {
8754
- form.setFieldsValue(record);
8770
+ var setFieldsValues = _objectSpread2({}, record);
8771
+
8772
+ filterFormColumns.forEach(function (c) {
8773
+ if (c.search && c.search.transformSetForm) {
8774
+ var transformObj = c.search.transformSetForm(setFieldsValues[c.dataIndex]);
8775
+ setFieldsValues = _objectSpread2(_objectSpread2({}, setFieldsValues), transformObj);
8776
+
8777
+ if (!transformObj[c.dataIndex]) {
8778
+ delete setFieldsValues[c.dataIndex];
8779
+ }
8780
+
8781
+ return false;
8782
+ }
8783
+ });
8784
+ form.setFieldsValue(setFieldsValues);
8755
8785
  };
8756
8786
 
8757
8787
  useImperativeHandle(ref, function () {
@@ -8765,7 +8795,8 @@ var WForm = function WForm(props, ref) {
8765
8795
  });
8766
8796
  return /*#__PURE__*/React.createElement(_Form, _objectSpread2({
8767
8797
  style: {
8768
- marginBottom: '20px'
8798
+ marginBottom: '20px',
8799
+ width: '100%'
8769
8800
  },
8770
8801
  onFinish: handleSearch,
8771
8802
  onValuesChange: function onValuesChange(changedValues, allValues) {
@@ -8773,9 +8804,7 @@ var WForm = function WForm(props, ref) {
8773
8804
  setchangedValues(changedValues);
8774
8805
  },
8775
8806
  form: form
8776
- }, extraProps), /*#__PURE__*/React.createElement(_Row, null, filterForm), /*#__PURE__*/React.createElement(_Row, null, filterExtraColumnsForm), search && search.hideSubmit ? null : /*#__PURE__*/React.createElement(_Row, {
8777
- justify: "end"
8778
- }, /*#__PURE__*/React.createElement(_Col, {
8807
+ }, extraProps), /*#__PURE__*/React.createElement(_Row, null, filterForm, filterExtraColumnsForm, search && search.hideSubmit ? null : /*#__PURE__*/React.createElement(_Col, {
8779
8808
  style: {
8780
8809
  paddingLeft: '12px',
8781
8810
  paddingRight: '12px'
@@ -8791,14 +8820,14 @@ var WForm = function WForm(props, ref) {
8791
8820
  },
8792
8821
  htmlType: "submit",
8793
8822
  icon: /*#__PURE__*/React.createElement(SearchOutlined, null)
8794
- }, search && search.searchText ? search.searchText : '提交'), /*#__PURE__*/React.createElement(WButton, {
8823
+ }, search && search.searchText ? search.searchText : '提交')].concat(_toConsumableArray(search.hideResetBtn ? [] : [/*#__PURE__*/React.createElement(WButton, {
8795
8824
  type: "primary",
8796
8825
  style: {
8797
8826
  marginRight: '20px'
8798
8827
  },
8799
8828
  onClick: handleRest,
8800
8829
  icon: /*#__PURE__*/React.createElement(ReloadOutlined, null)
8801
- }, search && search.resetText ? search.resetText : '重置')]), !search ? /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(WButton, {
8830
+ }, search && search.resetText ? search.resetText : '重置')]))), !search ? /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(WButton, {
8802
8831
  type: "primary",
8803
8832
  style: {
8804
8833
  marginRight: '20px'
@@ -8819,7 +8848,7 @@ var WForm = function WForm(props, ref) {
8819
8848
  },
8820
8849
  htmlType: "submit",
8821
8850
  icon: /*#__PURE__*/React.createElement(SearchOutlined, null)
8822
- }, "\u63D0\u4EA4"), /*#__PURE__*/React.createElement(WButton, {
8851
+ }, "\u63D0\u4EA4"), search.hideResetBtn ? null : /*#__PURE__*/React.createElement(WButton, {
8823
8852
  type: "primary",
8824
8853
  style: {
8825
8854
  marginRight: '20px'
@@ -11438,7 +11467,12 @@ var TabelCard = function TabelCard(props, ref) {
11438
11467
  return /*#__PURE__*/React.createElement("span", null, text);
11439
11468
  },
11440
11469
  renderFormItem: function renderFormItem(text, props) {
11441
- return /*#__PURE__*/React.createElement(Index$5, _objectSpread2(_objectSpread2({}, props), props === null || props === void 0 ? void 0 : props.fieldProps));
11470
+ return /*#__PURE__*/React.createElement(Index$5, _objectSpread2({
11471
+ request: props.request,
11472
+ showSearch: true,
11473
+ placeholder: "\u8BF7\u9009\u62E9",
11474
+ allowClear: true
11475
+ }, props === null || props === void 0 ? void 0 : props.fieldProps));
11442
11476
  }
11443
11477
  }
11444
11478
  }
package/dist/index.js CHANGED
@@ -7168,11 +7168,18 @@ function Table(_ref) {
7168
7168
  flex: c.width ? '0 1 auto' : '1',
7169
7169
  overflow: 'hidden'
7170
7170
  }
7171
+ }, /*#__PURE__*/React__default['default'].createElement("div", {
7172
+ style: {
7173
+ width: '100%',
7174
+ whiteSpace: 'nowrap',
7175
+ overflow: 'hidden',
7176
+ textOverflow: 'ellipsis'
7177
+ }
7171
7178
  }, c.render ? c.render(record[c.dataIndex], record, index) : columnsFields[c.dataIndex] ? (_columnsFields$c$data = columnsFields[c.dataIndex].find(function (item) {
7172
7179
  return item.value == record[c.dataIndex];
7173
- })) === null || _columnsFields$c$data === void 0 ? void 0 : _columnsFields$c$data.label : record[c.dataIndex]));
7180
+ })) === null || _columnsFields$c$data === void 0 ? void 0 : _columnsFields$c$data.label : record[c.dataIndex])));
7174
7181
  } else {
7175
- var _columnsFields$c$data2;
7182
+ var _columnsFields$c$data2, _columnsFields$c$data3;
7176
7183
 
7177
7184
  return /*#__PURE__*/React__default['default'].createElement("div", {
7178
7185
  key: c.dataIndex,
@@ -7183,9 +7190,18 @@ function Table(_ref) {
7183
7190
  overflow: 'hidden'
7184
7191
  },
7185
7192
  title: record[c.dataIndex]
7193
+ }, c.ellipsis ? /*#__PURE__*/React__default['default'].createElement("div", {
7194
+ style: {
7195
+ width: '100%',
7196
+ whiteSpace: 'nowrap',
7197
+ overflow: 'hidden',
7198
+ textOverflow: 'ellipsis'
7199
+ }
7186
7200
  }, c.render ? c.render(record[c.dataIndex], record, index) : columnsFields[c.dataIndex] ? (_columnsFields$c$data2 = columnsFields[c.dataIndex].find(function (item) {
7187
7201
  return item.value == record[c.dataIndex];
7188
- })) === null || _columnsFields$c$data2 === void 0 ? void 0 : _columnsFields$c$data2.label : record[c.dataIndex]);
7202
+ })) === 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) {
7203
+ return item.value == record[c.dataIndex];
7204
+ })) === null || _columnsFields$c$data3 === void 0 ? void 0 : _columnsFields$c$data3.label : record[c.dataIndex]);
7189
7205
  }
7190
7206
  }
7191
7207
  });
@@ -8785,7 +8801,21 @@ var WForm = function WForm(props, ref) {
8785
8801
  };
8786
8802
 
8787
8803
  var setFieldsValue = function setFieldsValue(record) {
8788
- form.setFieldsValue(record);
8804
+ var setFieldsValues = _objectSpread2({}, record);
8805
+
8806
+ filterFormColumns.forEach(function (c) {
8807
+ if (c.search && c.search.transformSetForm) {
8808
+ var transformObj = c.search.transformSetForm(setFieldsValues[c.dataIndex]);
8809
+ setFieldsValues = _objectSpread2(_objectSpread2({}, setFieldsValues), transformObj);
8810
+
8811
+ if (!transformObj[c.dataIndex]) {
8812
+ delete setFieldsValues[c.dataIndex];
8813
+ }
8814
+
8815
+ return false;
8816
+ }
8817
+ });
8818
+ form.setFieldsValue(setFieldsValues);
8789
8819
  };
8790
8820
 
8791
8821
  React.useImperativeHandle(ref, function () {
@@ -8799,7 +8829,8 @@ var WForm = function WForm(props, ref) {
8799
8829
  });
8800
8830
  return /*#__PURE__*/React__default['default'].createElement(_Form__default['default'], _objectSpread2({
8801
8831
  style: {
8802
- marginBottom: '20px'
8832
+ marginBottom: '20px',
8833
+ width: '100%'
8803
8834
  },
8804
8835
  onFinish: handleSearch,
8805
8836
  onValuesChange: function onValuesChange(changedValues, allValues) {
@@ -8807,9 +8838,7 @@ var WForm = function WForm(props, ref) {
8807
8838
  setchangedValues(changedValues);
8808
8839
  },
8809
8840
  form: form
8810
- }, 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'], {
8811
- justify: "end"
8812
- }, /*#__PURE__*/React__default['default'].createElement(_Col__default['default'], {
8841
+ }, extraProps), /*#__PURE__*/React__default['default'].createElement(_Row__default['default'], null, filterForm, filterExtraColumnsForm, search && search.hideSubmit ? null : /*#__PURE__*/React__default['default'].createElement(_Col__default['default'], {
8813
8842
  style: {
8814
8843
  paddingLeft: '12px',
8815
8844
  paddingRight: '12px'
@@ -8825,14 +8854,14 @@ var WForm = function WForm(props, ref) {
8825
8854
  },
8826
8855
  htmlType: "submit",
8827
8856
  icon: /*#__PURE__*/React__default['default'].createElement(icons.SearchOutlined, null)
8828
- }, search && search.searchText ? search.searchText : '提交'), /*#__PURE__*/React__default['default'].createElement(WButton, {
8857
+ }, search && search.searchText ? search.searchText : '提交')].concat(_toConsumableArray(search.hideResetBtn ? [] : [/*#__PURE__*/React__default['default'].createElement(WButton, {
8829
8858
  type: "primary",
8830
8859
  style: {
8831
8860
  marginRight: '20px'
8832
8861
  },
8833
8862
  onClick: handleRest,
8834
8863
  icon: /*#__PURE__*/React__default['default'].createElement(icons.ReloadOutlined, null)
8835
- }, search && search.resetText ? search.resetText : '重置')]), !search ? /*#__PURE__*/React__default['default'].createElement(React__default['default'].Fragment, null, /*#__PURE__*/React__default['default'].createElement(WButton, {
8864
+ }, search && search.resetText ? search.resetText : '重置')]))), !search ? /*#__PURE__*/React__default['default'].createElement(React__default['default'].Fragment, null, /*#__PURE__*/React__default['default'].createElement(WButton, {
8836
8865
  type: "primary",
8837
8866
  style: {
8838
8867
  marginRight: '20px'
@@ -8853,7 +8882,7 @@ var WForm = function WForm(props, ref) {
8853
8882
  },
8854
8883
  htmlType: "submit",
8855
8884
  icon: /*#__PURE__*/React__default['default'].createElement(icons.SearchOutlined, null)
8856
- }, "\u63D0\u4EA4"), /*#__PURE__*/React__default['default'].createElement(WButton, {
8885
+ }, "\u63D0\u4EA4"), search.hideResetBtn ? null : /*#__PURE__*/React__default['default'].createElement(WButton, {
8857
8886
  type: "primary",
8858
8887
  style: {
8859
8888
  marginRight: '20px'
@@ -11472,7 +11501,12 @@ var TabelCard = function TabelCard(props, ref) {
11472
11501
  return /*#__PURE__*/React__default['default'].createElement("span", null, text);
11473
11502
  },
11474
11503
  renderFormItem: function renderFormItem(text, props) {
11475
- return /*#__PURE__*/React__default['default'].createElement(Index$5, _objectSpread2(_objectSpread2({}, props), props === null || props === void 0 ? void 0 : props.fieldProps));
11504
+ return /*#__PURE__*/React__default['default'].createElement(Index$5, _objectSpread2({
11505
+ request: props.request,
11506
+ showSearch: true,
11507
+ placeholder: "\u8BF7\u9009\u62E9",
11508
+ allowClear: true
11509
+ }, props === null || props === void 0 ? void 0 : props.fieldProps));
11476
11510
  }
11477
11511
  }
11478
11512
  }
package/package.json CHANGED
@@ -1,7 +1,7 @@
1
1
  {
2
2
  "private": false,
3
3
  "name": "wargerm",
4
- "version": "0.2.23",
4
+ "version": "0.2.27",
5
5
  "scripts": {
6
6
  "dev": "dumi dev",
7
7
  "docs:build": "dumi build",