@fe-free/core 3.0.22 → 3.0.24

package/CHANGELOG.md

@@ -1,5 +1,19 @@
 # @fe-free/core
 
+## 3.0.24
+
+### Patch Changes
+
+- feat: listxxx
+  - @fe-free/tool@3.0.24
+
+## 3.0.23
+
+### Patch Changes
+
+- feat: form list
+  - @fe-free/tool@3.0.23
+
 ## 3.0.22
 
 ### Patch Changes

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fe-free/core",
-  "version": "3.0.22",
+  "version": "3.0.24",
   "description": "",
   "main": "./src/index.ts",
   "author": "",
@@ -41,7 +41,7 @@
     "safe-stable-stringify": "^2.5.0",
     "vanilla-jsoneditor": "^0.23.1",
     "zustand": "^4.5.4",
-    "@fe-free/tool": "3.0.22"
+    "@fe-free/tool": "3.0.24"
   },
   "peerDependencies": {
     "@ant-design/pro-components": "2.8.9",

package/src/form/form.stories.tsx

@@ -169,8 +169,12 @@ export const ProFormSwitchOptionsComponent: Story = {
 export const ProFormListTextComponent: Story = {
   render: () => (
     <ProFormBase>
-      <ProFormListText name="listText" />
-      <ProFormListText name="listText_isValueLabel" fieldProps={{ isValueLabel: true }} />
+      <ProFormListText name="listText" label="listText" required={false} />
+      <ProFormListText
+        name="listText_isValueLabel"
+        label="listText_isValueLabel"
+        fieldProps={{ isValueLabel: true }}
+      />
     </ProFormBase>
   ),
 };

package/src/form/form_list/form_list.tsx

@@ -115,26 +115,29 @@ function ProFormListText(props: ProFormItemProps<ListTextProps>) {
       required={props.required ?? true}
       rules={[
         ...(props.rules || []),
-        // { required: true },
+        { required: props.required ?? true },
         {
           validator: async (_, value) => {
-            if (fieldProps?.isValueLabel) {
-              if (value?.some((item) => item.value === undefined || item.value === '')) {
-                return Promise.reject('存在空选项');
-              }
-              // 不能有重复的 value
-              if (uniqBy(value, 'value').length !== value.length) {
-                return Promise.reject('不能有重复');
-              }
-            } else {
-              if (value?.some((item) => item === undefined || item === '')) {
-                return Promise.reject('存在空选项');
-              }
-              // 不能有重复的 value
-              if (uniq(value).length !== value.length) {
-                return Promise.reject('不能有重复');
+            if (value) {
+              if (fieldProps?.isValueLabel) {
+                if (value?.some((item) => item.value === undefined || item.value === '')) {
+                  return Promise.reject('存在空选项');
+                }
+                // 不能有重复的 value
+                if (uniqBy(value, 'value').length !== value.length) {
+                  return Promise.reject('不能有重复');
+                }
+              } else {
+                if (value?.some((item) => item === undefined || item === '')) {
+                  return Promise.reject('存在空选项');
+                }
+                // 不能有重复的 value
+                if (uniq(value).length !== value.length) {
+                  return Promise.reject('不能有重复');
+                }
               }
             }
+
             return Promise.resolve();
           },
         },
@@ -154,24 +157,26 @@ function ProFormListNumber(props: ProFormItemProps<ListNumberProps>) {
       required={props.required ?? true}
       rules={[
         ...(props.rules || []),
-        // { required: true },
+        { required: props.required ?? true },
         {
           validator: async (_, value) => {
-            if (fieldProps?.isValueLabel) {
-              if (value?.some((item) => item.value === undefined || item.value === null)) {
-                return Promise.reject('存在空选项');
-              }
-              // 不能有重复的 value
-              if (uniqBy(value, 'value').length !== value.length) {
-                return Promise.reject('不能有重复');
-              }
-            } else {
-              if (value?.some((item) => item === undefined || item === null)) {
-                return Promise.reject('存在空选项');
-              }
-              // 不能有重复的 value
-              if (uniq(value).length !== value.length) {
-                return Promise.reject('不能有重复');
+            if (value) {
+              if (fieldProps?.isValueLabel) {
+                if (value?.some((item) => item.value === undefined || item.value === null)) {
+                  return Promise.reject('存在空选项');
+                }
+                // 不能有重复的 value
+                if (uniqBy(value, 'value').length !== value.length) {
+                  return Promise.reject('不能有重复');
+                }
+              } else {
+                if (value?.some((item) => item === undefined || item === null)) {
+                  return Promise.reject('存在空选项');
+                }
+                // 不能有重复的 value
+                if (uniq(value).length !== value.length) {
+                  return Promise.reject('不能有重复');
+                }
               }
             }
             return Promise.resolve();
@@ -193,4 +198,11 @@ function ProFormListBoolean(props: ProFormItemProps<ListBooleanProps>) {
   );
 }
 
-export { ProFormListBoolean, ProFormListNumber, ProFormListText };
+export {
+  ListBoolean,
+  ListNumber,
+  ListText,
+  ProFormListBoolean,
+  ProFormListNumber,
+  ProFormListText,
+};

package/src/form/index.tsx

@@ -1,4 +1,11 @@
-export { ProFormListBoolean, ProFormListNumber, ProFormListText } from './form_list/form_list';
+export {
+  ListBoolean,
+  ListNumber,
+  ListText,
+  ProFormListBoolean,
+  ProFormListNumber,
+  ProFormListText,
+} from './form_list/form_list';
 export { ProFormListHelper } from './form_list/form_list_helper';
 export { ProFormListModalHelper } from './form_list/form_list_modal_helper';
 export { ProFormEditor } from './pro_form_editor';

package/src/index.ts

@@ -24,6 +24,9 @@ export { EditorMention } from './editor_mention';
 export type { EditorMentionProps } from './editor_mention';
 export { FileCard } from './file';
 export {
+  ListBoolean,
+  ListNumber,
+  ListText,
   ProFormAvatarImageUpload,
   ProFormEditor,
   ProFormImageUpload,