cloud-web-corejs 1.0.54-dev.50 → 1.0.54-dev.500

package/src/views/user/form/vform/out_render.vue

@@ -31,7 +31,7 @@ export default {
           data: {
             dw: dw
           },
-          isLoading: true,
+          // isLoading: true,
           success: res => {
             let token = res.objx;
             this.$store

package/src/views/user/form/vform/render.vue

@@ -1,30 +1,46 @@
 <template>
   <div>
-    <div class="designer-view" :class="[layoutType === 'H5' ? 'h5-layout' : layoutType === 'Pad' ? 'pad-layout' : '']">
-      <v-form-render :form-json.sync="formJson" :form-data="formData" :option-data="optionData" ref="vFormRef"
-                     :reportTemplate.sync="formTemplate" :conditionParam.sync="conditionParam"
-                     :formInsData.sync="formInsData"
-                     v-if="showRender" visible-key="showRender" :parent-target="_self" @reload="$baseReload()"
-                     :dataId.sync="dataId" :param="param"/>
+    <div
+      class="designer-view"
+      :class="[
+        layoutType === 'H5' ? 'h5-layout' : layoutType === 'Pad' ? 'pad-layout' : '',
+      ]"
+    >
+      <v-form-render
+        :form-json.sync="formJson"
+        :form-data="formData"
+        :option-data="optionData"
+        ref="vFormRef"
+        :reportTemplate.sync="formTemplate"
+        :conditionParam.sync="conditionParam"
+        :formInsData.sync="formInsData"
+        v-if="showRender"
+        visible-key="showRender"
+        :visiable.sync="showRender"
+        :parent-target="_self"
+        @reload="$baseReload()"
+        :dataId.sync="dataId"
+        :param="param"
+        v-bind="$attrs"
+        @openCopyEditTab="openCopyEditTab"
+      />
     </div>
   </div>
-
 </template>
 <script>
-import {loadExtension} from '@base/components/xform/extension/extension-loader'
+import { loadExtension } from "@base/components/xform/extension/extension-loader";
 
-loadExtension()
-import VFormRender from '@base/components/xform/form-render/index.vue'
+loadExtension();
+import VFormRender from "@base/components/xform/form-render/index.vue";
 import scriptHttpMixin from "@base/components/xform/mixins/scriptHttp";
 
-
 export default {
-  name: 'vform_render',
+  name: "vform_render",
   mixins: [scriptHttpMixin],
   components: {
-    VFormRender
+    VFormRender,
   },
-  props: ['object_foreign_id', 'dataId', 'param'],
+  props: ["object_foreign_id", "dataId", "param"],
   data() {
     return {
       formJson: {},
@@ -35,7 +51,7 @@ export default {
       formCode: null,
       layoutType: null,
       conditionParam: null,
-      formInsData: null
+      formInsData: null,
     };
   },
   created() {
@@ -47,7 +63,7 @@ export default {
       let code = this.$attrs.formCode;
       if (!code) {
         var hash = window.location.hash;
-        let str = '#/report/xform/render/';
+        let str = "#/report/xform/render/";
         if (hash.indexOf(str) == 0) {
           code = hash.slice(str.length);
         }
@@ -61,40 +77,42 @@ export default {
       let param = {
         objTypeCode: this.$attrs.objTypeCode,
         objId: this.$attrs.objId,
-        taskId: this.$attrs.taskId
+        taskId: this.$attrs.taskId,
       };
       this.conditionParam = param;
       let url, data;
       url = USER_PREFIX + `/formTemplate/getByFormCode`;
-      data = {stringOne: this.formCode};
+      data = { stringOne: this.formCode };
       this.$http({
         aes: true,
         url: url,
         method: `post`,
         data: data,
-        isLoading: true,
-        loadingTarget: document.body,
-        modalStrictly: true,
-        success: async res => {
+        // isLoading: true,
+        // loadingTarget: document.body,
+        // modalStrictly: true,
+        success: async (res) => {
           let formTemplate = res.objx || {};
           this.formTemplate = formTemplate;
-          this.formJson = formTemplate.formViewContent ? JSON.parse(formTemplate.formViewContent) : {};
-          this.layoutType = this.formJson.formConfig.layoutType
+          this.formJson = formTemplate.formViewContent
+            ? JSON.parse(formTemplate.formViewContent)
+            : {};
+          this.layoutType = this.formJson.formConfig.layoutType;
           this.getFormInsData2();
-        }
+        },
       });
     },
     getReqParam(item, dataId, billData) {
       let param = {};
       if (item.accessParam) {
         if (typeof item.accessParam === "string") {
-          let n = new Function('billData', item.accessParam);
+          let n = new Function("billData", item.accessParam);
           param = n.call(this, billData);
         } else {
-          param = item.accessParam
+          param = item.accessParam;
         }
       } else {
-        param = {id: dataId}
+        param = { id: dataId };
       }
       return param;
     },
@@ -103,15 +121,16 @@ export default {
       let formConfig = this.formJson.formConfig;
       let dataId = this.dataId;
       if (formConfig.onBeforeCreated) {
-        let n = new Function('dataId', "formCode", "done", formConfig.onBeforeCreated);
+        let n = new Function("dataId", "formCode", "done", formConfig.onBeforeCreated);
         let toDo = function (res) {
           let formData = res && res.objx ? res.objx : {};
           that.formData = formData;
           that.formInsData = formData;
           that.showRender = true;
-        }
+        };
         n.call(this, dataId, this.formCode, toDo);
       } else {
+        this.formData = this.$attrs.formData ?? {};
         this.showRender = true;
       }
     },
@@ -120,22 +139,25 @@ export default {
       let getConfig = formConfig.getConfig || {};
       let dataId = this.dataId;
       if (dataId) {
-        let reqParam = {id: dataId};
-        let accessParamArguments = [{name: "id", value: dataId}]
+        let reqParam = { id: dataId };
+        let accessParamArguments = [{ name: "id", value: dataId }];
         this.scriptHttp({
           options: getConfig,
           params: reqParam,
           targetFormTemplate: this.formTemplate,
           accessParamArguments: accessParamArguments,
-          success: res => {
+          success: (res) => {
             let formData = res.objx || {};
             this.formData = formData;
             this.formInsData = res.objx;
             this.showRender = true;
-          }
-        })
+          },
+        });
       }
-    }
-  }
+    },
+    openCopyEditTab(formData) {
+      this.$emit("openCopyEditTab", formData);
+    },
+  },
 };
 </script>

