cloud-web-corejs 1.0.54-dev.439 → 1.0.54-dev.440

package/package.json

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

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

@@ -2460,6 +2460,52 @@ modules = {
       }
       return realFormData;
     },
+    closeDetailPage(){
+      //关闭详情页
+      let listPageRef = this.getListPageRef();
+      if(listPageRef){
+        listPageRef.dataId = 0;
+        listPageRef.showEdit = false;
+      }
+    },
+    getListPageRef() {
+      //获取列表页面对象
+      let target1 = this.$attrs["parent-target"];
+      let parentTarget = target1?.$attrs["parent-target"];
+      return parentTarget;
+    },
+    getListTabFormRef() {
+      //获取列表tab的表单对象
+      let parentTarget = this.getListPageRef();
+      let listTabFormRef = parentTarget?.$refs?.list?.$refs?.vFormRef ?? null;
+      return listTabFormRef;
+    },
+    getFirstWidgetRef(){
+      //获取表单的第一个组件
+      let target = null;
+      if(this.formJsonObj.widgetList && this.formJsonObj.widgetList.length > 0){
+        target = this.getWidgetRef(this.formJsonObj.widgetList[0].options.name);
+      }
+      return target
+    },
+    switchToListTab(option){
+      //切换到列表页的tab
+      let handleType = option?.handleType;
+      let listPageRef = this.getListPageRef();
+      if(listPageRef){
+        listPageRef.activeName = "second";
+      }
+      if(handleType){
+        let listTabFormRef = this.getListTabFormRef();
+        if(handleType == "reload"){
+          listTabFormRef.reloadForm();
+        }else if(handleType == "searchEvent"){
+          listTabFormRef.getFirstWidgetRef().searchEvent();
+        }else if(handleType == "resethEvent"){
+          listTabFormRef.getFirstWidgetRef().resethEvent();
+        }
+      }
+    },
     reloadForm(option) {
       let target1 = this.$attrs["parent-target"];
       let target2 = target1?.$attrs["parent-target"];

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" v-bind="$attrs" @openCopyEditTab="openCopyEditTab"/>
+    <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,12 +77,12 @@ 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,
@@ -75,26 +91,28 @@ export default {
         // isLoading: true,
         // loadingTarget: document.body,
         // modalStrictly: true,
-        success: async res => {
+        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,13 +121,13 @@ 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 ?? {};
@@ -121,25 +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)
-    }
-  }
+    openCopyEditTab(formData) {
+      this.$emit("openCopyEditTab", formData);
+    },
+  },
 };
 </script>

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

@@ -4,12 +4,14 @@
       <x-tabs ref="xTabs" v-model="activeName" class="tab-box">
         <el-tab-pane :label="$t2('常规')" name="first">
           <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"
@@ -18,10 +20,12 @@
         <el-tab-pane :label="$t2('列表')" name="second">
           <div class="grid-height">
             <vFormRender
+              ref="list"
               :formCode="formCode"
               style="height: 100%"
               v-if="showRender"
               visible-key="showRender"
+              :visiable.sync="showRender"
               :parent-target="_self"
               @reload="$reloadHandle"
               :openEditDialog="openEditDialog"
@@ -36,6 +40,7 @@
             :closable="true"
           >
             <vFormRender
+              ref="multiEdit"
               :formCode.sync="tab.formCode"
               :dataId.sync="tab.dataId"
               :param="tab.param"
@@ -125,6 +130,11 @@ export default {
     this.initParam();
     this.getReportTemplate();
   },
+  provide() {
+    return {
+      _self: this,
+    };
+  },
   methods: {
     initParam() {
       let path = this.$route.path;