@pisell/materials 1.8.12 → 1.8.13

package/lowcode/_utils/defaultSchema.ts

@@ -47,7 +47,8 @@ export const generalItemMap = {
       },
       tip: {
         type: 'i18n',
-        'en-US': 'The text displayed in the label of the form item, corresponding to Label.',
+        'en-US':
+          'The text displayed in the label of the form item, corresponding to Label.',
         'zh-CN': '用于显示在表单项的标签文本，对应Label。',
       },
     },
@@ -113,6 +114,29 @@ export const generalItemMap = {
           // setTimeout(() => {
           //   target.document.project.simulatorHost.rerender();
           // });
+          // 根据字段配置更新选项类型相关配置
+          const xDataSource = field.uiSchema?.['x-data-source'];
+          if (xDataSource) {
+            // 如果字段有数据源配置，则同步设置
+            target.getProps().setPropValue('optionSourceType', xDataSource?.type);
+            target.getProps().setPropValue('dataSource', xDataSource?.dataSource);
+            target.getProps().setPropValue('extraParams', xDataSource?.extraParams);
+            target.getProps().setPropValue('labelField', xDataSource?.labelField);
+            target.getProps().setPropValue('valueField', xDataSource?.valueField);
+            // 直接 setPropValue 不会触发 optionSourceType 的 extraProps.setValue，
+            // simulatorHost.rerender() 只更新画布，不会刷新设置面板，
+            // 需要通过重新选中节点来强制设置面板重建，使 setter 函数重新求值
+            setTimeout(() => {
+              const node = target.node;
+              if (node?.document?.selection) {
+                const { selection } = node.document;
+                selection.clear();
+                requestAnimationFrame(() => {
+                  selection.select(node.id);
+                });
+              }
+            });
+          }
         }
         return target.getProps().setPropValue('name', value);
       },
@@ -164,8 +188,10 @@ export const generalItemMap = {
       },
       tip: {
         type: 'i18n',
-        'en-US': 'Whether to hide the Label of the component, including title and tooltip, but not including helper text.',
-        'zh-CN': '是否隐藏组件的Label，包括title和tooltip，但是不包括helper text。',
+        'en-US':
+          'Whether to hide the Label of the component, including title and tooltip, but not including helper text.',
+        'zh-CN':
+          '是否隐藏组件的Label，包括title和tooltip，但是不包括helper text。',
       },
     },
     propType: 'bool',
@@ -511,7 +537,9 @@ export const generalItemMap = {
               propType: 'string',
               setter: 'PisellI18nSetter',
               condition: (target: any) => {
-                return !(['subdomain', 'appIdentifier'].includes(target.parent.getPropValue('type')));
+                return !['subdomain', 'appIdentifier'].includes(
+                  target.parent.getPropValue('type')
+                );
               },
             },
           ],
@@ -676,7 +704,7 @@ export const formItemGeneralDataGroup = {
           disabled: true,
           filters: {
             tables: 'all',
-            variables: {}
+            variables: {},
           },
         },
       },
@@ -701,16 +729,40 @@ export const formItemGeneralOptionTypeGroup = {
         'en-US': 'Type',
         'zh-CN': '类型',
       },