package/src/views/user/form/view/edit.vue

@@ -1,37 +1,38 @@
-<template>
-  <vFormRender :formCode="formCode" :dataId.sync="dataId"
-               v-if="showEdit" visible-key="showEdit" :parent-target="_self"
-               @reload="$reloadHandle"></vFormRender>
-</template>
-<script>
-
-import vFormRender from "../../../../views/user/form/vform/render.vue";
-
-export default {
-  components: {vFormRender},
-  data() {
-    return {
-      formCode: null,
-      dataId: null,
-      showEdit: false,
-    }
-  },
-  created() {
-    this.init()
-  },
-  methods: {
-    init() {
-      let formCode = this.$route.query.formCode || this.$attrs.formCode;
-      let dataId = this.$route.query.dataId || this.$attrs.dataId;
-      if (dataId && formCode) {
-        this.formCode = formCode;
-        this.dataId = Number(dataId);
-        this.showEdit = true;
-      }
-    }
-  }
-}
-</script>
-<style scoped>
-
-</style>
+<template>
+  <vFormRender :formCode="formCode" :dataId.sync="dataId"
+               v-if="showEdit" visible-key="showEdit" :parent-target="_self"
+               @reload="$reloadHandle"></vFormRender>
+</template>
+<script>
+
+import vFormRender from "../../../../views/user/form/vform/render.vue";
+
+export default {
+  components: {vFormRender},
+  data() {
+    return {
+      formCode: null,
+      dataId: null,
+      showEdit: false,
+    }
+  },
+  created() {
+    this.init()
+  },
+  methods: {
+    init() {
+      let formCode = this.$route.query.formCode || this.$attrs.formCode;
+      let dataId = this.$route.query.dataId || this.$attrs.dataId || this.$attrs._dataId;
+
+      if (dataId && formCode) {
+        this.formCode = formCode;
+        this.dataId = Number(dataId);
+        this.showEdit = true;
+      }
+    }
+  }
+}
+</script>
+<style scoped>
+
+</style>

