@ecoding/components.antd 0.4.11 → 0.4.12

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.
@@ -137,16 +137,34 @@ const AsyncSelect = memo((props) => {
137
137
  timeout = setTimeout(innerEx, 300);
138
138
  });
139
139
  const changeHandler = (v, opts) => {
140
- if (props.emptyType === 'null') {
141
- v = v || null;
142
- }
143
- else if (props.emptyType === 'undefined') {
144
- v = v || undefined;
145
- }
146
- else {
147
- v = v || '';
140
+ switch (props.emptyType) {
141
+ case '': {
142
+ if (Array.isArray(v) && v.length === 0) {
143
+ v = null;
144
+ }
145
+ else {
146
+ v = v || null;
147
+ }
148
+ }
149
+ case 'undefined':
150
+ case undefined: {
151
+ if (Array.isArray(v) && v.length === 0) {
152
+ v = undefined;
153
+ }
154
+ else {
155
+ v = v || undefined;
156
+ }
157
+ }
158
+ default: {
159
+ if (Array.isArray(v) && v.length === 0) {
160
+ v = null;
161
+ }
162
+ else {
163
+ v = v || null;
164
+ }
165
+ }
148
166
  }
149
- props.onChange(v);
167
+ props.onChange && props.onChange(v);
150
168
  props.onChangeOpts && props.onChangeOpts(opts);
151
169
  };
152
170
  const children = useMemo(() => {
@@ -10,6 +10,7 @@ interface IProps {
10
10
  children?: string;
11
11
  };
12
12
  value?: any;
13
+ emptyType?: 'null' | 'undefined' | '';
13
14
  treeNodeFilterProp?: string;
14
15
  multiple?: boolean;
15
16
  treeCheckable?: boolean;
@@ -12,10 +12,40 @@ const processTreeData = (data) => {
12
12
  });
13
13
  };
14
14
  const C = (props) => {
15
- const { treeCheckable, i18n, disabledParent, treeData, fieldNames, treeNodeFilterProp, multiple, disabled } = props;
15
+ const { treeCheckable, i18n, disabledParent, treeData, fieldNames, treeNodeFilterProp, onChange, emptyType } = props;
16
16
  // 是否禁用父级
17
17
  const treeDataFormat = disabledParent ? processTreeData(treeData || []) : treeData || [];
18
- return (React.createElement(TreeSelect, Object.assign({}, props, { fieldNames: fieldNames, treeData: treeDataFormat, treeCheckable: treeCheckable, showSearch: true, style: { width: '100%' }, placeholder: i18n ? i18n.$t('global.please.select') : '请选择', allowClear: true, treeDefaultExpandAll: true, treeNodeFilterProp: treeNodeFilterProp })));
18
+ const changeHandler = (v) => {
19
+ switch (emptyType) {
20
+ case '': {
21
+ if (Array.isArray(v) && v.length === 0) {
22
+ v = null;
23
+ }
24
+ else {
25
+ v = v || null;
26
+ }
27
+ }
28
+ case 'undefined':
29
+ case undefined: {
30
+ if (Array.isArray(v) && v.length === 0) {
31
+ v = undefined;
32
+ }
33
+ else {
34
+ v = v || undefined;
35
+ }
36
+ }
37
+ default: {
38
+ if (Array.isArray(v) && v.length === 0) {
39
+ v = null;
40
+ }
41
+ else {
42
+ v = v || null;
43
+ }
44
+ }
45
+ }
46
+ onChange && onChange(v);
47
+ };
48
+ return (React.createElement(TreeSelect, Object.assign({}, props, { fieldNames: fieldNames, treeData: treeDataFormat, treeCheckable: treeCheckable, showSearch: true, style: { width: '100%' }, placeholder: i18n ? i18n.$t('global.please.select') : '请选择', allowClear: true, treeDefaultExpandAll: true, treeNodeFilterProp: treeNodeFilterProp, onChange: changeHandler })));
19
49
  };
20
50
  C.defaultProps = {
21
51
  disabledParent: true
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@ecoding/components.antd",
3
- "version": "0.4.11",
3
+ "version": "0.4.12",
4
4
  "author": "cxc",
5
5
  "homepage": "",
6
6
  "license": "MIT",
@@ -47,5 +47,5 @@
47
47
  "antd": "5.27.0",
48
48
  "axios": "^1.1.2"
49
49
  },
50
- "gitHead": "b5d55fd3c64fccf0e70aa9e151a1f0ba58738cfc"
50
+ "gitHead": "fe0a5ba329fb02f5d3b0d2b11f8dd45be04d5391"
51
51
  }