-      setter: {
-        componentName: 'SelectSetter',
-        props: {
-          options: [
-            { title: '默认', value: 'default' },
-            { title: '自定义', value: 'custom' },
-            { title: 'API', value: 'api' },
-          ],
+      condition: (target: any) => {
+        // 读取 optionSourceType 建立响应式依赖，值变更时触发重新求值
+        target.getProps().getPropValue('optionSourceType');
+        return true;
+      },
+      extraProps: {
+        setValue(target: any, value: any) {
+          target.getProps().setPropValue('optionSourceType', value);
         },
       },
+      setter: (target: any) => {
+        const parentForm = getParentForm(target);
+        const fields = getVariable(parentForm, 'currentFields');
+        // 获取当前表单项的 name
+        const currentFieldName = target.getProps().getPropValue('name');
+        // 在 currentFields 中查找对应的字段配置
+        const fieldConfig = fields?.find(
+          (item: any) => item.name === currentFieldName
+        );
+        // 检查字段配置中是否有 x-data-source，如果有说明 optionSourceType 是从数据源设置的
+        const dataSourceType = fieldConfig?.uiSchema?.['x-data-source']?.type;
+
+        return {
+          componentName: 'PisellSelectSetter',
+          props: {
+            disabled: !!dataSourceType,
+            options: [
+              { label: '默认', value: 'default' },
+              { label: '自定义', value: 'custom' },
+              { label: 'API', value: 'api' },
+            ],
+          },
+        };
+      },
     },
     {
       name: 'dataSource',
@@ -741,15 +793,29 @@ export const formItemGeneralOptionTypeGroup = {
           return target.getProps().setPropValue('dataSource', value.item);
         },
       },
-      setter: {
-        componentName: 'PisellDataSourceSetter',
-        props: {
-          mode: 'list',
-          filters: {
-            tables: 'all',
-            variables: {}
+      setter: (target: any) => {
+        const parentForm = getParentForm(target);
+        const fields = getVariable(parentForm, 'currentFields');
+        // 获取当前表单项的 name
+        const currentFieldName = target.getProps().getPropValue('name');
+        // 在 currentFields 中查找对应的字段配置
+        const fieldConfig = fields?.find(
+          (item: any) => item.name === currentFieldName
+        );
+        // 检查字段配置中是否有 x-data-source，如果有说明 dataSource 是从数据源设置的
+        const dataSource = fieldConfig?.uiSchema?.['x-data-source']?.dataSource;
+
+        return {
+          componentName: 'PisellDataSourceSetter',
+          props: {
+            disabled: !!dataSource,
+            mode: 'list',
+            filters: {
+              tables: 'all',
+              variables: {},
+            },
           },
-        },
+        };
       },
     },
     {
@@ -765,7 +831,7 @@ export const formItemGeneralOptionTypeGroup = {
         'en-US': 'Extra Params',
         'zh-CN': '额外参数',
       },
-      setter: 'JsonSetter'
+      setter: 'JsonSetter',
     },
     {
       name: 'labelField',
@@ -852,7 +918,7 @@ export const formItemGeneralOptionTypeGroup = {
             itemSetter: {
               componentName: 'ObjectSetter',
               initialValue: () => {
-                return {}
+                return {};
               },
               props: {
                 config: {
@@ -1554,7 +1620,7 @@ export const genGeneralVariablesSetting = ({
       props: (target: any) => {
         return {
           filters: {
-            variables: {}
+            variables: {},
           },
           variables: getCptValuesVariables(target),
         };
@@ -1563,38 +1629,37 @@ export const genGeneralVariablesSetting = ({
   };
 };
 
-
 export const inputPlaceholder = {
   type: 'i18n',
-  'en': 'Enter',
+  en: 'Enter',
   'zh-CN': '请输入',
   'zh-HK': '請輸入',
 };
 
 export const selectPlaceholder = {
   type: 'i18n',
-  'en': 'Select an option',
+  en: 'Select an option',
   'zh-CN': '请选择一个选项',
   'zh-HK': '請選擇一個選項',
 };
 
 export const selectMultiplePlaceholder = {
   type: 'i18n',
-  'en': 'Select one or more options',
+  en: 'Select one or more options',
   'zh-CN': '请选择一个或多个选项',
   'zh-HK': '請選擇一個或多個選項',
 };
 
 export const datePickerPlaceholder = {
   type: 'i18n',
-  'en': 'Select a date',
+  en: 'Select a date',
   'zh-CN': '请选择日期',
   'zh-HK': '請選擇日期',
 };
 
 export const timePickerPlaceholder = {
   type: 'i18n',
-  'en': 'Select a time',
+  en: 'Select a time',
   'zh-CN': '请选择时间',
   'zh-HK': '請選擇時間',
 };

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

@@ -16,6 +16,20 @@ type UiSchema = {
   'x-validator'?: string;
   'x-display'?: 'visible' | 'hidden' | 'none';
   'x-pattern'?: 'editable' | 'disabled' | 'readPretty';
+  'x-data-source'?: {
+    sourceType?: string;
+    type?: string;
+    options?: Array<{ 
+      id?: string;
+      label: string | any; // 支持字符串或多语言对象
+      value: string;
+      color?: string;
+    }>;
+    labelField?: string;
+    valueField?: string;
+    dataSource?: any;
+    extraParams?: Record<string, any>;
+  };
   type: 'string' | 'number' | 'boolean' | 'array' | 'object';
 };
 
@@ -135,7 +149,6 @@ export const createFormItemSchema = (
     'x-display': xDisplay,
     type,
   } = uiSchema;
-
   let cptTitle = undefined;
 
   // 根据 x-pattern 和 x-display 确定 renderMode
@@ -290,14 +303,20 @@ export const createFormItemSchema = (
     componentName = 'Translation';
   }
 
+  // 获取选项配置
+  const dataSourceConfig = (uiSchema as any)?.['x-data-source'];
+  
   if (
     ['Select', 'Radio.Group', 'Checkbox.Group'].includes(xComponent) &&
-    uiSchema?.enum?.length > 0
+    (uiSchema?.enum?.length > 0 || dataSourceConfig)
   ) {
     if (['Radio.Group', 'Checkbox.Group'].includes(xComponent)) {
       props.direction = 'horizontal';
       props.placeholder = "";
     } else {
+      if (type === 'array') {
+        props.mode = 'multiple';
+      }
       props.styleType = 'antd';
       props.showSearch = true;
       props.optionFilterProp = 'label';
@@ -319,8 +338,53 @@ export const createFormItemSchema = (
         };
       }
     }
-    props.optionSourceType = 'default';
-    props.options = uiSchema?.enum || [];
+    
+    // 统一的选项配置处理
+    const optionConfig = dataSourceConfig || {};
+    
+    // 设置 optionSourceType
+    props.optionSourceType = optionConfig?.type || 'default';
+    
+    // 根据 sourceType 设置不同的配置
+    if (props.optionSourceType === 'default') {
+      // 优先使用 optionConfig.options，其次兼容旧的 enum 格式
+      const rawOptions = optionConfig.options || uiSchema?.enum || [];
+      
+      // 转换多语言格式的 label 为组件可识别的 i18n 格式
+      props.options = rawOptions.map((option: any) => {
+        const label = option.label;
+        
+        // 如果 label 是多语言对象格式，转换为 i18n 格式
+        if (label && typeof label === 'object' && !label.type) {
+          return {
+            ...option,
+            label: {
+              type: 'i18n',
+              'en': label.en || label.original || '',
+              'zh-CN': label['zh-CN'] || label.original || '',
+              'zh-HK': label['zh-HK'] || label.original || '',
+            }
+          };
+        }
+        
+        // 如果已经是 i18n 格式或者是字符串，直接返回
+        return option;
+      });
+    } else if (props.optionSourceType === 'api') {
+      // API 类型需要设置 labelField 和 valueField
+      if (optionConfig?.labelField) {
+        props.labelField = optionConfig.labelField;
+      }
+      if (optionConfig?.valueField) {
+        props.valueField = optionConfig.valueField;
+      }
+      if (optionConfig?.dataSource) {
+        props.dataSource = optionConfig.dataSource;
+      }
+      if (optionConfig?.extraParams) {
+        props.extraParams = optionConfig.extraParams;
+      }
+    }
   }
 
   if (xComponent === 'TimePicker') {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pisell/materials",
-  "version": "1.8.12",
+  "version": "1.8.13",
   "main": "./lib/index.js",
   "module": "./es/index.js",
   "types": "./lib/index.d.ts",
@@ -93,8 +93,8 @@
     "antd-mobile": "^5.38.1",
     "vod-js-sdk-v6": "^1.4.11",
     "@pisell/date-picker": "3.0.8",
-    "@pisell/utils": "3.0.2",
-    "@pisell/icon": "0.0.11"
+    "@pisell/icon": "0.0.11",
+    "@pisell/utils": "3.0.2"
   },
   "peerDependencies": {
     "react": "^18.0.0",