cloud-web-corejs 1.0.54-dev.702 → 1.0.54-dev.704

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/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/views/bd/setting/formVersion/ftHistoryDialog.vue

@@ -90,6 +90,76 @@
                         <el-input v-model="formData.remark" clearable />
                       </template>
                     </vxe-form-item>
+                    <vxe-form-item :title="$t1('创建人') + ':'">
+                      <template v-slot>
+                        <el-input
+                          v-model="formData.createBy"
+                          size="small"
+                          clearable
+                        />
+                      </template>
+                    </vxe-form-item>
+                    <vxe-form-item :title="$t1('更新人') + ':'">
+                      <template v-slot>
+                        <el-input
+                          v-model="formData.modifyBy"
+                          size="small"
+                          clearable
+                        />
+                      </template>
+                    </vxe-form-item>
+                    <vxe-form-item title="创建时间:">
+                      <template v-slot>
+                        <el-date-picker
+                          v-model="formData.startCreateDate"
+                          type="datetime"
+                          placeholder=""
+                          size="small"
+                          clearable
+                          value-format="yyyy-MM-dd HH:mm:ss"
+                          :picker-options="$baseStartPickerOptions(formData.endCreateDate)"
+                        ></el-date-picker>
+                        <span>-</span>
+                        <el-date-picker
+                          v-model="formData.endCreateDate"
+                          type="datetime"
+                          placeholder=""
+                          size="small"
+                          clearable
+                          value-format="yyyy-MM-dd HH:mm:ss"
+                          default-time="23:59:59"
+                          :picker-options="
+                            $baseEndPickerOptions(formData.startCreateDate)
+                          "
+                        ></el-date-picker>
+                      </template>
+                    </vxe-form-item>
+                    <vxe-form-item title="更新时间:">
+                      <template v-slot>
+                        <el-date-picker
+                          v-model="formData.startModifyDate"
+                          type="datetime"
+                          placeholder=""
+                          size="small"
+                          clearable
+                          value-format="yyyy-MM-dd HH:mm:ss"
+                          :picker-options="$baseStartPickerOptions(formData.endModifyDate)"
+                        ></el-date-picker>
+                        <span>-</span>
+                        <el-date-picker
+                          v-model="formData.endModifyDate"
+                          type="datetime"
+                          placeholder=""
+                          size="small"
+                          clearable
+                          value-format="yyyy-MM-dd HH:mm:ss"
+                          default-time="23:59:59"
+                          :picker-options="
+                            $baseEndPickerOptions(formData.startModifyDate)
+                          "
+                        ></el-date-picker>
+                      </template>
+                    </vxe-form-item>
                   </vxe-form>
                 </template>
               </vxe-grid>
@@ -135,10 +205,13 @@ export default {
   components: {
     formDesignerDialog: () =>
       import("@base/views/bd/setting/form_template/formDesignerDialog.vue"),
-    compareDialog: () => import("@base/views/bd/setting/formVersion/compareDialog.vue"),
-    FormTemplateEdit: () => import("@base/views/bd/setting/form_template/edit.vue"),
+    compareDialog: () =>
+      import("@base/views/bd/setting/formVersion/compareDialog.vue"),
+    FormTemplateEdit: () =>
+      import("@base/views/bd/setting/form_template/edit.vue"),
     FormScriptEdit: () => import("@base/views/bd/setting/form_script/edit.vue"),
-    FormScriptEdit1: () => import("@base/views/bd/setting/form_script/edit1.vue"),
+    FormScriptEdit1: () =>
+      import("@base/views/bd/setting/form_script/edit1.vue"),
     SzTaMbEdit: () => import("@base/views/bd/setting/table_model/edit.vue"),
   },
   created() {
@@ -187,13 +260,14 @@ export default {
   },
   methods: {
     getCompareData(row1, row2, callback) {
-      Promise.all([this.getFormVersion(row1.id), this.getFormVersion(row2.id)]).then(
-        (res) => {
-          let compareHData1 = res[0].objx;
-          let compareHData2 = res[1].objx;
-          callback && callback(compareHData1, compareHData2);
-        }
-      );
+      Promise.all([
+        this.getFormVersion(row1.id),
+        this.getFormVersion(row2.id),
+      ]).then((res) => {
+        let compareHData1 = res[0].objx;
+        let compareHData2 = res[1].objx;
+        callback && callback(compareHData1, compareHData2);
+      });
     },
     getFormVersion(id) {
       return this.$http({
@@ -284,7 +358,7 @@ export default {
             title: this.$t1("创建人"),
             field: "_createBy",
             width: 150,
-          },  
+          },
           {
             title: this.$t1("创建时间"),
             field: "createDate",