antd-management-fast-develop 1.0.14 → 1.0.16

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 (2) hide show
  1. package/package.json +2 -2
  2. package/src/template.js +8 -23
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "antd-management-fast-develop",
3
- "version": "1.0.14",
3
+ "version": "1.0.16",
4
4
  "description": "",
5
5
  "license": "ISC",
6
6
  "author": "",
@@ -82,7 +82,7 @@
82
82
  "eslint-config-airbnb-typescript": "^17.0.0",
83
83
  "eslint-config-prettier": "^8.8.0",
84
84
  "eslint-formatter-pretty": "^5.0.0",
85
- "eslint-import-resolver-typescript": "^3.5.3",
85
+ "eslint-import-resolver-typescript": "^3.5.4",
86
86
  "eslint-plugin-eslint-comments": "^3.2.0",
87
87
  "eslint-plugin-import": "^2.27.5",
88
88
  "eslint-plugin-jest": "^27.2.1",
package/src/template.js CHANGED
@@ -12,7 +12,6 @@ import {
12
12
  } from 'easy-soft-utility';
13
13
 
14
14
  import {
15
- getMetaData,
16
15
  unknownLabel,
17
16
  unlimitedWithStringFlag,
18
17
  } from 'antd-management-fast-common';
@@ -24,12 +23,14 @@ import {
24
23
  buildOptionItem,
25
24
  buildRadioItem,
26
25
  buildSearchFormSelect,
26
+ convertOptionOrRadioData,
27
27
  } from 'antd-management-fast-component';
28
+ import { getMergeMetaData } from 'antd-management-fast-framework';
28
29
 
29
30
  export function refit<%= o.functionSegment %>List({ withUnlimited = true }) {
30
31
  const { <%= o.defineName %>List: list } = {
31
32
  <%= o.defineName %>List: [],
32
- ...getMetaData(),
33
+ ...getMergeMetaData(),
33
34
  };
34
35
 
35
36
  if (withUnlimited) {
@@ -84,7 +85,7 @@ export function renderSearch<%= o.functionSegment %>Select({
84
85
  name,
85
86
  helper,
86
87
  list: refit<%= o.functionSegment %>List({ withUnlimited }),
87
- dataConvert: (o) => o,
88
+ dataConvert: convertOptionOrRadioData,
88
89
  });
89
90
  }
90
91
 
@@ -101,11 +102,7 @@ export function renderCustom<%= o.functionSegment %>Select({
101
102
  separator,
102
103
  size,
103
104
  list: refit<%= o.functionSegment %>List({ withUnlimited: true }),
104
- dataConvert: (o, index) => {
105
- const { flag, name } = o;
106
-
107
- return { index, label: name, value: flag, disabled: false, ...o };
108
- },
105
+ dataConvert: convertOptionOrRadioData,
109
106
  renderItem: null,
110
107
  onChange: onChangeCallback,
111
108
  innerProps: innerProperties,
@@ -128,11 +125,7 @@ export function renderForm<%= o.functionSegment %>Select({
128
125
  name,
129
126
  helper,
130
127
  list: refit<%= o.functionSegment %>List({ withUnlimited: false }),
131
- dataConvert: (o, index) => {
132
- const { flag, name } = o;
133
-
134
- return { index, label: name, value: flag, disabled: false, ...o };
135
- },
128
+ dataConvert: convertOptionOrRadioData,
136
129
  onChange: onChangeCallback,
137
130
  formItemLayout,
138
131
  required,
@@ -153,11 +146,7 @@ export function renderCustom<%= o.functionSegment %>Radio({
153
146
  separator,
154
147
  size,
155
148
  list: refit<%= o.functionSegment %>List({ withUnlimited: true }),
156
- dataConvert: (o, index) => {
157
- const { flag, name } = o;
158
-
159
- return { index, label: name, value: flag, disabled: false, ...o };
160
- },
149
+ dataConvert: convertOptionOrRadioData,
161
150
  renderItem: null,
162
151
  onChange: onChangeCallback,
163
152
  innerProps: innerProperties,
@@ -180,11 +169,7 @@ export function renderForm<%= o.functionSegment %>Radio({
180
169
  name,
181
170
  helper,
182
171
  list: refit<%= o.functionSegment %>List({ withUnlimited: false }),
183
- dataConvert: (o, index) => {
184
- const { flag, name } = o;
185
-
186
- return { index, label: name, value: flag, disabled: false, ...o };
187
- },
172
+ dataConvert: convertOptionOrRadioData,
188
173
  onChange: onChangeCallback,
189
174
  formItemLayout,
190
175
  required,