package/src/views/user/form/view/list.vue

@@ -1,22 +1,87 @@
 <template>
   <div id="containt">
-    <template v-if="layoutType=='PC'">
-      <el-tabs v-model="activeName" class="tab-box">
+    <template v-if="layoutType == 'PC'">
+      <x-tabs ref="xTabs" v-model="activeName" class="tab-box" :tabNameEnable="true">
         <el-tab-pane :label="$t2('常规')" name="first">
-          <vFormRender :formCode="formCode2" :dataId.sync="dataId" :param="param"
-                       v-if="showEdit" visible-key="showEdit" :parent-target="_self"
-                       @reload="$reloadHandle"></vFormRender>
+          <vFormRender
+            ref="edit"
+            :formCode.sync="formCode1"
+            :dataId.sync="dataId"
+            :param="param"
+            :formData="formData"
+            v-if="showEdit"
+            visible-key="showEdit"
+            :visiable.sync="showEdit"
+            :parent-target="_self"
+            @reload="reload"
+            @openCopyEditTab="openCopyEditTab"
+          ></vFormRender>
         </el-tab-pane>
-        <el-tab-pane :label="$t2('列表')" name="second">
+        <el-tab-pane :label="$t2(formConfig.customListTabLabel || '列表')" name="second">
           <div class="grid-height">
-            <vFormRender :formCode="formCode" style="height: 100%;"
-                         v-if="showRender" visible-key="showRender" :parent-target="_self"
-                         @reload="$reloadHandle" :openEditDialog="openEditDialog"></vFormRender>
+            <vFormRender
+              ref="list"
+              :formCode="formCode"
+              style="height: 100%"
+              v-if="showRender"
+              visible-key="showRender"
+              :visiable.sync="showRender"
+              :parent-target="_self"
+              @reload="$reloadHandle"
+              :openEditDialog="openEditDialog"
+            ></vFormRender>
           </div>
         </el-tab-pane>
-      </el-tabs>
+        <el-tab-pane
+          v-for="(item, index) in otherTabList"
+          :key="index"
+          :label="$t2(item.label)"
+          :name="`otherTab${index}`"
+        >
+          <div class="grid-height">
+            <vFormRender
+              :ref="`list${index}`"
+              :formCode.sync="item.formCode"
+              :dataId.sync="item.dataId"
+              :param="item.param"
+              v-if="item.showContent"
+              :parent-target="_self"
+              @reload="
+                (...args) => {
+                  reloadAutoContent(...args);
+                }
+              "
+              :openEditDialog="openEditDialog1"
+            ></vFormRender>
+          </div>
+        </el-tab-pane>
+        <template #editTab="{ tab, index, reloadTabContent }">
+          <el-tab-pane
+            :key="tab.tabName"
+            :label="tab.data[tab.tabLabelField]"
+            :name="tab.tabName"
+            :closable="true"
+          >
+            <vFormRender
+              ref="multiEdit"
+              :formCode.sync="tab.formCode"
+              :dataId.sync="tab.dataId"
+              :param="tab.param"
+              v-if="tab.showContent"
+              :parent-target="_self"
+              @reload="
+                (...args) => {
+                  formData = {};
+                  reloadTabContent(...args);
+                }
+              "
+              @openCopyEditTab="openCopyEditTab"
+            ></vFormRender>
+          </el-tab-pane>
+        </template>
+      </x-tabs>
     </template>
-    <template v-else-if="layoutType=='H5'">
+    <template v-else-if="layoutType == 'H5'">
       <el-dialog
         :title="$t1('明细详情')"
         :modal-append-to-body="false"
@@ -30,100 +95,247 @@
         v-el-dialog-center
         :destroy-on-close="true"
       >
-        <div class="cont" style="height: calc(100vh - 73px);">
-          <vFormRender :formCode="formCode2" :dataId.sync="dataId"
-                       v-if="showEditDialog && showEdit" visible-key="showEdit" :parent-target="_self"
-                       @reload="$reloadHandle"></vFormRender>
+        <div class="cont" style="height: calc(100vh - 73px)">
+          <vFormRender
+            :formCode="formCode2"
+            :dataId.sync="dataId"
+            v-if="showEditDialog && showEdit"
+            visible-key="showEdit"
+            :parent-target="_self"
+            @reload="$reloadHandle"
+          ></vFormRender>
         </div>
       </el-dialog>
