@pisell/materials 6.6.2 → 6.7.2

package/lowcode/data-source-form/meta.ts

@@ -109,33 +109,75 @@ const dataSourceForm: MetaType = {
               if (value.isSelect) {
                 target.getProps().setPropValue('title', '');
                 target.node.children.importSchema([]);
-              }
 
-              let childrenSchemas = fields2ChildrenSchemas(
-                value.item.fields,
-                target.getProps().getPropValue('renderMode')
-              );
+                // 检查是否fields包含group信息
+                const hasGroupInfo = value.item.fields?.some((field: any) => field._groupId);
+                
+                let formGroupSchemas: any[] = [];
+                
+                if (hasGroupInfo) {
+                  // 按group分组
+                  const groupedFields = new Map<string, { groupTitle: string; items: any[] }>();
+                  
+                  value.item.fields.forEach((field: any) => {
+                    const groupId = field._groupId;
+                    if (!groupedFields.has(groupId)) {
+                      groupedFields.set(groupId, {
+                        groupTitle: field._groupTitle,
+                        items: []
+                      });
+                    }
+                    // 移除group标记，避免污染
+                    const { _groupId, _groupTitle, ...cleanField } = field;
+                    groupedFields.get(groupId)!.items.push(cleanField);
+                  });
+                  
+                  // 为每个group创建一个FormGroup
+                  groupedFields.forEach(({ groupTitle, items }) => {
+                    const childrenSchemas = fields2ChildrenSchemas(
+                      items,
+                      target.getProps().getPropValue('renderMode')
+                    );
+                    formGroupSchemas.push(
+                      createFormGroup(childrenSchemas, groupTitle)
+                    );
+                  });
+                } else {
+                  // 原有逻辑：没有group信息时，创建单个FormGroup
+                  let childrenSchemas = fields2ChildrenSchemas(
+                    value.item.fields,
+                    target.getProps().getPropValue('renderMode')
+                  );
+                  formGroupSchemas = [createFormGroup(childrenSchemas)];
+                }
 
-              if (target.node.children.isEmptyNode) {
-                target.node.children.importSchema([
-                  createFormGroup(childrenSchemas),
-                  createSubmitButton(),
-                ]);
-              }
-              // 如果Title是空：选择Source后，自动把Source的名称填写到Title里
-              if (
-                !target.node.getProps().getPropValue('title') &&
-                value.title
-              ) {
-                target.getProps().setPropValue('title', value.title);
+                if (target.node.children.isEmptyNode) {
+                  target.node.children.importSchema([
+                    ...formGroupSchemas,
+                    createSubmitButton(),
+                  ]);
+                }
+                // 如果Title是空：选择Source后，自动把Source的名称填写到Title里
+                if (
+                  !target.node.getProps().getPropValue('title') &&
+                  value.title
+                ) {
+                  target.getProps().setPropValue('title', value.title);
+                }
               }
 
               const dataSource = value.isVariable ? value.value : value.item;
+              
+              // 清理fields中的group标记
+              const cleanFields = value.item.fields?.map((field: any) => {
+                const { _groupId, _groupTitle, ...cleanField } = field;
+                return cleanField;
+              }) || value.item.fields;
 
               setBatchVariables(target, [
                 {
                   label: 'currentFields',
-                  value: value.item.fields,
+                  value: cleanFields,
                 },
                 {
                   label: 'dataSourceTitle',
@@ -156,7 +198,7 @@ const dataSourceForm: MetaType = {
               return {
                 filters: {
                   tables: 'all',
-                  variables: {}
+                  variables: {},
                 },
                 mode: target.getProps().getPropValue('renderMode'),
                 variables: getDataSourceVariables(target),
@@ -168,7 +210,7 @@ const dataSourceForm: MetaType = {
           title: '字段',
           display: 'entry',
           type: 'group',
-          name: "_fields1",
+          name: '_fields1',
           items: [
             {
               title: {
@@ -261,7 +303,7 @@ const dataSourceForm: MetaType = {
             props: (target) => {
               return {
                 filters: {
-                  variables: {}
+                  variables: {},
                 },
                 variables: getCurrentValueVariables(target),
               };
@@ -270,7 +312,7 @@ const dataSourceForm: MetaType = {
         },
         {
           type: 'group',
-          name: "_extraParams",
+          name: '_extraParams',
           title: '额外参数',
           display: 'entry',
           items: [
@@ -281,7 +323,7 @@ const dataSourceForm: MetaType = {
                 'en-US': 'List Params',
                 'zh-CN': '列表参数',
               },
-              setter: 'StringSetter'
+              setter: 'StringSetter',
             },
             {
               name: 'extraParams.get',
@@ -290,7 +332,7 @@ const dataSourceForm: MetaType = {
                 'en-US': 'Get Params',
                 'zh-CN': '获取参数',
               },
-              setter: 'JsonSetter'
+              setter: 'JsonSetter',
             },
             {
               name: 'extraParams.update',
@@ -299,7 +341,7 @@ const dataSourceForm: MetaType = {
                 'en-US': 'Update Params',
                 'zh-CN': '更新参数',
               },
-              setter: 'JsonSetter'
+              setter: 'JsonSetter',
             },
             // {
             //   name: 'extraParams.create',
@@ -319,8 +361,8 @@ const dataSourceForm: MetaType = {
             //   },
             //   setter: 'StringSetter'
             // }
-          ]
-        }
+          ],
+        },
       ],
     },
     {
@@ -607,7 +649,7 @@ const dataSourceForm: MetaType = {
             },
           },
         },
-      ]
+      ],
     },
   ],
   configure: {
@@ -667,7 +709,24 @@ const dataSourceForm: MetaType = {
               componentName: 'FunctionSetter',
               props: {
                 template:
-                  "customSubmit(values,${extParams}){\n// 格式化数据\nreturn values}",
+                  'customSubmit(values,${extParams}){\n// 自定义提交逻辑\nreturn values}',
+              },
+            },
+          },
+          {
+            name: 'beforeSubmit',
+            title: {
+              label: {
+                type: 'i18n',
+                'en-US': 'Before Submit',
+                'zh-CN': '提交前校验',
+              },
+            },
+            setter: {
+              componentName: 'FunctionSetter',
+              props: {
+                template:
+                  'beforeSubmit(values,${extParams}){\n// 提交前校验逻辑\n// 返回 true 继续提交，返回 false 阻止提交\nreturn true}',
               },
             },
           },
@@ -684,7 +743,7 @@ const dataSourceForm: MetaType = {
               componentName: 'FunctionSetter',
               props: {
                 template:
-                  "formatSubmitValues(values,${extParams}){\n// 格式化数据\nreturn values}",
+                  'formatSubmitValues(values,${extParams}){\n// 格式化数据\nreturn values}',
               },
             },
           },
@@ -701,7 +760,7 @@ const dataSourceForm: MetaType = {
               componentName: 'FunctionSetter',
               props: {
                 template:
-                  "formatInitialValues(values,${extParams}){\n// 格式化数据\nreturn values}",
+                  'formatInitialValues(values,${extParams}){\n// 格式化数据\nreturn values}',
               },
             },
           },

package/lowcode/data-source-form/utils.ts

@@ -14,17 +14,19 @@ type UiSchema = {
   'x-component-props': Record<string, any>;
   'x-read-pretty': boolean;
   'x-validator'?: string;
+  'x-display'?: 'visible' | 'hidden' | 'none';
+  'x-pattern'?: 'editable' | 'disabled' | 'readPretty';
   type: 'string' | 'number' | 'boolean' | 'array' | 'object';
 };
 
 // 创建表单组
-export const createFormGroup = (children: any[]) => {
+export const createFormGroup = (children: any[], groupTitle?: string) => {
   return {
     children,
     componentName: 'FormGroup',
     title: '分组',
     props: {
-      title: 'Group',
+      title: groupTitle || 'Group',
       showTitle: true,
       showDescription: true,
       showBackgroundColor: true,
@@ -110,7 +112,7 @@ const modeMap: Record<string, any> = {
   view: 'view',
 };
 
-// 创建表单项
+
 export const createFormItemSchema = (
   item: {
     name: string;
@@ -129,15 +131,46 @@ export const createFormItemSchema = (
     'x-read-pretty': readPretty,
     default: defaultValue,
     'x-component-props': xProps,
+    'x-pattern': xPattern,
+    'x-display': xDisplay,
+    type,
   } = uiSchema;
 
   let cptTitle = undefined;
 
+  // 根据 x-pattern 和 x-display 确定 renderMode
+  // 优先级: x-display > x-pattern > x-read-pretty > x-component-props.renderMode > mode 参数
+  let renderMode = modeMap[mode] || 'edit';
+  
+  // 先检查 x-component-props 中是否已有 renderMode
+  if (xProps?.renderMode) {
+    renderMode = xProps.renderMode;
+  }
+  
+  // x-read-pretty 兼容旧逻辑（优先级高于 x-component-props）
+  if (readPretty) {
+    renderMode = 'view';
+  }
+  
+  // x-pattern 映射到 renderMode（优先级更高）
+  if (xPattern === 'readPretty') {
+    renderMode = 'view';
+  } else if (xPattern === 'disabled') {
+    renderMode = 'disabled';
+  } else if (xPattern === 'editable') {
+    renderMode = 'edit';
+  }
+  
+  // x-display = 'hidden' 优先级最高
+  if (xDisplay === 'hidden') {
+    renderMode = 'hidden';
+  }
+
+  // 构建 props: 先设置默认值，再用 x-component-props 覆盖，最后设置 renderMode
   let props: Record<string, any> = {
-    ...xProps,
+    // 默认值
     label: title,
     name,
-    renderMode: modeMap[mode] || 'edit',
     allowClear: true,
     placeholder: {
       type: 'i18n',
@@ -145,10 +178,23 @@ export const createFormItemSchema = (
       'zh-CN': '请输入',
       'zh-HK': '請輸入',
     },
+    // x-component-props 中的所有字段直接映射，可以覆盖上面的默认值
+    ...xProps,
+    // renderMode 最终计算结果（综合了所有来源）
+    renderMode,
   };
+  
+  // 如果 x-component-props 中存在 required 字段，额外添加 requiredobj
+  if (xProps?.required !== undefined) {
+    props.requiredobj = {
+      required: xProps.required,
+    };
+  }
+  
   let componentName = xComponent;
 
   let childrenSchema: any[] = [];
+  let propertiesSchema: Record<string, any> = {};
 
   if (item?.interface === 'phone') {
     cptTitle = '电话号码输入';
@@ -190,6 +236,11 @@ export const createFormItemSchema = (
     };
   }
 
+  // 如果类型是 integer，设置 precision 为 0，只允许输入整数
+  if (type === 'integer' && (xComponent === 'InputNumber' || xComponent === 'Percent')) {
+    props.precision = 0;
+  }
+
   if (xComponent === 'Input.JSON' && item?.interface !== 'i18nInput') {
     const jsonChildren = item._children || item.children || [];
 
@@ -199,26 +250,37 @@ export const createFormItemSchema = (
       childrenSchema = jsonChildren.map((child: any) =>
         createFormItemSchema(child, mode)
       );
+      // 同时构建 properties 格式
+      jsonChildren.forEach((child: any) => {
+        const childSchema = createFormItemSchema(child, mode);
+        propertiesSchema[child.name] = childSchema;
+      });
     } else {
       componentName = 'Input.InputJSON';
       props.autoSize = {
         minRows: 4,
       };
-      // props.validateTrigger = "onBlur";
+      
+      // 根据type类型生成不同的normalize和校验逻辑
+      const fieldType = type || 'object';
+      let normalizeValue = '';
+      let validatorValue = '';
+      
+      normalizeValue = '(value) => {\n  try {\n    if (typeof value === \'string\' && value.trim() !== \'\') {\n      const trimmedValue = value.trim();\n      // 只有以{或[开头才尝试转换\n      if (trimmedValue.startsWith(\'{\') || trimmedValue.startsWith(\'[\')) {\n        return JSON.parse(trimmedValue);\n      }\n    }\n  } catch(error) {\n    console.log(error)\n  }\n  return value\n}';
+      validatorValue = "async (value) => {\n  try {\n    if (typeof value === 'string' && value.trim() !== '') {\n      const trimmedValue = value.trim();\n      // 确保JSON以{或[开头，以避免纯数字或字符串通过校验\n      if (!trimmedValue.startsWith('{') && !trimmedValue.startsWith('[')) {\n        return Promise.reject(new Error('JSON必须是对象或数组，请以{或[开头'));\n      }\n      JSON.parse(trimmedValue);\n    }\n  } catch (err) {\n    return Promise.reject(new Error(err.message));\n  }\n}";
+      
       props.normalize = {
         type: 'JSExpression',
-        value:
-          '(value) => {\n  try {\n    return JSON.parse(value);\n  } catch(error) {\n    console.log(error)\n  }\n  return value\n}',
+        value: normalizeValue,
       };
       props.getValueProps = {
         type: 'JSExpression',
         value:
-          '(value) => {\n  try {\n   return { value: value != "" && typeof value === \'object\' ? JSON.stringify(value, null, 2) : value};\n  } catch(error) {\n    console.log(error)\n  }\n  return {value: value}\n}',
+          '(value) => {\n  try {\n    // 使用严格检查：null/undefined不转换，其他对象类型都转换\n    if (value !== null && value !== undefined && typeof value === \'object\') {\n      return { value: JSON.stringify(value, null, 2) };\n    }\n    return { value: value };\n  } catch(error) {\n    console.log(error)\n  }\n  return {value: value}\n}',
       };
       props.validator = {
         type: 'JSExpression',
-        value:
-          "async (value) => {\n try {\n    if (typeof value === 'string' && value.trim() !== '') {\n      JSON.parse(value);\n    }\n  } catch (err) {\n    return Promise.reject(new Error(err.message));\n  }\n}",
+        value: validatorValue,
       };
     }
   }
@@ -284,23 +346,69 @@ export const createFormItemSchema = (
     props.defaultValue = null;
   }
 
-  // 如果设置了x-read-pretty，则设置为只读
-  if (readPretty) {
-    props.renderMode = 'view';
-  }
-
   if (xComponent === 'ColorPicker') {
     props.defaultValue = defaultValue;
   }
 
+  if (xComponent === 'Switch') {
+    props.placeholder = '';
+    props.allowClear = false;
+  }
+
   const _componentName = nocobaseCpt2PisellCptMap[componentName];
 
-  return {
-    title: cptTitle || formItemMetaMap[_componentName]?.title,
+  // 确定 schema type
+  let schemaType: 'void' | 'string' | 'number' | 'object' | 'array' | 'boolean' = 'string';
+  if (type) {
+    schemaType = type as any;
+  } else if (xComponent === 'InputNumber' || xComponent === 'Percent') {
+    schemaType = 'number';
+  } else if (xComponent === 'Input.JSON' || item?.interface === 'i18nInput') {
+    schemaType = 'object';
+  } else if (['Checkbox.Group', 'Select'].includes(xComponent) && props.mode === 'multiple') {
+    schemaType = 'array';
+  } else if (xComponent === 'Switch' || xComponent === 'Checkbox') {
+    schemaType = 'boolean';
+  }
+
+  // 构建完整的 UI Schema 格式
+  const schema: any = {
+    // 基础属性
+    type: schemaType,
+    name: name,
+    title: title,
+
+    // 组件相关
+    'x-component': _componentName,
+    'x-component-props': props,
+
+    // 包装器 (FormItem 作为 decorator)
+    'x-decorator': 'FormItem',
+    'x-decorator-props': {
+      label: title,
+    },
+
+    // 默认值
+    default: defaultValue,
+
+    // 校验
+    ...(validator && { 'x-validator': validator }),
+
+    // children 节点 (兼容旧格式和新格式)
+    ...(childrenSchema.length > 0 && { children: childrenSchema }),
+    ...(Object.keys(propertiesSchema).length > 0 && { properties: propertiesSchema }),
+
+    // 设计器相关 (如果需要)
+    // 'x-initializer': undefined,
+    // 'x-settings': undefined,
+    // 'x-toolbar': undefined,
+
+    // 兼容旧格式: 保留 componentName 供旧代码使用
     componentName: _componentName,
     props,
-    children: childrenSchema,
   };
+
+  return schema;
 };
 
 type FieldOption = {
@@ -535,7 +643,12 @@ export const getDataSourceVariables = (target: any) => {
 };
 
 export const getCurrentValueVariables = (target: any) => {
+  if (target?.getProps()?.getPropValue('_variables')?.dataSourceValue?.fromSettingMeta) {
+    return [];
+  }
+  
   const variables = getParentVariables(target);
+ 
   const currentDataSourceTitle = getVariable(target, 'dataSourceTitle');
 
   const currentValueVariables: any[] = [

package/lowcode/form-item-switch/meta.ts

@@ -0,0 +1,145 @@
+import snippets from './snippets';
+import {
+  formItemGeneralDataGroup,
+  getFormItemGeneralInfoGroup,
+  generalItemMap,
+  getFormItemValidateGroup,
+} from '../_utils/defaultSchema';
+
+export default {
+  snippets,
+  componentName: 'FormItemSwitch',
+  title: '开关(高级)',
+  category: '无代码表单',
+  group: '无代码组件',
+  docUrl: '',
+  screenshot: '',
+  devMode: 'proCode',
+  npm: {
+    package: '@pisell/materials',
+    version: '1.0.1',
+    exportName: 'FormItemSwitch',
+    main: 'src/index.tsx',
+    destructuring: true,
+    subName: '',
+  },
+  generalProps: [
+    // 数据分组
+    formItemGeneralDataGroup,
+    // 信息分组
+    getFormItemGeneralInfoGroup([
+      generalItemMap['label'],
+      generalItemMap['tooltip'],
+      generalItemMap['extra'],
+      generalItemMap['hideLabel'],
+      generalItemMap['renderMode'],
+    ]),
+    // 校验分组
+    getFormItemValidateGroup([generalItemMap['requiredobj']]),
+  ],
+  configure: {
+    props: [
+      {
+        name: 'checkedChildren',
+        title: { label: '选中时内容', tip: '选中时的内容' },
+        propType: 'string',
+        setter: 'PisellI18nSetter',
+        supportVariable: true,
+      },
+      {
+        name: 'unCheckedChildren',
+        title: { label: '非选中时内容', tip: '非选中时的内容' },
+        propType: 'string',
+        setter: 'PisellI18nSetter',
+        supportVariable: true,
+      },
+      {
+        name: 'autoFocus',
+        title: { label: '自动聚焦', tip: '自动获取焦点' },
+        propType: 'bool',
+        defaultValue: false,
+        setter: 'BoolSetter',
+        supportVariable: true,
+      },
+      {
+        name: 'checked',
+        title: { label: '当前值', tip: '指定当前是否选中' },
+        propType: 'bool',
+        defaultValue: false,
+        setter: 'BoolSetter',
+        supportVariable: true,
+      },
+      {
+        name: 'defaultChecked',
+        title: { label: '默认值', tip: '初始是否选中' },
+        propType: 'bool',
+        defaultValue: false,
+        setter: 'BoolSetter',
+        supportVariable: true,
+      },
+      {
+        name: 'disabled',
+        title: { label: '是否禁用', tip: '是否为禁用状态' },
+        propType: 'bool',
+        defaultValue: false,
+        setter: 'BoolSetter',
+        supportVariable: true,
+      },
+      {
+        name: 'loading',
+        title: { label: '加载中', tip: '加载中' },
+        propType: 'bool',
+        defaultValue: false,
+        setter: 'BoolSetter',
+        supportVariable: true,
+      },
+      {
+        name: 'size',
+        title: { label: '尺寸', tip: '开关大小' },
+        propType: { type: 'oneOf', value: ['default', 'small'] },
+        setter: {
+          componentName: 'RadioGroupSetter',
+          props: {
+            options: [
+              {
+                title: '默认',
+                value: 'default',
+              },
+              {
+                title: '小',
+                value: 'small',
+              },
+            ],
+          },
+        },
+        defaultValue: 'default',
+      },
+      {
+        name: 'onChange',
+        title: { label: '变化时回调函数', tip: '变化时回调函数' },
+        propType: 'func',
+      },
+      {
+        name: 'onClick',
+        title: { label: '点击时回调函数', tip: '点击时回调函数' },
+        propType: 'func',
+      },
+    ],
+    supports: {
+      style: true,
+      events: [
+        {
+          name: 'onChange',
+          template:
+            "onChange(checked,event,${extParams}){\n// 变化时回调函数\nconsole.log('onChange', checked, event);}",
+        },
+        {
+          name: 'onClick',
+          template:
+            "onClick(checked,event,${extParams}){\n// 点击时回调函数\nconsole.log('onClick', checked, event);}",
+        },
+      ],
+    },
+  },
+};
+

package/lowcode/form-item-switch/snippets.ts

@@ -0,0 +1,15 @@
+export default [
+  {
+    title: '开关(高级)',
+    screenshot: 'https://alifd.alicdn.com/fusion-cool/icons/icon-antd/switch-1.png',
+    schema: {
+      componentName: 'FormItemSwitch',
+      props: {
+        name: 'switch',
+        label: '开关',
+        defaultChecked: false,
+      },
+    },
+  },
+];
+

package/lowcode/product-card/meta.ts

@@ -63,13 +63,6 @@ export default {
           setter: "BoolSetter",
           defaultValue: true,
         },
-        {
-          name: "isShowAmountFooter",
-          title: { label: "总金额", tip: "商品总金额" },
-          propType: "bool",
-          setter: "BoolSetter",
-          defaultValue: true,
-        },
       ],
     },
     {

package/lowcode/product-card/snippets.ts

@@ -29,7 +29,6 @@ export default [
         isShowHolder: true,
         isShowNote: true,
         isShowDelete: true,
-        isShowAmountFooter: true,
         holderMode: "single",
       },
     },

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pisell/materials",
-  "version": "6.6.2",
+  "version": "6.7.2",
   "main": "./lib/index.js",
   "module": "./es/index.js",
   "types": "./lib/index.d.ts",
@@ -75,9 +75,9 @@
     "antd-mobile": "^5.38.1",
     "vod-js-sdk-v6": "^1.4.11",
     "react-camera-pro": "1.4.0",
+    "@pisell/date-picker": "3.0.7",
     "@pisell/icon": "0.0.11",
-    "@pisell/utils": "3.0.2",
-    "@pisell/date-picker": "3.0.7"
+    "@pisell/utils": "3.0.2"
   },
   "peerDependencies": {
     "react": "^18.0.0",

package/es/components/appVersionControl/index.d.ts

@@ -1,5 +0,0 @@
-/// <reference types="react" />
-import { AppVersionControlProps } from './types';
-import './index.less';
-declare const AppVersionControl: (props: AppVersionControlProps) => JSX.Element;
-export default AppVersionControl;