cloud-web-corejs 1.0.54-dev.703 → 1.0.54-dev.705

package/src/components/xform/form-render/container-item/dynamicFieldMixin.js

@@ -1,6 +1,7 @@
 import { generateId } from "../../../../components/xform/utils/util";
 import {
   buildDynamicSchemaRequestData,
+  extractDynamicSchemaItems,
   getDynamicSchemaOption,
   normalizeDynamicFieldKey,
   resolveDynamicSchemaResponse,
@@ -10,7 +11,7 @@ import {
  * 表格布局容器(table/h5-table)专用混入。
  *
  * 提供两类「布局表格」特有能力(动态字段状态控制已统一收敛到表单设置，见 formDynamicFieldMixin)：
- *  1. 后台字段定义(dynamicSchemaEnabled)：字段定义由后台查询下发，运行时生成并插入到行布局中。
+ *  1. 动态字段(dynamicSchemaSourceType)：字段定义由脚本或接口下发，运行时生成并插入到行布局中。
  *  2. 行折叠(默认行为)：整行字段均隐藏时折叠该行(响应式，随字段显隐自动更新)。
  *
  * 依赖宿主组件已混入：containerItemMixin(formModel/formHttp/handleCustomEvent/designState)
@@ -67,23 +68,102 @@ const dynamicFieldMixin = {
     },
 
     /* ------------------- 后台字段定义模式(行布局容器) ------------------- */
+    getDynamicSchemaSourceType() {
+      const options = this.widget.options || {};
+      const sourceType = getDynamicSchemaOption(options, "sourceType");
+      if (sourceType) {
+        return sourceType;
+      }
+      // 兼容旧配置：dynamicSchemaEnabled
+      if (options.dynamicSchemaEnabled) {
+        return "api";
+      }
+      return "none";
+    },
+
+    resolveShouldInitDynamicSchema() {
+      const source = this.getDynamicSchemaSourceType();
+      if (source === "none") {
+        return Promise.resolve(false);
+      }
+      const options = this.widget.options;
+      if (source === "api" && !getDynamicSchemaOption(options, "scriptCode")) {
+        return Promise.resolve(false);
+      }
+      if (source === "script" && !getDynamicSchemaOption(options, "frontendScript")) {
+        return Promise.resolve(false);
+      }
+      const script = getDynamicSchemaOption(options, "loadScript");
+      if (!script) {
+        return Promise.resolve(true);
+      }
+      const formRef = this.getFormRef();
+      if (!formRef || formRef.designState) {
+        return Promise.resolve(false);
+      }
+      try {
+        const result = this.handleCustomEvent(script);
+        if (result === false || result === null) {
+          return Promise.resolve(false);
+        }
+        return Promise.resolve(true);
+      } catch (e) {
+        return Promise.resolve(false);
+      }
+    },
+
     initDynamicSchema() {
       if (this.designState || !this.widget) return;
-      const options = this.widget.options || {};
-      if (!options.dynamicSchemaEnabled || !this.supportsRowLayout()) return;
+      if (!this.supportsRowLayout()) return;
+      if (this.getDynamicSchemaSourceType() === "none") return;
       this.$nextTick(() => {
-        this.loadDynamicSchema();
+        this.resolveShouldInitDynamicSchema().then((shouldInit) => {
+          if (shouldInit) {
+            this.loadDynamicSchema();
+          }
+        });
       });
     },
 
     loadDynamicSchema() {
+      if (this.designState || !this.supportsRowLayout()) {
+        return Promise.resolve();
+      }
+      const source = this.getDynamicSchemaSourceType();
+      if (source === "script") {
+        return this.loadDynamicSchemaFromScript();
+      }
+      if (source === "api") {
+        return this.loadDynamicSchemaFromApi();
+      }
+      return Promise.resolve();
+    },
+
+    loadDynamicSchemaFromScript() {
+      const script = getDynamicSchemaOption(this.widget.options, "frontendScript");
+      if (!script) {
+        return Promise.resolve();
+      }
+      try {
+        const result = this.handleCustomEvent(script);
+        const defs = this.normalizeSchemaScriptResult(result);
+        this.buildDynamicRows(defs);
+        return Promise.resolve();
+      } catch (e) {
+        return Promise.resolve();
+      }
+    },
+
+    normalizeSchemaScriptResult(result) {
+      if (result === null || result === undefined) {
+        return [];
+      }
+      return extractDynamicSchemaItems(result);
+    },
+
+    loadDynamicSchemaFromApi() {
       const options = this.widget.options;
-      if (
-        this.designState
-        || !options.dynamicSchemaEnabled
-        || !getDynamicSchemaOption(options, "scriptCode")
-        || !this.supportsRowLayout()
-      ) {
+      if (!getDynamicSchemaOption(options, "scriptCode")) {
         return Promise.resolve();
       }
       const requestData = buildDynamicSchemaRequestData(

package/src/components/xform/form-render/container-item/sub-form-item.vue

@@ -17,14 +17,22 @@
             <span v-if="!!subWidget.options.labelIconClass" class="custom-label">
               <template v-if="subWidget.options.labelIconPosition === 'front'">
                 <template v-if="!!subWidget.options.labelTooltip">
-                  <el-tooltip :content="subWidget.options.labelTooltip" effect="light">
+                  <el-tooltip
+                    :content="subWidget.options.labelTooltip"
+                    effect="light"
+                    popper-class="label-tooltip-pre-line"
+                  >
                     <i :class="subWidget.options.labelIconClass"></i></el-tooltip>{{subWidget.options.label}}</template>
                 <template v-else>
                   <i :class="subWidget.options.labelIconClass"></i>{{subWidget.options.label}}</template>
               </template>
               <template v-else-if="subWidget.options.labelIconPosition === 'rear'">
                 <template v-if="!!subWidget.options.labelTooltip">
-                  {{subWidget.options.label}}<el-tooltip :content="subWidget.options.labelTooltip" effect="light">
+                  {{subWidget.options.label}}<el-tooltip
+                    :content="subWidget.options.labelTooltip"
+                    effect="light"
+                    popper-class="label-tooltip-pre-line"
+                  >
                   <i :class="subWidget.options.labelIconClass"></i></el-tooltip></template>
                 <template v-else>
                   {{subWidget.options.label}}<i :class="subWidget.options.labelIconClass"></i></template>

package/src/components/xform/utils/dynamicSchemaUtil.js

@@ -50,6 +50,9 @@ export const DYNAMIC_SCHEMA_OPTION_KEYS = {
   scriptParam: ["dynamicSchemaScriptParam", "dynamicColumnScriptParam"],
   convert: ["dynamicSchemaConvert"],
   mode: ["dynamicSchemaMode", "dynamicColumnMode"],
+  sourceType: ["dynamicSchemaSourceType", "dynamicColumnSourceType"],
+  loadScript: ["dynamicSchemaLoadScript", "dynamicColumnLoadScript"],
+  frontendScript: ["dynamicSchemaScript", "dynamicColumnsScript"],
 };
 
 export const widgetTypeToEditFormatMap = {

package/src/components/xform/utils/sfc-generator.js

@@ -389,12 +389,12 @@ export function buildFieldWidget(widget, formConfig) {
   let customLabelDom =
 `<template #label><span class="custom-label">${wop.labelIconPosition === 'front' ?
   (!!wop.labelTooltip ?
-      `<el-tooltip content="${wop.labelTooltip}" effect="light"><i class="${wop.labelIconClass}"></i></el-tooltip>${wop.label}` :
+      `<el-tooltip content="${wop.labelTooltip}" effect="light" popper-class="label-tooltip-pre-line"><i class="${wop.labelIconClass}"></i></el-tooltip>${wop.label}` :
       `<i class="${wop.labelIconClass}"></i>${wop.label}`
   )
   :
   (!!wop.labelTooltip ?
-      `${wop.label}<el-tooltip content="${wop.labelTooltip}" effect="light"><i class="${wop.labelIconClass}"></i></el-tooltip>` :
+      `${wop.label}<el-tooltip content="${wop.labelTooltip}" effect="light" popper-class="label-tooltip-pre-line"><i class="${wop.labelIconClass}"></i></el-tooltip>` :
       `${wop.label}<i class="${wop.labelIconClass}"></i>`
   )
 }

package/src/components/xform/utils/tableColumnHelper.js

@@ -63,6 +63,24 @@ export function resolveColumnRequiredFlag(columnConfig) {
   return !!(widgetOptions?.required || editWidgetOptions?.required);
 }
 
+function buildVxeTitlePrefixTooltip(tooltip) {
+  if (!tooltip) {
+    return {};
+  }
+  if (/\r?\n/.test(tooltip)) {
+    return {
+      content: tooltip
+        .replace(/&/g, "&")
+        .replace(/</g, "&lt;")
+        .replace(/>/g, "&gt;")
+        .replace(/\r\n/g, "\n")
+        .replace(/\n/g, "<br/>"),
+      useHTML: true,
+    };
+  }
+  return { content: tooltip };
+}
+
 export function applyColumnLabelIcon(col, columnConfig) {
   if (!col || !columnConfig) {
     return col;
@@ -86,7 +104,12 @@ export function applyColumnLabelIcon(col, columnConfig) {
     return h(
       "el-tooltip",
       {
-        props: { content: tooltip, effect: "dark", placement: "top" },
+        props: {
+          content: tooltip,
+          effect: "dark",
+          placement: "top",
+          popperClass: "label-tooltip-pre-line",
+        },
       },
       [icon]
     );
@@ -95,7 +118,7 @@ export function applyColumnLabelIcon(col, columnConfig) {
   if (iconClass && position === "front" && !required) {
     col.titlePrefix = {
       icon: iconClass,
-      ...(tooltip ? { content: tooltip } : {}),
+      ...buildVxeTitlePrefixTooltip(tooltip),
     };
     return col;
   }