-      <vFormRender :formCode="formCode" style="height: 100%;"
-                   v-if="showRender" visible-key="showRender" :parent-target="_self"
-                   @reload="$reloadHandle" :openEditDialog="openEditDialog"></vFormRender>
+      <vFormRender
+        :formCode="formCode"
+        style="height: 100%"
+        v-if="showRender"
+        visible-key="showRender"
+        :parent-target="_self"
+        @reload="$reloadHandle"
+        :openEditDialog="openEditDialog"
+      ></vFormRender>
     </template>
   </div>
 </template>
 
 <script>
-
-import vFormRender from '../../../../views/user/form/vform/render'
+import vFormRender from "../../../../views/user/form/vform/render";
 
 export default {
-  name: 'form_view:list',
-  components: {vFormRender},
-  mounted() {
-
-  },
+  name: "form_view:list",
+  components: { vFormRender },
+  mounted() {},
   data() {
     let that = this;
     return {
       activeName: "second",
       showEdit: false,
-
-      formJson: {},
+      formJson: { formConfig: {} },
       formConfig: {},
       showRender: false,
       formTemplate: null,
       /*      formCode: null,*/
       layoutType: null,
       formCode: null,
+      formCode1: null,
       formCode2: null,
+      addFormCode: null,
       dataId: null,
       showEditDialog: false,
-      param: {}
+      param: {},
+      multiTabLabelField: null,
+      formData: null,
+      otherTabList: [],
     };
   },
+  watch: {
+    activeName(val) {
+      if (
+        this.formJson.formConfig.otherTabEnabled &&
+        this.otherTabList.length > 0 &&
+        val.startsWith("otherTab")
+      ) {
+        let num = Number(val.substring("otherTab".length));
+        this.otherTabList[num].showContent = true;
+      }
+    },
+  },
   created() {
     this.initParam();
     this.getReportTemplate();
   },
+  provide() {
+    return {
+      _self: this,
+    };
+  },
   methods: {
     initParam() {
       let path = this.$route.path;
-      let param = path.split('/').reverse();
+      let param = path.split("/").reverse();
 
       this.formCode = this.$attrs.formCode || param[0];
       this.showRender = true;
     },
     getReportTemplate() {
       this.$http({
-        aes: true,
+        // aes: true,
         url: USER_PREFIX + `/formTemplate/getByFormCode`,
         method: `post`,
-        data: {stringOne: this.formCode},
-        isLoading: true,
-        loadingTarget: document.body,
-        modalStrictly: true,
-        success: async res => {
+        data: { stringOne: this.formCode },
+        // isLoading: true,
+        // loadingTarget: document.body,
+        // modalStrictly: true,
+        success: async (res) => {
           let formTemplate = res.objx || {};
           this.formTemplate = formTemplate;
-          let formJson = formTemplate.formViewContent ? JSON.parse(formTemplate.formViewContent) : {};
+          let formJson = formTemplate.formViewContent
+            ? JSON.parse(formTemplate.formViewContent)
+            : {};
           this.formJson = formJson;
-          this.layoutType = formJson.formConfig?.layoutType
-          this.formCode2 = formJson.formConfig?.editFormCode ?? null;
-        }
+          this.formConfig = formJson.formConfig || {};
+          this.layoutType = formJson.formConfig?.layoutType;
+          let addFormCode = formJson.formConfig?.addFormCode ?? null;
+          let formCode2 = formJson.formConfig?.editFormCode ?? null;
+          this.formCode2 = formCode2;
+          if (!addFormCode) {
+            addFormCode = formCode2;
+          }
+          this.addFormCode = addFormCode;
+          this.multiTabLabelField = formJson.formConfig?.multiTabLabelField;
+          this.initOtherTabList();
+        },
+      });
+    },
+    openOtherTab(row, param, option) {
+      let dataId = row && row.id ? row.id : null;
+      let formCode = option.formCode;
+      let otherTab = this.otherTabList.find((item) => item.formCode == formCode);
+      let otherTabIndex = this.otherTabList.findIndex(
+        (item) => item.formCode == formCode
+      );
+      this.activeName = `otherTab${otherTabIndex}`;
+
+      otherTab.dataId = dataId;
+      otherTab.param = param;
+      this.$nextTick(() => {
+        otherTab.showContent = false;
+        this.$nextTick(() => {
+          otherTab.showContent = true;
+        });
       });
     },
-    openEditDialog(row, param) {
+    openEditDialog(row, param, option) {
+      if (option?.otherTab) {
+        this.openOtherTab(row, param, option);
+        return;
+      }
       if (this.layoutType == "H5") {
         this.openEditH5Dialog(row);
         return;
       }
-      this.dataId = row && row.id ? row.id : null;
-      this.activeName = 'first';
-      this.showEdit = false;
-      this.showEditDialog = true;
-      this.param = param
-      this.$openEditView('showEdit');
+      let formConfig = this.formJson.formConfig;
+      let tabLabelField = option?.multiTabLabelField || formConfig.multiTabLabelField;
+      let multiTabEnabled = false;
+      if (tabLabelField) {
+        if (option?.multiTabEnabled) {
+          multiTabEnabled = true;
+        } else if (formConfig.multiTabEnabled && option?.multiTabEnabled !== false) {
+          multiTabEnabled = true;
+        }
+      }
+
+      let dataId = row && row.id ? row.id : null;
+      this.dataId = dataId;
+      let formCode = null;
+      if (!dataId) {
+        formCode = option?.formCode || this.addFormCode;
+      } else {
+        formCode = option?.formCode || this.formCode2;
+      }
+      if (multiTabEnabled && dataId) {
+        this.$refs.xTabs.openEditTab(row, param, {
+          tabParam: {
+            formCode,
+            tabLabelField,
+            tabName: formCode + dataId,
+          },
+        });
+      } else {
+        this.formCode1 = formCode;
+        this.activeName = option.activeName || "first";
+        this.showEdit = false;
+        this.showEditDialog = true;
+        this.param = param;
+        this.formData = null;
+        this.$openEditView("showEdit");
+      }
+    },
+    openEditDialog1(row, param, option) {
+      this.openEditDialog(row, param, { multiTabEnabled: false, ...option });
     },
     openEditH5Dialog(row) {
+      this.formCode1 = this.addFormCode;
       this.dataId = row && row.id ? row.id : null;
-      this.activeName = 'first';
+      this.activeName = "first";
       this.showEdit = false;
       this.showEditDialog = true;
       this.$nextTick(() => {
-        this.$openEditView('showEdit');
+        this.$openEditView("showEdit");
       });
     },
-  }
+
+    openCopyEditTab(formData) {
+      this.dataId = null;
+      this.formCode1 = this.addFormCode;
+      this.activeName = "first";
+      this.showEdit = false;
+      this.showEditDialog = true;
+      // this.param = param
+      this.formData = formData;
+      this.$openEditView("showEdit");
+    },
+    reload(...args) {
+      this.formData = {};
+      this.$reloadHandle(...args);
+    },
+    reload2() {
+      this.formData = {};
+      this.$reloadHandle(...arguments);
+    },
+    initOtherTabList() {
+      if (!this.formJson.formConfig.otherTabEnabled) return;
+      this.otherTabList = this.formJson.formConfig.otherTabList
+        .filter((item) => !!item.formCode && !!item.label)
+        .map((item) => {
+          return {
+            label: item.label,
+            formCode: item.formCode,
+            showContent: false,
+            dataId: null,
+            param: null,
+          };
+        });
+    },
+    reloadAutoContent(target, param, tab) {
+      let updateParam =
+        param != null && param.updateParam != null ? param.updateParam : {};
+      for (let key in updateParam) {
+        target.$emit("update:" + key, updateParam[key]);
+      }
+
+      if (!tab) {
+        let activeName = this.activeName;
+        tab = this.tabs.find((item) => item.label == activeName);
+      }
+      if (tab) {
+        tab.showContent = false;
+        setTimeout(() => {
+          tab.showContent = true;
+        }, 200);
+      }
+    },
+  },
 };
 </script>