cloud-web-corejs 1.0.54-dev.455 → 1.0.54-dev.457

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "cloud-web-corejs",
   "private": false,
-  "version": "1.0.54-dev.455",
+  "version": "1.0.54-dev.457",
   "scripts": {
     "dev": "vue-cli-service serve",
     "lint": "eslint --ext .js,.vue src",

package/src/components/xform/form-designer/designer.js

@@ -93,7 +93,9 @@ let chartContainers = [],
         multiTabLabelField:null,
         addFormCode: null,
         addFormName: null,
-        wfTheme: null
+        wfTheme: null,
+        otherTabEnabled:false,
+        otherTabList:[]
       },
       dataSources: [], //数据源
 

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

@@ -170,6 +170,54 @@
             <el-input type="text" v-model="formConfig.multiTabLabelField"></el-input>
           </el-form-item>
         </el-collapse-item>
+        <el-collapse-item name="2" title="其他标签页信息">
+          <el-form-item :label="i18nt('启用其他标签页')">
+            <el-switch v-model="formConfig.otherTabEnabled"></el-switch>
+          </el-form-item>
+          <el-form-item :label="i18nt('其他标签页配置')"> </el-form-item>
+          <el-form-item label-width="0">
+            <div>
+              <draggable
+                tag="ul"
+                class="draggable-box"
+                :list="formConfig.otherTabList"
+                v-bind="{
+                  group: 'optionsGroup',
+                  ghostClass: 'ghost',
+                  handle: '.drag-option',
+                }"
+              >
+                <li v-for="(option, idx) in formConfig.otherTabList" :key="idx">
+                  <el-input
+                    v-model="option.label"
+                    size="mini"
+                    style="width: 100px"
+                    placeholder="标签名称"
+                  ></el-input>
+                  <el-input
+                    v-model="option.formCode"
+                    size="mini"
+                    style="width: 100px"
+                    placeholder="表单模板编码"
+                  ></el-input>
+                  <i class="el-icon-s-operation drag-option"></i>
+                  <el-button
+                    circle
+                    plain
+                    size="mini"
+                    type="danger"
+                    @click="formConfig.otherTabList.splice(idx, 1)"
+                    icon="el-icon-minus"
+                    class="col-delete-button"
+                  ></el-button>
+                </li>
+              </draggable>
+              <el-button type="text" @click="addOtherTab">{{
+                i18nt("designer.setting.addOption")
+              }}</el-button>
+            </div>
+          </el-form-item>
+        </el-collapse-item>
 
         <el-collapse-item name="3" title="详情表单信息">
           <el-form-item :label="i18nt('查看页面表单编码')">
@@ -1310,6 +1358,15 @@ $\{wf.starterName\}提交的$\{pm_product_project.product_code\}$\{pm_product_pr
         item.companyCodes = row.bdCompanyCode;
       }
     },
+    addOtherTab() {
+      if (!this.formConfig.otherTabList) {
+        this.$set(this.formConfig, "otherTabList", []);
+      }
+      this.formConfig.otherTabList.push({
+        label: null,
+        formCode: null,
+      });
+    },
   },
 };
 </script>

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

@@ -199,6 +199,7 @@
               <el-select
                 v-model="row.toValue"
                 clearable
+                style="width: 100%"
                 v-if="row.action === 'specificAction'"
               >
                 <el-option value="wfCreateDate" label="流程创建(启动)时间"></el-option>

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

@@ -860,7 +860,9 @@ export function getDefaultFormConfig() {
     multiTabLabelField:null,
     addFormCode:null,
     addFormName: null,
-    wfTheme: null
+    wfTheme: null,
+    otherTabEnabled:false,
+    otherTabList:[]
   };
 }
 

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

@@ -32,6 +32,29 @@
             ></vFormRender>
           </div>
         </el-tab-pane>
+        <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="openEditDialog"
+            ></vFormRender>
+          </div>
+        </el-tab-pane>
         <template #editTab="{ tab, index, reloadTabContent }">
           <el-tab-pane
             :key="tab.data.id"
@@ -124,8 +147,21 @@ export default {
       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();
@@ -168,6 +204,7 @@ export default {
           }
           this.addFormCode = addFormCode;
           this.multiTabLabelField = formJson.formConfig?.multiTabLabelField;
+          this.initOtherTabList();
         },
       });
     },
@@ -231,6 +268,38 @@ export default {
       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>