@fe-free/core 2.6.2 → 2.7.1

package/CHANGELOG.md

@@ -1,5 +1,22 @@
 # @fe-free/core
 
+## 2.7.1
+
+### Patch Changes
+
+- feat: record
+  - @fe-free/tool@2.7.1
+
+## 2.7.0
+
+### Minor Changes
+
+- feat: record
+
+### Patch Changes
+
+- @fe-free/tool@2.7.0
+
 ## 2.6.2
 
 ### Patch Changes

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fe-free/core",
-  "version": "2.6.2",
+  "version": "2.7.1",
   "description": "",
   "main": "./src/index.ts",
   "author": "",
@@ -41,7 +41,7 @@
     "remark-gfm": "^4.0.1",
     "vanilla-jsoneditor": "^0.23.1",
     "zustand": "^4.5.4",
-    "@fe-free/tool": "2.6.2"
+    "@fe-free/tool": "2.7.1"
   },
   "peerDependencies": {
     "@ant-design/pro-components": "2.8.9",

package/src/form/form.stories.tsx

@@ -7,6 +7,8 @@ import {
   ProFormJavascript,
   ProFormListNumber,
   ProFormListText,
+  ProFormRecord,
+  ProFormRecordArray,
   ProFormSwitchNumber,
   ProFormUpload,
   ProFormUploadDragger,
@@ -234,3 +236,47 @@ export const ProFormImageUploadComponent: Story = {
     </ProFormBase>
   ),
 };
+
+export const ProFormRecordComponent: Story = {
+  render: () => (
+    <ProFormBase>
+      <ProFormRecord
+        name="record1"
+        label="record1"
+        fieldProps={{
+          labels: [
+            { key: 'username', label: '用户名' },
+            { key: 'password', label: '密码' },
+          ],
+        }}
+        initialValue={{
+          username: '',
+          password: '',
+        }}
+      />
+      <ProFormRecord name="record2" label="record2" />
+    </ProFormBase>
+  ),
+};
+
+export const ProFormRecordArrayComponent: Story = {
+  render: () => (
+    <ProFormBase>
+      <ProFormRecordArray
+        name="recordArray1"
+        label="recordArray1"
+        fieldProps={{
+          labels: [
+            { key: 'username', label: '用户名' },
+            { key: 'password', label: '密码' },
+          ],
+        }}
+        initialValue={[
+          { key: 'username', value: undefined },
+          { key: 'password', value: undefined },
+        ]}
+      />
+      <ProFormRecordArray name="recordArray2" label="recordArray2" />
+    </ProFormBase>
+  ),
+};

package/src/form/form_list/form_list_helper.tsx

@@ -1,5 +1,6 @@
 import { DeleteOutlined, PlusOutlined } from '@ant-design/icons';
 import { Button } from 'antd';
+import classNames from 'classnames';
 
 interface ProFormListHelperProps<T> {
   value?: T[];
@@ -12,7 +13,10 @@ interface ProFormListHelperProps<T> {
   }) => React.ReactNode;
   addText?: string;
   getAdd: () => T;
+  disabledAdd?: boolean;
+  disabledDelete?: boolean;
   readOnly?: boolean;
+  className?: string;
 }
 
 const emptyArr = [];
