cloud-web-corejs 1.0.54-dev.793 → 1.0.54-dev.795

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "cloud-web-corejs",
   "private": false,
-  "version": "1.0.54-dev.793",
+  "version": "1.0.54-dev.795",
   "scripts": {
     "dev": "vue-cli-service serve",
     "dev:micro": "vue-cli-service serve --port 17527",

package/src/components/xform/form-designer/form-widget/dialog/fileReferenceDialog.vue

@@ -296,7 +296,7 @@ export default {
           outline: none;
 
           &.detail-wrap .d-cont {
-            height: calc(100vh - 150px);
+            //height: calc(100vh - 150px);
 
             .title .field-wrapper {
               display: inline-block !important

package/src/components/xform/form-designer/form-widget/dialog/formDialog.vue

@@ -328,7 +328,7 @@ export default {
         ::v-deep .grid-container {
           outline: none;
           &.detail-wrap .d-cont {
-            height: calc(100vh - 150px);
+            //height: calc(100vh - 150px);
             .title .field-wrapper {
               display: inline-block !important;
             }

package/src/components/xform/form-designer/form-widget/dialog/formDrawer.vue

@@ -283,7 +283,7 @@ export default {
           outline: none;
 
           &.detail-wrap .d-cont {
-            height: calc(100vh - 150px);
+            //height: calc(100vh - 150px);
 
             .title .field-wrapper {
               display: inline-block !important

package/src/components/xform/form-designer/form-widget/field-widget/date-widget.vue

@@ -9,7 +9,7 @@
                     :clearable="field.options.clearable" :editable="field.options.editable"
                     :format="field.options.format" :value-format="field.options.valueFormat"
                     :placeholder="getI18nLabel(field.options.placeholder || '选择日期')"
-                    @focus="handleFocusCustomEvent" @blur="handleBlurCustomEvent"
+                    @focus="handleDateFocusEvent" @blur="handleBlurCustomEvent"
                     @change="handleDateChangeEvent"
                     :picker-options="pickerOptions"
     >
@@ -91,6 +91,9 @@ export default {
     "field.options.maxDate"() {
       this.initDateLimitPickerOptions();
     },
+    "field.options.minDateType"() {
+      this.initDateLimitPickerOptions();
+    },
   },
   beforeCreate() {
     /* 这里不能访问方法和属性！！ */
@@ -99,7 +102,7 @@ export default {
   created() {
     /* 注意：子组件mounted在父组件created之后、父组件mounted之前触发，故子组件mounted需要用到的prop
        需要在父组件created中初始化！！ */
-    this.initFieldModel()
+    this.initDateFieldModel()
     this.registerToRefList()
     this.initEventHandler()
     this.buildFieldRules()
@@ -118,6 +121,13 @@ export default {
   },
 
   methods: {
+    handleDateFocusEvent(event) {
+      /* 最小日期为「当前时间」时，每次展开面板都需按当前时刻重新计算 */
+      if (this.isNowDateValueType(this.field.options.minDateType)) {
+        this.initDateLimitPickerOptions();
+      }
+      this.handleFocusCustomEvent(event);
+    },
     handleDateChangeEvent(value) {
       if (this.isDateLimitViolated(value)) {
         this.$message.warning(this.getDateLimitViolationMessage());
@@ -128,6 +138,16 @@ export default {
     },
     setNow() {
       this.$refs.fieldEditor.panel.changeToNow()
+    },
+    refreshDefaultValue() {
+      if (this.designState !== true) {
+        return
+      }
+      if (this.isNowDateValueType(this.field.options.defaultValueType)) {
+        this.fieldModel = this.getNowDateValue()
+      } else if (this.field.options.defaultValue !== undefined) {
+        this.fieldModel = this.field.options.defaultValue
+      }
     }
   }
 }

package/src/components/xform/form-designer/form-widget/field-widget/mixins/date-limit-mixin.js

@@ -1,8 +1,51 @@
+/* 日期组件的最小日期、默认值支持配置为「当前时间」，此处统一解析 */
+export const DATE_VALUE_TYPE_NOW = "now";
+
 export default {
   methods: {
     getDateLimitOptions() {
       return this.field.options || {};
     },
+    isNowDateValueType(valueType) {
+      return valueType === DATE_VALUE_TYPE_NOW;
+    },
+    /* 按组件的valueFormat格式化，valueFormat为空时picker的值为Date对象 */
+    formatDateValue(date, valueFormat) {
+      if (!valueFormat) {
+        return date;
+      }
+      if (valueFormat === "timestamp") {
+        return date.getTime();
+      }
+      const pad = (val) => (val < 10 ? "0" + val : String(val));
+      const tokenMap = {
+        yyyy: String(date.getFullYear()),
+        yy: String(date.getFullYear()).slice(-2),
+        MM: pad(date.getMonth() + 1),
+        dd: pad(date.getDate()),
+        HH: pad(date.getHours()),
+        mm: pad(date.getMinutes()),
+        ss: pad(date.getSeconds()),
+      };
+      return valueFormat.replace(
+        /yyyy|yy|MM|dd|HH|mm|ss/g,
+        (token) => tokenMap[token]
+      );
+    },
+    /* 当前时间，dates（多选日期）类型的值为数组 */
+    getNowDateValue() {
+      const options = this.getDateLimitOptions();
+      const nowValue = this.formatDateValue(new Date(), options.valueFormat);
+      return options.type === "dates" ? [nowValue] : nowValue;
+    },
+    /* 最小日期：固定日期或当前时间 */
+    getDateLimitMinValue() {
+      const options = this.getDateLimitOptions();
+      if (this.isNowDateValueType(options.minDateType)) {
+        return new Date();
+      }
+      return options.minDate;
+    },
     initDateLimitPickerOptions() {
       const pickerOptions = { ...(this.pickerOptions || {}) };
       if (["year", "month", "date", "datetime"].includes(this.field.options.type)) {
@@ -58,6 +101,12 @@ export default {
       if (val === null || val === undefined || val === "") {
         return null;
       }
+      if (val instanceof Date) {
+        return isNaN(val.getTime()) ? null : val.getTime();
+      }
+      if (typeof val === "number") {
+        return isNaN(val) ? null : val;
+      }
       const date = new Date(String(val).replace(/-/g, "/"));
       return isNaN(date.getTime()) ? null : date.getTime();
     },
@@ -73,7 +122,7 @@ export default {
       const options = this.getDateLimitOptions();
       const currentTime = time.getTime();
 
-      const minDate = this.parseDateLimitValue(options.minDate);
+      const minDate = this.parseDateLimitValue(this.getDateLimitMinValue());
       if (minDate !== null && currentTime < this.normalizeDateLimitDayTime(minDate, false)) {
         return true;
       }
@@ -113,7 +162,7 @@ export default {
       }
 
       const options = this.getDateLimitOptions();
-      const minDate = this.parseDateLimitValue(options.minDate);
+      const minDate = this.parseDateLimitValue(this.getDateLimitMinValue());
       if (minDate !== null && currentTime < this.normalizeDateLimitDayTime(minDate, false)) {
         return true;
       }
@@ -153,5 +202,21 @@ export default {
       }
       return "日期超出允许范围";
     },
+    /* 默认值配置为「当前时间」时，临时替换 defaultValue 后再走通用的取值逻辑 */
+    initDateFieldModel() {
+      const options = this.getDateLimitOptions();
+      if (!this.isNowDateValueType(options.defaultValueType)) {
+        this.initFieldModel();
+        return;
+      }
+
+      const rawDefaultValue = options.defaultValue;
+      options.defaultValue = this.getNowDateValue();
+      try {
+        this.initFieldModel();
+      } finally {
+        options.defaultValue = rawDefaultValue;
+      }
+    },
   },
 };

package/src/components/xform/form-designer/setting-panel/form-setting.vue

@@ -285,7 +285,12 @@
             </a>
           </el-form-item>
         </el-collapse-item>
-        <el-collapse-item name="4" title="列表标签页信息">
+        <el-collapse-item name="4" title="列表标签页信息（仅列表表单生效）">
+          <el-form-item>
+            <span style="color: #999; font-size: 12px; line-height: 1.6">
+              本组配置只从「查询列表页」所用的表单读取，在详情/编辑表单里设置不会生效
+            </span>
+          </el-form-item>
           <el-form-item :label="i18nt('列表启用详情多标签')">
             <el-switch v-model="formConfig.multiTabEnabled"></el-switch>
           </el-form-item>
@@ -309,6 +314,9 @@
               <el-radio label="closeToList">关闭页签并回列表刷新</el-radio>
               <el-radio label="refreshCurrent">刷新当前页签</el-radio>
             </el-radio-group>
+            <div style="color: #999; font-size: 12px; line-height: 1.6">
+              详情页「保存并提交」「直接启动流程」成功后的行为，不填默认「刷新当前页签」
+            </div>
           </el-form-item>
         </el-collapse-item>
         <el-collapse-item name="5" title="其他标签页信息">

package/src/components/xform/form-designer/setting-panel/property-editor/field-date/date-dateLimit-editor.vue

@@ -45,8 +45,10 @@
       ></el-input>
     </el-form-item>
     <el-form-item label="最小日期">
+      <el-checkbox v-model="nowMinDate">当前日期</el-checkbox>
       <el-date-picker
-        v-model="optionModel.minDate"
+        v-if="!nowMinDate"
+        v-model="minDate"
         :type="pickerType"
         :format="optionModel.format"
         :value-format="optionModel.valueFormat"
@@ -84,6 +86,26 @@ export default {
     tableColumns: Array,
   },
   computed: {
+    /* 老表单的options可能没有这些属性，统一用$set赋值，保证响应式 */
+    nowMinDate: {
+      get() {
+        return this.optionModel.minDateType === "now";
+      },
+      set(checked) {
+        this.$set(this.optionModel, "minDateType", checked ? "now" : "");
+        if (checked) {
+          this.$set(this.optionModel, "minDate", null);
+        }
+      },
+    },
+    minDate: {
+      get() {
+        return this.optionModel.minDate || null;
+      },
+      set(value) {
+        this.$set(this.optionModel, "minDate", value || null);
+      },
+    },
     pickerType() {
       return this.optionModel.type || "date";
     },

package/src/components/xform/form-designer/setting-panel/property-editor/field-date/date-defaultValue-editor.vue

@@ -1,7 +1,10 @@
 <template>
   <el-form-item :label="i18nt('designer.setting.defaultValue')">
-    <el-date-picker :type="optionModel.type" v-model="optionModel.defaultValue" @change="emitDefaultValueChange"
-                    :format="optionModel.format" :value-format="optionModel.valueFormat" style="width: 100%">
+    <el-checkbox v-model="nowDefaultValue">当前日期</el-checkbox>
+    <el-date-picker v-if="!nowDefaultValue" :type="optionModel.type"
+                    v-model="optionModel.defaultValue" @change="emitDefaultValueChange"
+                    :format="optionModel.format" :value-format="optionModel.valueFormat"
+                    style="width: 100%">
     </el-date-picker>
   </el-form-item>
 </template>
@@ -18,6 +21,21 @@
       selectedWidget: Object,
       optionModel: Object,
     },
+    computed: {
+      /* 老表单的options可能没有defaultValueType属性，用$set赋值保证响应式 */
+      nowDefaultValue: {
+        get() {
+          return this.optionModel.defaultValueType === 'now'
+        },
+        set(checked) {
+          this.$set(this.optionModel, 'defaultValueType', checked ? 'now' : '')
+          if (checked) {
+            this.$set(this.optionModel, 'defaultValue', null)
+          }
+          this.emitDefaultValueChange()
+        },
+      },
+    },
   }
 </script>
 

package/src/components/xform/form-designer/setting-panel/property-editor/field-time/time-defaultValue-editor.vue

@@ -1,13 +1,10 @@
 <template>
   <el-form-item :label="i18nt('designer.setting.defaultValue')">
-    <el-radio-group v-model="defaultValueType" size="mini">
-      <el-radio-button label="">固定时间</el-radio-button>
-      <el-radio-button label="now">当前时间</el-radio-button>
-    </el-radio-group>
-    <el-time-picker v-if="defaultValueType !== 'now'" v-model="optionModel.defaultValue"
+    <el-checkbox v-model="nowDefaultValue">当前时间</el-checkbox>
+    <el-time-picker v-if="!nowDefaultValue" v-model="optionModel.defaultValue"
                     @change="emitDefaultValueChange"
                     :format="optionModel.format" value-format="HH:mm:ss"
-                    style="width: 100%; margin-top: 5px">
+                    style="width: 100%">
     </el-time-picker>
   </el-form-item>
 </template>
@@ -26,13 +23,13 @@
     },
     computed: {
       /* 老表单的options可能没有defaultValueType属性，用$set赋值保证响应式 */
-      defaultValueType: {
+      nowDefaultValue: {
         get() {
-          return this.optionModel.defaultValueType || ''
+          return this.optionModel.defaultValueType === 'now'
         },
-        set(value) {
-          this.$set(this.optionModel, 'defaultValueType', value)
-          if (value === 'now') {
+        set(checked) {
+          this.$set(this.optionModel, 'defaultValueType', checked ? 'now' : '')
+          if (checked) {
             this.$set(this.optionModel, 'defaultValue', null)
           }
           this.emitDefaultValueChange()

package/src/components/xform/form-designer/setting-panel/property-editor/field-time/time-timeLimit-editor.vue

@@ -1,13 +1,10 @@
 <template>
   <div>
     <el-form-item label="最小时间">
-      <el-radio-group v-model="minTimeType" size="mini">
-        <el-radio-button label="">固定时间</el-radio-button>
-        <el-radio-button label="now">当前时间</el-radio-button>
-      </el-radio-group>
-      <el-time-picker v-if="minTimeType !== 'now'" v-model="minTime"
+      <el-checkbox v-model="nowMinTime">当前时间</el-checkbox>
+      <el-time-picker v-if="!nowMinTime" v-model="minTime"
                       :format="optionModel.format" value-format="HH:mm:ss"
-                      style="width: 100%; margin-top: 5px"
+                      style="width: 100%"
                       clearable placeholder="留空则不限制">
       </el-time-picker>
     </el-form-item>
@@ -28,13 +25,13 @@
     },
     computed: {
       /* 老表单的options可能没有这些属性，统一用$set赋值，保证响应式 */
-      minTimeType: {
+      nowMinTime: {
         get() {
-          return this.optionModel.minTimeType || ''
+          return this.optionModel.minTimeType === 'now'
         },
-        set(value) {
-          this.$set(this.optionModel, 'minTimeType', value)
-          if (value === 'now') {
+        set(checked) {
+          this.$set(this.optionModel, 'minTimeType', checked ? 'now' : '')
+          if (checked) {
             this.$set(this.optionModel, 'minTime', null)
           }
         },

package/src/components/xform/form-designer/widget-panel/widgetsConfig.js

@@ -1733,6 +1733,7 @@ export const basicFields = [
       labelAlign: "",
       type: "date",
       defaultValue: null,
+      defaultValueType: "", //默认值类型：空为固定日期，now为当前时间
       placeholder: "",
       columnWidth: "200px",
       size: "",
@@ -1749,6 +1750,7 @@ export const basicFields = [
       limitStartField: null,
       limitEndField: null,
       minDate: null,
+      minDateType: "", //最小日期类型：空为固定日期，now为当前时间
       maxDate: null,
       utcTransformEnabled: !1,
       required: !1,

package/src/components/xform/form-render/container-item/data-table-mixin.js

@@ -3892,13 +3892,11 @@ modules = {
       }
       if (transactional) {
         let formRef = this.getFormRef();
-        let reloadMethod
-          = typeof formRef?.reloadSavedFormData === "function"
-          ? formRef.reloadSavedFormData
-          : formRef?.reloadForm;
-        if (typeof reloadMethod === "function") {
+        // 整单刷新只能走宿主重挂载:就地 setFormData 会在表单已挂载时逐字段广播赋值,
+        // 当场触发各字段 onChange(读到兄弟组件的旧值)并清空子表。
+        if (typeof formRef?.reloadForm === "function") {
           try {
-            await reloadMethod.call(formRef);
+            await formRef.reloadForm();
           } catch (error) {
             let reloadError = error instanceof Error
               ? error
@@ -4071,17 +4069,13 @@ modules = {
       }
       this.treeSingleSavePending = true;
       let keepSaveLocked = false;
-      let reloadMethod
-        = typeof formRef.reloadSavedFormData === "function"
-        ? formRef.reloadSavedFormData
-        : formRef.reloadForm;
       let installReloadRetry = () => {
         let retryPromise = null;
         this.treeSingleSaveReconcileTask = () => {
           if (retryPromise) return retryPromise;
           retryPromise = (async () => {
             try {
-              await reloadMethod.call(formRef);
+              await formRef.reloadForm();
               delete obj.$table.editCloneRow;
               this.treeSingleSaveReconcileTask = null;
               this.treeSingleSavePending = false;

package/src/components/xform/form-render/indexMixin.js

@@ -4489,29 +4489,11 @@ modules = {
         return Promise.reject(error);
       }
     },
-    async reloadSavedFormData(option = {}) {
-      let updateParam = option.updateParam || {};
-      let nextDataId = updateParam.dataId ?? this.dataId;
-      let nextFormCode = updateParam.formCode;
-      if (nextDataId === undefined || nextDataId === null || nextDataId === "") {
-        throw new Error("缺少保存后的数据 ID，无法重新加载表单。");
-      }
-      let response = await this.loadFormData({
-        dataId: nextDataId,
-        replace: true,
-      });
-      if (!response || response.type !== "success") {
-        throw new Error(response?.content || "保存后的表单数据重新加载失败。");
-      }
-      if (nextDataId !== undefined && nextDataId !== null) {
-        this.$emit("update:dataId", nextDataId);
-      }
-      if (nextFormCode) {
-        this.$emit("update:formCode", nextFormCode);
-      }
-      await new Promise((resolve) => this.$nextTick(resolve));
-      return response;
-    },
+    // 注:此处曾有 reloadSavedFormData(就地整单取数 + setFormData)。它在表单已挂载时
+    // 逐字段广播赋值,每个字段的 onChange 当场同步执行,先赋值组件的脚本读到的是后赋值
+    // 组件的旧值(getFieldValue 取的是对方尚未刷新的 fieldModel),公式与 keyName 联动
+    // 乱序,getOne 不返回的子表/表头附件字段还会被清空。整单刷新一律走 reloadForm
+    // (宿主 toggle v-if 重挂载),保持「先填满 formDataModel 再挂载组件」这个前提。
     saveForm(callback) {
       this.validateForm((valid) => {
         if (!valid) return;

package/src/components/xform/mixins/defaultHandle.js

@@ -270,14 +270,37 @@ modules = {
               if (editFormCode) {
                 updateParam.formCode = editFormCode;
               }
-              let reloadMethod
-                = typeof formRef.reloadSavedFormData === "function"
-                ? formRef.reloadSavedFormData
-                : formRef.reloadForm;
               // 保存成功后一律让宿主整页重挂载(toggle v-if):新增/编辑都需要出流程信息、
-              // 切编辑模板、按新状态重算显隐与只读——这些就地取数(reloadSavedFormData)做不到。
+              // 切编辑模板、按新状态重算显隐与只读——这些就地取数做不到。
               // 唯一例外是「保存并提交」路径(skipHostReloadAfterSave=true),
               // 它的刷新交给流程结束后的 onWfStartSuccess / onWfStartAbort,避免刷两次。
+              //
+              // 刷新前只同步「元数据」,绝不做整单 setFormData:表单已挂载时那是逐字段同步
+              // 广播赋值,每个字段的 onChange 会当场执行,先赋值组件的脚本读到的是后赋值
+              // 组件的旧值,公式与 keyName 联动乱序,子表还会被整体清空(getOne 不返回子表)。
+              // 首屏之所以正确,靠的是「先填满 formDataModel 再挂载组件」,就地整单赋值破坏
+              // 了这个前提,故整单刷新只能走重挂载。
+              let syncSavedMeta = () => {
+                let nextDataId = updateParam.dataId;
+                if (
+                  nextDataId !== undefined
+                  && nextDataId !== null
+                  && nextDataId !== ""
+                ) {
+                  // 提交报文的主表以 currentFormData 打底(见 form-render getSubData2),
+                  // 主键 id 不是表单控件,只能在此回写;否则 skip 路径下再次保存会重复入库。
+                  if (
+                    formRef.currentFormData
+                    && formRef.currentFormData.id == null
+                  ) {
+                    formRef.currentFormData.id = nextDataId;
+                  }
+                  formRef.$emit("update:dataId", nextDataId);
+                }
+                if (updateParam.formCode) {
+                  formRef.$emit("update:formCode", updateParam.formCode);
+                }
+              };
               let runHostReload = async () => {
                 if (skipHostReloadAfterSave) return;
                 await formRef.reloadForm({ updateParam });
@@ -356,38 +379,7 @@ modules = {
                 };
                 showHostReloadFailure(false, error);
               };
-              try {
-                await reloadMethod.call(formRef, { updateParam });
-              } catch (error) {
-                keepSaveLocked = true;
-                let retryPromise = null;
-                formRef.formSaveReconcileTask = () => {
-                  if (retryPromise) return retryPromise;
-                  retryPromise = (async () => {
-                    try {
-                      await reloadMethod.call(formRef, { updateParam });
-                    } catch (retryError) {
-                      showHostReloadFailure(true, retryError);
-                      retryPromise = null;
-                      return false;
-                    }
-                    let result = await runPostReloadCallbacks();
-                    try {
-                      await runHostReload();
-                    } catch (hostReloadError) {
-                      installHostReloadRetry(hostReloadError);
-                      return false;
-                    }
-                    clearReconcileState();
-                    return result;
-                  })();
-                  return retryPromise;
-                };
-                showHostReloadFailure(false, error);
-                rejectOnce(error);
-                return;
-              }
-
+              syncSavedMeta();
               await runPostReloadCallbacks();
               try {
                 await runHostReload();

package/src/store/config/index.js

@@ -1,5 +1,7 @@
 //bdadmin 7,dev_admin 6, 普通dev账号 8
 
+import settings from "@/settings";
+
 // 通用工程/分支工程/数据表管理：分组父节点不配 url，仅作侧边栏分组，叶子的 menuCode 与壳组件 name 一致
 const bdProjectMenus = [
   {
@@ -219,6 +221,13 @@ const bdProjectMenusForDev = bdProjectMenus.map((group) => ({
   children: group.children.filter((item) => item.menuCode !== "bd_branch:list"),
 }));
 
+// 这几个分组默认不放出，需在应用自身的 settings.js 显式配置 bdProjectMenuEnabled: true
+const bdProjectMenuEnabled = settings.bdProjectMenuEnabled === true;
+const bdProjectMenuList = bdProjectMenuEnabled ? bdProjectMenus : [];
+const bdProjectMenuListForDev = bdProjectMenuEnabled
+  ? bdProjectMenusForDev
+  : [];
+
 let modules = {};
 modules = {
   userFlagMenuMap: {
@@ -517,7 +526,7 @@ modules = {
         grade: 2,
         type: 0,
       },
-      ...bdProjectMenus,
+      ...bdProjectMenuList,
     ],
     7: [
       {
@@ -654,7 +663,7 @@ modules = {
         grade: 2,
         type: 0,
       },
-      ...bdProjectMenus,
+      ...bdProjectMenuList,
     ],
     8: [
       {
@@ -883,7 +892,7 @@ modules = {
         grade: 2,
         type: 0,
       },
-      ...bdProjectMenusForDev,
+      ...bdProjectMenuListForDev,
     ],
   },
 };

package/src/views/bd/setting/form_template/mixins/edit.js

@@ -2,24 +2,24 @@ import projectTagView from "@base/components/projectTag/view.vue";
 import MenuKindDialog from "@base/views/bd/setting/menu_kind/dialog.vue";
 import preformDialog from "@base/views/bd/setting/form_template/preformDialog.vue";
 import formOplogTable from "@base/components/formOplog/index.vue";
-import {getBdFlag} from "@base/api/user";
+import { getBdFlag } from "@base/api/user";
 import otherAuthDialog from "../otherAuthDialog.vue";
 
 let modules = {};
 modules = {
-  name: 'bd_form_templateEdit',
+  name: "bd_form_templateEdit",
   props: {
     _dataId: [String, Number],
     currentFormType: Object,
     // readonly: Boolean,
-    otherFlag:Boolean,
+    otherFlag: Boolean,
     extractedObj: {
-      type:Object,
-      default:()=> null
+      type: Object,
+      default: () => null,
     },
-    hData:{
-      type:Object,
-      default:()=> null
+    hData: {
+      type: Object,
+      default: () => null,
     },
     compareHData: Object,
   },
@@ -28,62 +28,63 @@ modules = {
     MenuKindDialog,
     preformDialog,
     formOplogTable,
-    otherAuthDialog
+    otherAuthDialog,
   },
   data() {
     return {
       isEdit: false,
-      tabIndex: 'first',
-      dataId: '',
+      tabIndex: "first",
+      dataId: "",
       formTemplate: {
         enabled: true,
         history: false,
-        serviceId: 'user',
+        serviceId: "user",
         formTypeCode: null,
         menuKindName: null,
         menuKindCode: null,
         serviceName: null,
         formTemplateTagDTOs: [],
-        hasWf: false
+        hasWf: false,
       },
       oldFormTemplate: {
         enabled: true,
         history: false,
-        serviceId: 'user',
+        serviceId: "user",
         formTypeCode: null,
         menuKindName: null,
         menuKindCode: null,
         serviceName: null,
         formTemplateTagDTOs: [],
-        hasWf: false
+        hasWf: false,
       },
       isInited: false,
-      serviceIds: ['user'],
+      serviceIds: ["user"],
       showMenuKindDialog: false,
       isDev: true,
       showPreformDialog: false,
       menuKindAuth: {
-        editAuth: 0
+        editAuth: 0,
       },
       sid: null,
-      showOtherAuthDialog:false,
+      showOtherAuthDialog: false,
       readonly: false,
       isCompare: false,
     };
   },
   created() {
-    if(this.hData){
+    if (this.hData) {
       this.readonly = true;
-    }else{
+    } else {
       this.readonly = this.$attrs.readonly || false;
     }
-    if(this.extractedObj?.objx?.id){
+    if (this.extractedObj?.objx?.id) {
       this.dataId = this.extractedObj.obj.id;
-    }else if (this._dataId) {
+    } else if (this._dataId) {
       this.dataId = this._dataId;
     } else {
       this.formTemplate.menuKindName = this.currentFormType?.name || null;
-      this.formTemplate.menuKindCode = this.currentFormType?.menuKindCode || null;
+      this.formTemplate.menuKindCode =
+        this.currentFormType?.menuKindCode || null;
       this.formTemplate.serviceName = this.currentFormType?.serviceName || null;
     }
   },
@@ -92,7 +93,7 @@ modules = {
     this.getData();
   },
   methods: {
-    initData(formData){
+    initData(formData) {
       this.isEdit = true;
       this.formTemplate = formData || {};
       this.getMenuKindAuth(this.formTemplate.menuKindCode);
@@ -101,38 +102,38 @@ modules = {
       });
     },
     getData() {
-      if(this.extractedObj){
+      if (this.extractedObj) {
         this.dataId = this.extractedObj.id;
-        this.initData(this.extractedObj)
+        this.initData(this.extractedObj);
         //获取操作日志数据
-        this.$refs['oplogTable'].initData({
+        this.$refs["oplogTable"].initData({
           param: () => {
             return {
               logType: "FormTemplate",
-              logObjCode: this.formTemplate.formCode
+              logObjCode: this.formTemplate.formCode,
             };
-          }
+          },
         });
-      }else if (this.dataId) {
+      } else if (this.dataId) {
         this.$commonHttp({
           aes: true,
           url: USER_PREFIX + `/formTemplate/get`,
           method: `post`,
           data: {
-            id: this.dataId
+            id: this.dataId,
           },
           isLoading: true,
           modalStrictly: true,
-          success: res => {
-            this.initData(res.objx)
+          success: (res) => {
+            this.initData(res.objx);
             //获取操作日志数据
-            this.$refs['oplogTable'].initData({
+            this.$refs["oplogTable"].initData({
               param: () => {
                 return {
                   logType: "FormTemplate",
-                  logObjCode: this.formTemplate.formCode
+                  logObjCode: this.formTemplate.formCode,
                 };
-              }
+              },
             });
             /* this.formTemplate = res.objx || {};
             this.getMenuKindAuth(this.formTemplate.menuKindCode);
@@ -148,12 +149,12 @@ modules = {
                 };
               }
             }); */
-          }
+          },
         });
-      } else if (this.hData){
+      } else if (this.hData) {
         this.isEdit = true;
         this.formTemplate = this.$baseLodash.cloneDeep(this.hData);
-        this.dataId = this.hData.id
+        this.dataId = this.hData.id;
         this.isInited = true;
         this.getMenuKindAuth(this.formTemplate.menuKindCode);
         if (this.compareHData && this.$attrs.isCompare) {
@@ -166,17 +167,19 @@ modules = {
       }
     },
     saveData() {
-      this.$refs.editForm.$baseValidate(valid => {
+      this.$refs.editForm.$baseValidate((valid) => {
         if (valid) {
           this.openPreformDialog();
         }
       });
     },
     saveDataHandle(preformData) {
-      var url = USER_PREFIX + (this.isEdit ? `/formTemplate/update` : `/formTemplate/save`);
+      var url =
+        USER_PREFIX +
+        (this.isEdit ? `/formTemplate/update` : `/formTemplate/save`);
       let formData = {
         ...this.formTemplate,
-        logContent: preformData.logContent
+        logContent: preformData.logContent,
       };
       this.$http({
         aes: true,
@@ -184,24 +187,24 @@ modules = {
         method: `post`,
         data: formData,
         isLoading: true,
-        success: res => {
+        success: (res) => {
           this.$message({
             message: res.content,
-            type: 'success',
+            type: "success",
             duration: 500,
-            onClose: t => {
+            onClose: (t) => {
               if (this.isEdit) {
                 this.$baseReload();
               } else {
                 this.$baseReload({
                   updateParam: {
-                    _dataId: res.objx || this.formTemplate.id
-                  }
+                    _dataId: res.objx.id || this.formTemplate.id,
+                  },
                 });
               }
-            }
+            },
           });
-        }
+        },
       });
     },
     openPreformDialog() {
@@ -213,40 +216,40 @@ modules = {
     confirmInsertMenuKind(rows) {
       if (rows.length > 0) {
         let row = rows[0];
-        this.$set(this.formTemplate, 'menuKindCode', row.menuKindCode);
-        this.$set(this.formTemplate, 'menuKindName', row.name);
+        this.$set(this.formTemplate, "menuKindCode", row.menuKindCode);
+        this.$set(this.formTemplate, "menuKindName", row.name);
       }
     },
     getBdEnv() {
       getBdFlag({
-        success: res => {
-          this.isDev = res.objx === 1
-        }
+        success: (res) => {
+          this.isDev = res.objx === 1;
+        },
       });
     },
     openDesignDialog() {
-      let readonly = this.readonly || !this.menuKindAuth.editAuth
-      this.$emit('openDesignDialog', {
+      let readonly = this.readonly || !this.menuKindAuth.editAuth;
+      this.$emit("openDesignDialog", {
         row: this.formTemplate,
         readonly,
         callback: () => {
-          this.$baseReload()
-        }
-      })
+          this.$baseReload();
+        },
+      });
     },
     getMenuKindAuth(menuKindCode) {
-      if(this.otherFlag){
+      if (this.otherFlag) {
         this.getOtherMenuKindAuth();
-      }else if (menuKindCode) {
+      } else if (menuKindCode) {
         this.$http({
           // aes: true,
-          url: USER_PREFIX + '/menu_kind_auth/getAuth',
+          url: USER_PREFIX + "/menu_kind_auth/getAuth",
           method: `post`,
-          data: {stringOne: menuKindCode},
+          data: { stringOne: menuKindCode },
           isLoading: true,
-          success: res => {
-            this.menuKindAuth = res.objx || {}
-          }
+          success: (res) => {
+            this.menuKindAuth = res.objx || {};
+          },
         });
       }
     },
@@ -257,7 +260,7 @@ modules = {
           aes: true,
           url: USER_PREFIX + "/form_template_auth/getAuth",
           method: `post`,
-          data: {stringOne: this.formTemplate.sid},
+          data: { stringOne: this.formTemplate.sid },
           isLoading: true,
           success: (res) => {
             this.menuKindAuth = res.objx || {};
@@ -265,13 +268,13 @@ modules = {
         });
       }
     },
-    openOtherAuthDialog(){
-      this.sid = this.formTemplate.sid
-      this.showOtherAuthDialog = true
+    openOtherAuthDialog() {
+      this.sid = this.formTemplate.sid;
+      this.showOtherAuthDialog = true;
     },
-    confirmOtherAuthDialog(){
-      this.$baseReload()
+    confirmOtherAuthDialog() {
+      this.$baseReload();
     },
-  }
+  },
 };
-export default modules
+export default modules;