@pisell/materials 6.11.54 → 6.11.55

package/lib/locales/zh-CN.d.ts

@@ -385,6 +385,7 @@ declare const _default: {
     'pisell-record-view-unavailable': string;
     'pisell-data-source-form-required-message': string;
     'pisell-data-source-form-scope-message': string;
+    'pisell-data-source-form-scene-request-id-message': string;
     'pisell-data-source-form-email-message': string;
     'pisell-data-source-form-domain-message': string;
     'pisell-data-source-form-url-message': string;

package/lib/locales/zh-CN.js

@@ -428,6 +428,7 @@ var zh_CN_default = {
   "pisell-record-view-unavailable": "不可用",
   "pisell-data-source-form-required-message": "该字段为必填项",
   "pisell-data-source-form-scope-message": "未指定设置的scope参数",
+  "pisell-data-source-form-scene-request-id-message": "未指定设备设置的 sceneRequestId",
   "pisell-data-source-form-email-message": "请输入有效的电子邮件地址",
   "pisell-data-source-form-domain-message": "请输入有效的域名",
   "pisell-data-source-form-url-message": "请输入正确的网址",

package/lib/locales/zh-TW.d.ts

@@ -385,6 +385,7 @@ declare const _default: {
     'pisell-record-view-unavailable': string;
     'pisell-data-source-form-required-message': string;
     'pisell-data-source-form-scope-message': string;
+    'pisell-data-source-form-scene-request-id-message': string;
     'pisell-data-source-form-email-message': string;
     'pisell-data-source-form-domain-message': string;
     'pisell-data-source-form-url-message': string;

package/lib/locales/zh-TW.js

@@ -429,6 +429,7 @@ var zh_TW_default = {
   "pisell-record-view-unavailable": "不可用",
   "pisell-data-source-form-required-message": "該字段為必填項",
   "pisell-data-source-form-scope-message": "未指定設置的scope參數",
+  "pisell-data-source-form-scene-request-id-message": "未指定設備設置的 sceneRequestId",
   "pisell-data-source-form-email-message": "請輸入有效的電子郵件地址",
   "pisell-data-source-form-domain-message": "請輸入有效的域名",
   "pisell-data-source-form-url-message": "請輸入正確的網址",

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

@@ -117,29 +117,30 @@ const dataSourceForm: MetaType = {
                 
                 if (hasGroupInfo) {
                   // 按group分组
-                  const groupedFields = new Map<string, { groupTitle: string; items: any[] }>();
+                  const groupedFields = new Map<string, { groupTitle: any; groupDescription: any; items: any[] }>();
                   
                   value.item.fields.forEach((field: any) => {
                     const groupId = field._groupId;
                     if (!groupedFields.has(groupId)) {
                       groupedFields.set(groupId, {
                         groupTitle: field._groupTitle,
+                        groupDescription: field._groupDescription,
                         items: []
                       });
                     }
                     // 移除group标记，避免污染
-                    const { _groupId, _groupTitle, ...cleanField } = field;
+                    const { _groupId, _groupTitle, _groupDescription, ...cleanField } = field;
                     groupedFields.get(groupId)!.items.push(cleanField);
                   });
                   
                   // 为每个group创建一个FormGroup
-                  groupedFields.forEach(({ groupTitle, items }) => {
+                  groupedFields.forEach(({ groupTitle, groupDescription, items }) => {
                     const childrenSchemas = fields2ChildrenSchemas(
                       items,
                       target.getProps().getPropValue('renderMode')
                     );
                     formGroupSchemas.push(
-                      createFormGroup(childrenSchemas, groupTitle)
+                      createFormGroup(childrenSchemas, groupTitle, groupDescription)
                     );
                   });
                 } else {
@@ -206,6 +207,49 @@ const dataSourceForm: MetaType = {
             },
           },
         },
+        {
+          name: 'scene',
+          title: {
+            label: {
+              type: 'i18n',
+              'en-US': 'Scene',
+              'zh-CN': '场景',
+            },
+            tip: {
+              type: 'i18n',
+              'en-US': 'Only support: template, profile, instance',
+              'zh-CN': '仅支持: template, profile, instance',
+            }
+          },
+          defaultValue: {
+            "type": "JSExpression",
+            "value": "this.props?.scene",
+          },
+          condition(target: any) {
+            return !!target.getProps().getPropValue('dataSource')?.fromDeviceSettingMeta;
+          },
+          setter: 'StringSetter',
+          supportVariable: true,
+        },
+        {
+          name: 'sceneRequestId',
+          title: {
+            label: {
+              type: 'i18n',
+              'en-US': 'Scene request id',
+              'zh-CN': '场景请求 ID',
+            },
+          },
+          defaultValue: {
+            "type": "JSExpression",
+            "value": "this.props?.sceneRequestId"
+          },
+          condition(target: any) {
+            return !!target.getProps().getPropValue('dataSource')?.fromDeviceSettingMeta;
+          },
+          setter: 'StringSetter',
+          supportVariable: true,
+        },
         {
           title: '字段',
           display: 'entry',
@@ -1055,6 +1099,11 @@ const dataSourceForm: MetaType = {
           template:
             "onDataSourceFinish(values,result,${extParams}){\n// 数据源提交成功\nconsole.log('onDataSourceFinish',values,result);}",
         },
+        {
+          name: 'onDataSourceLoaded',
+          template:
+            "onDataSourceLoaded(values,rawResult,${extParams}){\n// 数据源加载完成\nconsole.log('onDataSourceLoaded',values,rawResult);}",
+        }
       ],
     },
     advanced: {

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

@@ -35,14 +35,48 @@ type UiSchema = {
   type: 'string' | 'number' | 'integer' | 'boolean' | 'array' | 'object';
 };
 
+/**
+ * 将 MultiLanguageText 对象转为平台可解析的 i18n 格式
+ * MultiLanguageText: { en, 'zh-CN', 'zh-HK', ja, pt, original }
+ * i18n 格式:         { type: 'i18n', en, 'zh-CN', 'zh-HK', ... }
+ *
+ * 规则:
+ * - 所有语言字段(含 original)均为空 → 返回 ''，避免低代码 i18n 图标被误亮
+ * - 仅有 original 有值，其它翻译为空 → 返回纯字符串 original，正常显示但不绑定 i18n
+ * - 有任意真实翻译 → 返回 i18n 对象，缺失的语言用 original 兜底
+ */
+const I18N_LANG_KEYS = ['en', 'zh-CN', 'zh-HK', 'ja', 'pt'];
+
+const toI18nProp = (value: any): any => {
+  if (!value) return value;
+  if (typeof value === 'string') return value;
+  if (typeof value === 'object' && value.type === 'i18n') return value;
+  if (typeof value === 'object') {
+    const original = value.original || '';
+    const hasRealTranslation = I18N_LANG_KEYS.some((key) => !!value[key]);
+
+    if (!hasRealTranslation) {
+      return original;
+    }
+
+    const i18nResult: Record<string, any> = { type: 'i18n' };
+    I18N_LANG_KEYS.forEach((key) => {
+      i18nResult[key] = value[key] || original || '';
+    });
+    return i18nResult;
+  }
+  return value;
+};
+
 // 创建表单组
-export const createFormGroup = (children: any[], groupTitle?: string) => {
+export const createFormGroup = (children: any[], groupTitle?: any, groupDescription?: any) => {
   return {
     children,
     componentName: 'FormGroup',
     title: '分组',
     props: {
-      title: groupTitle || 'Group',
+      title: toI18nProp(groupTitle) || 'Group',
+      description: toI18nProp(groupDescription) || '',
       showTitle: true,
       showDescription: true,
       showBackgroundColor: true,
@@ -150,8 +184,9 @@ export const createFormItemSchema = (
     'x-component-props': xProps,
     'x-pattern': xPattern,
     'x-display': xDisplay,
+    'x-description': xDescription,
     type,
-  } = uiSchema;
+  } = uiSchema as any;
   let cptTitle = undefined;
 
   // 根据 x-pattern 和 x-display 确定 renderMode
@@ -185,7 +220,7 @@ export const createFormItemSchema = (
   // 构建 props: 先设置默认值，再用 x-component-props 覆盖，最后设置 renderMode
   let props: Record<string, any> = {
     // 默认值
-    label: title,
+    label: toI18nProp(title),
     name,
     allowClear: true,
     placeholder: {
@@ -198,6 +233,8 @@ export const createFormItemSchema = (
     ...xProps,
     // renderMode 最终计算结果（综合了所有来源）
     renderMode,
+    // 辅助说明文字（来自 registry item 的 description），转为 i18n 格式
+    ...(xDescription ? { extra: toI18nProp(xDescription) } : {}),
   };
   
   // 如果 x-component-props 中存在 required 字段，额外添加 requiredobj
@@ -733,7 +770,8 @@ export const getDataSourceVariables = (target: any) => {
 };
 
 export const getCurrentValueVariables = (target: any) => {
-  if (target?.getProps()?.getPropValue('_variables')?.dataSourceValue?.fromSettingMeta) {
+  const ds = target?.getProps()?.getPropValue('_variables')?.dataSourceValue;
+  if (ds?.fromSettingMeta || ds?.fromDeviceSettingMeta) {
     return [];
   }
   

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

@@ -81,60 +81,66 @@ const dataSourceTable = {
                 return target.getProps().setPropValue('dataSource', '');
               }
 
+              const setBatchVariablesFunc = () => {
+                setBatchVariables(target, [
+                  {
+                    label: 'currentFields',
+                    value: value.item.fields,
+                  },
+                  {
+                    label: 'dataSourceVariables',
+                    value: [
+                      {
+                        label: '当前数据表',
+                        value: genDataSourceValueKey(target, 'currentDataSource'),
+                        item: value.item,
+                        isVariable: true,
+                      },
+                    ],
+                  },
+                  {
+                    label: 'dataSourceTitle',
+                    value: value.title,
+                  },
+                  {
+                    label: 'currentValueVariables',
+                    value: [
+                      {
+                        label: '当前行数据',
+                        value: genDataSourceValueKey(target, 'currentRecord'),
+                      },
+                    ],
+                  },
+                ]);
+              }
+
+              setBatchVariablesFunc();
+
               // 如果重新选择选择数据源，则清空表格
               if (value.isSelect) {
                 resetTableProps(target);
-              }
 
-              const columns = fields2Columns(value.item.fields);
+                setBatchVariablesFunc();
 
-              target.getProps().setPropValue('columns', columns);
-              target.getProps().setPropValue('title', value.title);
+                const columns = fields2Columns(value.item.fields);
 
-              setBatchVariables(target, [
-                {
-                  label: 'currentFields',
-                  value: value.item.fields,
-                },
-                {
-                  label: 'dataSourceVariables',
-                  value: [
-                    {
-                      label: '当前数据表',
-                      value: genDataSourceValueKey(target, 'currentDataSource'),
-                      item: value.item,
-                      isVariable: true,
-                    },
-                  ],
-                },
-                {
-                  label: 'dataSourceTitle',
-                  value: value.title,
-                },
-                {
-                  label: 'currentValueVariables',
-                  value: [
-                    {
-                      label: '当前行数据',
-                      value: genDataSourceValueKey(target, 'currentRecord'),
-                    },
-                  ],
-                },
-              ]);
+                target.getProps().setPropValue('columns', columns);
+                target.getProps().setPropValue('title', value.title);
 
-              // 生成默认操作列和标题行按钮
-              setDefaultOperationAndTitleButtons(target);
+                // 生成默认操作列和标题行按钮
+                setDefaultOperationAndTitleButtons(target);
 
-              if (
-                !['pisell2-api', 'mypisell-api'].includes(
-                  value.item.headerDataSource
-                )
-              ) {
-                // 生成默认搜索筛选
-                setDefaultSearchFilter(target, value.item.fields);
+                if (
+                  !['pisell2-api', 'mypisell-api'].includes(
+                    value.item.headerDataSource
+                  )
+                ) {
+                  // 生成默认搜索筛选
+                  setDefaultSearchFilter(target, value.item.fields);
 
-                // 生成默认排序
-                setDefaultSort(target, value.item.fields);
+                  // 生成默认排序
+                  setDefaultSort(target, value.item.fields);
+                }
               }
 
               return target.getProps().setPropValue('dataSource', value.item);

package/lowcode/pisell-record-board-calendar-view/meta.ts

@@ -9,7 +9,7 @@ const PisellRecordBoardCalendarViewMeta: ComponentMetadata = {
   "devMode": "proCode",
   "npm": {
     "package": "@pisell/materials",
-    "version": "6.11.52",
+    "version": "6.11.54",
     "exportName": "PisellRecordBoardCalendarView",
     "main": "src/index.tsx",
     "destructuring": true,

package/package.json

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