@@ -20,7 +24,7 @@ function ProFormListHelper<T = any>(props: ProFormListHelperProps<T>) {
   const options = props.value || emptyArr;
 
   return (
-    <div className="flex flex-col gap-2">
+    <div className={classNames('flex flex-col gap-2', props.className)}>
       <div className="flex flex-col gap-2">
         {options.map((item, index) => {
           return (
@@ -37,7 +41,7 @@ function ProFormListHelper<T = any>(props: ProFormListHelperProps<T>) {
                   },
                 })}
               </div>
-              {!props.readOnly && (
+              {!props.readOnly && !props.disabledDelete && (
                 <Button
                   icon={<DeleteOutlined />}
                   type="text"
@@ -52,7 +56,7 @@ function ProFormListHelper<T = any>(props: ProFormListHelperProps<T>) {
           );
         })}
       </div>
-      {!props.readOnly && (
+      {!props.readOnly && !props.disabledAdd && (
         <div className="flex justify-center">
           <Button
             size="small"

package/src/form/index.tsx

@@ -4,6 +4,7 @@ export { ProFormListModalHelper } from './form_list/form_list_modal_helper';
 export { ProFormEditor } from './pro_form_editor';
 export { ProFormJavascript } from './pro_form_javascript';
 export { ProFormJSON } from './pro_form_json';
+export { ProFormRecord, ProFormRecordArray } from './pro_form_record';
 export {
   ProFormSwitchNumber,
   SwitchNumber,

package/src/form/pro_form_record.tsx

@@ -0,0 +1,56 @@
+import type { ProFormItemProps } from '@ant-design/pro-components';
+import { ProForm } from '@ant-design/pro-components';
+import type { RecordArrayProps, RecordProps } from '../record';
+import { Record, RecordArray } from '../record';
+
+function ProFormRecord(props: ProFormItemProps<RecordProps>) {
+  const { fieldProps, ...rest } = props;
+
+  return (
+    <ProForm.Item
+      {...rest}
+      rules={[
+        ...(props.rules || []),
+        {
+          validator: async (_, value) => {
+            const values = Object.values(value || {});
+            if (values.length && values.filter(Boolean).length !== values.length) {
+              return Promise.reject('选项不能为空');
+            }
+
+            return Promise.resolve();
+          },
+        },
+      ]}
+    >
+      <Record {...(fieldProps as RecordProps)} />
+    </ProForm.Item>
+  );
+}
+
+function ProFormRecordArray(props: ProFormItemProps<RecordArrayProps>) {
+  const { fieldProps, ...rest } = props;
+
+  return (
+    <ProForm.Item
+      {...rest}
+      rules={[
+        ...(props.rules || []),
+        {
+          validator: async (_, value) => {
+            console.log('value', value);
+            if (value?.some((item) => item.value === undefined || item.key === undefined)) {
+              return Promise.reject('选项不能为空');
+            }
+
+            return Promise.resolve();
+          },
+        },
+      ]}
+    >
+      <RecordArray {...(fieldProps as RecordArrayProps)} />
+    </ProForm.Item>
+  );
+}
+
+export { ProFormRecord, ProFormRecordArray };

package/src/index.ts

@@ -31,6 +31,8 @@ export {
   ProFormListModalHelper,
   ProFormListNumber,
   ProFormListText,
+  ProFormRecord,
+  ProFormRecordArray,
   ProFormSwitchNumber,
   ProFormUpload,
   ProFormUploadDragger,
@@ -43,6 +45,7 @@ export type { InfiniteListProps } from './infinite_list';
 export { Markdown } from './markdown';
 export { PageLayout, PageLayoutTabs } from './page_layout';
 export type { PageLayoutProps, PageLayoutTabsProps } from './page_layout';
+export type { RecordArrayProps, RecordProps } from './record';
 export { routeTool } from './route';
 export { NumberSlider, PercentageSlider } from './slider';
 export type { NumberSliderProps, PercentageSliderProps } from './slider';

package/src/record/index.tsx

@@ -0,0 +1,150 @@
+import { Divider, Input } from 'antd';
+import classNames from 'classnames';
+import { useCallback, useMemo } from 'react';
+import { ProFormListHelper } from '../form';
+
+function Item({
+  value,
+  label,
+  onChange,
+}: {
+  value?: string;
+  label?: string;
+  onChange: (value: string) => void;
+}) {
+  return (
+    <div className="flex flex-col gap-2">
+      <div className="flex items-center gap-1">
+        <span className="text-red-500">*</span>
+        {label}
+      </div>
+      <Input
+        value={value}
+        placeholder={'请输入'}
+        onChange={(e) => {
+          onChange(e.target.value);
+        }}
+      />
+    </div>
+  );
+}
+
+interface RecordItem {
+  value?: { key?: string; value?: string };
+  onChange: (value: { key?: string; value?: string }) => void;
+  label?: string;
+}
+
+function RecordItem(props: RecordItem) {
+  const { value, onChange, label } = props;
+
+  // 如果提供了 label
+  if (label) {
+    return (
+      <Item
+        value={value?.value}
+        label={label || value?.key}
+        onChange={(v) => {
+          onChange({ key: value?.key, value: v });
+        }}
+      />
+    );
+  }
+
+  return (
+    <div className="flex flex-col gap-1">
+      <Item
+        value={value?.key}
+        onChange={(v) => {
+          onChange({ key: v, value: value?.value });
+        }}
+        label="Key"
+      />
+      <Item
+        value={value?.value}
+        onChange={(v) => {
+          onChange({ key: value?.key, value: v });
+        }}
+        label="Value"
+      />
+    </div>
+  );
+}
+
+interface RecordArrayProps {
+  value?: { key?: string; value?: string }[];
+  onChange: (value: { key?: string; value?: string }[]) => void;
+  labels?: { key?: string; label?: string }[];
+  className?: string;
+}
+
+function RecordArray(props: RecordArrayProps) {
+  const { value, onChange, labels, className } = props;
+
+  const isFixed = !!labels?.length;
+
+  return (
+    <ProFormListHelper
+      className={classNames('c-bg rounded p-2', className)}
+      value={value}
+      onChange={onChange}
+      getAdd={() => ({
+        key: undefined,
+        value: undefined,
+      })}
+      disabledDelete={isFixed}
+      disabledAdd={isFixed}
+    >
+      {({ item, index, onItemChange }) => {
+        return (
+          <>
+            <RecordItem
+              value={item}
+              label={labels?.[index]?.label}
+              onChange={(v) => {
+                onItemChange(v);
+              }}
+            />
+            {!isFixed && <Divider className="mb-2" />}
+          </>
+        );
+      }}
+    </ProFormListHelper>
+  );
+}
+
+interface RecordProps extends Omit<RecordArrayProps, 'value' | 'onChange'> {
+  value?: Record<string, any>;
+  onChange: (value?: Record<string, any>) => void;
+}
+
+function Record(props: RecordProps) {
+  const { value, onChange, ...rest } = props;
+
+  // obj 和 arr 的转换
+  const newValue = useMemo(() => {
+    return Object.keys(value || {}).map((key) => ({
+      key,
+      value: value?.[key],
+    }));
+  }, [value]);
+
+  // obj 和 arr 的转换
+  const newOnChange = useCallback(
+    (newV: { key?: string; value?: string }[]) => {
+      const newValues = {};
+      newV.forEach((item, index) => {
+        // 确保有值
+        newValues[item.key || index] = item.value;
+      });
+
+      onChange(newValues);
+    },
+    [onChange],
+  );
+
+  return <RecordArray value={newValue} onChange={newOnChange} {...rest} />;
+}
+
+export { Record, RecordArray };
+export type { RecordArrayProps, RecordProps };