@pisell/materials 1.0.970 → 1.0.971

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

@@ -110,14 +110,50 @@ const dataSourceForm: MetaType = {
                 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),
+                    ...formGroupSchemas,
                     createSubmitButton(),
                   ]);
                 }
@@ -131,11 +167,17 @@ const dataSourceForm: MetaType = {
               }
 
               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',

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 = '电话号码输入';
@@ -199,6 +245,11 @@ 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 = {
@@ -284,23 +335,62 @@ export const createFormItemSchema = (
     props.defaultValue = null;
   }
 
-  // 如果设置了x-read-pretty，则设置为只读
-  if (readPretty) {
-    props.renderMode = 'view';
-  }
-
   if (xComponent === 'ColorPicker') {
     props.defaultValue = defaultValue;
   }
 
   const _componentName = nocobaseCpt2PisellCptMap[componentName];
 
-  return {
-    title: cptTitle || formItemMetaMap[_componentName]?.title,
+  // 确定 schema type
+  let schemaType: 'void' | 'string' | 'number' | 'object' | 'array' = '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';
+  }
+
+  // 构建完整的 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 +625,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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pisell/materials",
-  "version": "1.0.970",
+  "version": "1.0.971",
   "main": "./lib/index.js",
   "module": "./es/index.js",
   "types": "./lib/index.d.ts",
@@ -76,8 +76,8 @@
     "vod-js-sdk-v6": "^1.4.11",
     "react-camera-pro": "1.4.0",
     "@pisell/date-picker": "1.0.127",
-    "@pisell/icon": "0.0.10",
-    "@pisell/utils": "1.0.55"
+    "@pisell/utils": "1.0.55",
+    "@pisell/icon": "0.0.10"
   },
   "peerDependencies": {
     "react": "^18.0.0",