fix: 修复 i18n schema 解析错误

knight.chen · knight.chen · commit f6648c6de53d · 2023-03-22T00:52:00.000+08:00
diff --git a/packages/vue-renderer/package.json b/packages/vue-renderer/package.json
@@ -3,7 +3,7 @@
   "main": "./dist/vue-renderer.js",
   "module": "./dist/vue-renderer.mjs",
   "typings": "./dist/vue-renderer.d.ts",
-  "version": "1.6.0-beta.6",
+  "version": "1.6.0-beta.7",
   "keywords": [
     "vue",
     "lowcode",
diff --git a/packages/vue-renderer/src/core/use.ts b/packages/vue-renderer/src/core/use.ts
@@ -57,7 +57,6 @@ import {
   isNil,
   isString,
   isFunction,
-  isDOMText,
   isJSExpression,
   isNodeSchema,
   isObject,
@@ -144,20 +143,13 @@ export type RenderComponent = (
 ) => VNode | VNode[] | null;
 
 export type SlotSchemaMap = {
-  [x: string]: SlotSchema | NodeData | NodeData[] | undefined;
+  [x: string]: unknown;
 };
 
 export type PropSchemaMap = {
   [x: string]: unknown;
 };
 
-export function isNodeData(val: unknown): val is NodeData | NodeData[] {
-  if (isArray(val)) {
-    return val.every((item) => isNodeData(item));
-  }
-  return isDOMText(val) || isNodeSchema(val) || isJSExpression(val);
-}
-
 export function isVueComponent(val: unknown): val is Component {
   if (isFunction(val)) return true;
   if (isObject(val) && ('render' in val || 'setup' in val)) {
@@ -238,11 +230,8 @@ export function useLeaf(
     // 若 schema 不为 NodeSchema，则直接渲染
     if (isString(schema)) {
       return createTextVNode(schema);
-    } else if (isJSExpression(schema)) {
-      const result = parser.parseExpression(schema, scope);
-      return createTextVNode(toDisplayString(result));
-    } else if (isI18nData(schema)) {
-      const result = parser.parseI18n(schema, scope);
+    } else if (!isNodeSchema(schema)) {
+      const result = parser.parseSchema(schema, scope);
       return createTextVNode(toDisplayString(result));
     }
 
@@ -422,7 +411,7 @@ export function useLeaf(
           };
         }
       } else {
-        renderSlot = () => ensureArray(renderComp(slotSchema, blockScope));
+        renderSlot = () => ensureArray(renderComp(slotSchema as NodeData, blockScope));
       }
 
       prev[next] =
@@ -451,6 +440,8 @@ export function useLeaf(
     if (isJSExpression(schema) || isJSFunction(schema)) {
       // 处理表达式和函数
       return parser.parseExpression(schema, scope);
+    } else if (isI18nData(schema)) {
+      return parser.parseI18n(schema, scope);
     } else if (isJSSlot(schema)) {
       // 处理属性插槽
       let slotParams: string[];
@@ -832,9 +823,9 @@ export const buildSchema = (schema: NodeSchema, node?: Node | null) => {
     } else if (key === 'className') {
       // 适配 react className
       normalProps.class = val;
-    } else if (key === 'children' && isNodeData(val)) {
+    } else if (key === 'children') {
       // 处理属性中的默认插槽，属性的重默认插槽会覆盖节点 chilren 插槽
-      slotProps.default = ensureArray(val);
+      slotProps.default = val;
     } else {
       // 处理普通属性
       normalProps[key] = val;
diff --git a/packages/vue-simulator-renderer/package.json b/packages/vue-simulator-renderer/package.json
@@ -3,7 +3,7 @@
   "main": "./dist/vue-simulator-renderer.js",
   "module": "./dist/vue-simulator-renderer.mjs",
   "typings": "./dist/vue-simulator-renderer.d.ts",
-  "version": "1.6.0-beta.6",
+  "version": "1.6.0-beta.7",
   "keywords": [
     "vue",
     "lowcode",
diff --git a/packages/vue-simulator-renderer/src/simulator-view.ts b/packages/vue-simulator-renderer/src/simulator-view.ts
@@ -58,8 +58,6 @@ export const Renderer = defineComponent({
     const { schema, scope, messages } = documentInstance;
     const { designMode, device, locale, components } = simulator;
 
-    if (!simulator.autoRender) return null;
-
     return h(Suspense, null, {
       default: () =>
         h(LowCodeRenderer, {
diff --git a/packages/vue-simulator-renderer/src/simulator.ts b/packages/vue-simulator-renderer/src/simulator.ts
@@ -257,6 +257,7 @@ function createSimulatorRenderer() {
     config: markRaw(config),
     layout,
     device,
+    locale,
     designMode,
     libraryMap,
     components,
