cloud-web-corejs 1.0.54-dev.80 → 1.0.54-dev.800

package/src/views/user/form/vform/formFieldMapping.js

@@ -129,10 +129,9 @@ export const formFieldMapping = {
   },
 
   'AreaSelect': {
-    type: 'cascader',
+    type: 'area-select',
     options: {
-      areaDataEnabled: true,  //是否加载省市区数据
-      areaDataType: 2, //0不开启，1加载省市数据，2加载省市区数据
+      areaDataType: 2,
     }
   },
 

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,48 @@
 <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="forwardReload"
+        :dataId="dataId"
+        @update:dataId="$emit('update:dataId', $event)"
+        @update:formCode="$emit('update:formCode', $event)"
+        :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 +53,7 @@ export default {
       formCode: null,
       layoutType: null,
       conditionParam: null,
-      formInsData: null
+      formInsData: null,
     };
   },
   created() {
@@ -43,11 +61,32 @@ export default {
     this.getReportTemplate();
   },
   methods: {
+    forwardReload(target, option) {
+      let reloadListener = this.$listeners?.reload;
+      if (Array.isArray(reloadListener)) {
+        return Promise.all(
+          reloadListener.map((listener) => listener(this, option))
+        );
+      }
+      if (typeof reloadListener === "function") {
+        return reloadListener(this, option);
+      }
+      this.$emit("reload", this, option);
+      return Promise.resolve();
+    },
+    dataTableSearch() {
+      let gridRef = this.$refs.vFormRef.getGridWidgetRef()
+      if(!gridRef)return
+      let options = gridRef.widget.options;
+      if(options.searchOnSwitchTab && options.isQueryTable){
+        gridRef.searchEvent();
+      }
+    },
     initReportCode() {
       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 +100,46 @@ 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)
+            : {};
+          if (!this.formJson.formConfig) {
+            this.$message.error(`表单模板不存在或内容为空: ${this.formCode}`);
+            return;
+          }
+          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,39 +148,22 @@ 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;
       }
     },
-    async getFormInsData() {
-      let formConfig = this.formJson.formConfig;
-      let getConfig = formConfig.getConfig || {};
-      let dataId = this.dataId;
-      if (dataId) {
-        let reqParam = {id: dataId};
-        let accessParamArguments = [{name: "id", value: dataId}]
-        this.scriptHttp({
-          options: getConfig,
-          params: reqParam,
-          targetFormTemplate: this.formTemplate,
-          accessParamArguments: accessParamArguments,
-          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,56 @@
-<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" :param="param"
+               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,
+      param: {},
+    }
+  },
+  created() {
+    this.init()
+  },
+  methods: {
+    parseViewParam() {
+      let param = {};
+      let rawParam = this.$attrs.param ?? this.$route.query.param;
+      if (rawParam) {
+        if (typeof rawParam === "string") {
+          try {
+            param = JSON.parse(rawParam) || {};
+          } catch (e) {
+            param = {};
+          }
+        } else if (typeof rawParam === "object") {
+          param = { ...rawParam };
+        }
+      }
+      return param;
+    },
+    init() {
+      let formCode = this.$route.query.formCode || this.$attrs.formCode;
+      let dataId = this.$route.query.dataId || this.$attrs.dataId || this.$attrs._dataId;
+      this.param = this.parseViewParam();
+
+      if (dataId && formCode) {
+        this.formCode = formCode;
+        this.dataId = Number(dataId);
+        this.showEdit = true;
+      }
+    }
+  }
+}
+</script>
+<style scoped>
+
+</style>