cloud-web-corejs 1.0.54-dev.76 → 1.0.54-dev.761

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

@@ -0,0 +1,13 @@
+<script>
+export default {
+  name: "exportDialog"
+}
+</script>
+
+<template>
+
+</template>
+
+<style scoped>
+
+</style>

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

@@ -0,0 +1,300 @@
+<template>
+  <el-dialog
+    :visible.sync="showDialog"
+    v-el-drag-dialog
+    v-el-dialog-center
+    v-bind="dialogConfig"
+    @close="close"
+  >
+    <div class="cont designer-view" v-bind="bodyConfig" id="containt">
+      <component v-if="showWfContent && wfContent" :is="wfContent" visible-key="showWfContent" :outParam.sync="outParam"
+                 :_dataId.sync="dataId" :defaultShowWfContent="defaultShowWfContent" :_isOutLink="true"
+                 :parent-target="_self"
+                 @reload="$reloadHandle" v-bind="queryParam" v-on="listeners"></component>
+    </div>
+    <span slot="footer" class="dialog-footer" v-if="option.showFooter!==false" v-bind="option.footerConfig">
+			<el-button type="primary" plain class="button-sty" @click="close">
+				<i class="el-icon-close el-icon"></i>
+				{{ $t2('取 消', 'system.button.cancel2') }}
+			</el-button>
+			<el-button type="primary" @click="dialogSubmit" class="button-sty">
+				<i class="el-icon-check el-icon"></i>
+				{{ $t2('确 定', 'system.button.confirm2') }}
+			</el-button>
+		</span>
+  </el-dialog>
+</template>
+
+<script>
+
+export default {
+  components: {},
+  props: {
+    visiable: Boolean,
+    option: Object
+  },
+  mixins: [],
+  inject: ["getFormConfig"],
+
+  mounted() {
+
+  },
+  data() {
+    var that = this;
+    return {
+      showFormField: "_tt",
+      showDialog: true,
+      falseValue: false,
+      selectMulti: true,
+
+      formJson: {},
+      formData: {},
+      optionData: {},
+      showRender: false,
+      formTemplate: {},
+      /*      formCode: null,*/
+      layoutType: null,
+      conditionParam: null,
+      formInsData: null,
+      $grid: null,
+      currentLayoutType: null,
+      dataId: null,
+
+      showWfContent: true,
+      wfContent: null,
+      outParam: null,
+      // dataId: null,
+      defaultShowWfContent: null,
+      queryParam: {},
+      listeners:null
+    };
+  },
+  computed: {
+    formCode() {
+      return this.option.formCode;
+    },
+    dialogParam() {
+      return this.option?.param;
+    },
+    formConfig() {
+      return this.option?.formConfig;
+    },
+    dialogConfig() {
+      let customClass = "dialog-style list-dialog dialog-checkbox pd_0";
+      if (this.option.dialogConfig?.customClass) {
+        customClass = customClass + " " + this.option.dialogConfig.customClass
+      }
+      let config = {
+        title: this.formTemplate.formName,
+        appendToBody: true,
+        modalAppendToBody: true,
+        closeOnClickModal: false,
+        modal: false,
+        width: "1200px",
+        fullscreen: this.option.fullscreen,
+      };
+      config = Object.assign({}, config, this.option.dialogConfig, {customClass});
+      config.title = this.$t1(config.title);
+      return config;
+    },
+    bodyConfig() {
+      let config = {};
+      let classStr = this.currentLayoutType
+      if (this.option.bodyConfig?.class) {
+        classStr = classStr + " " + this.option.bodyConfig.class;
+      }
+      if (this.option.showFooter == false) {
+        classStr = classStr + " nfootBtn";
+      }
+      config = Object.assign({}, config, this.option.bodyConfig, {class: classStr});
+      return config;
+    }
+  },
+  created() {
+    /*let dataId = this.option?.formConfig?.dataId??null
+    delete this.option?.formConfig?.dataId
+    this.dataId = dataId;*/
+
+    let currentFormConfig = this.getFormConfig();
+    this.currentLayoutType = currentFormConfig.layoutType
+
+    // this.selectMulti = this.option.multiple ?? true;
+    this.initData();
+  },
+  methods: {
+    initData() {
+      const isMobile = /iPhone|iPad|iPod|Android/i.test(navigator.userAgent);
+      let queryParam = this.$baseLodash.cloneDeep(this.dialogParam);
+      let murl = queryParam.urlmobile;
+      let purl = murl && isMobile ? murl : queryParam.url;
+      let dataId = queryParam.dataId??null;
+      if (purl == '/index') {
+        location.hash = '/home';
+        location.reload();
+        return;
+      }
+
+      this.dataId = dataId;
+      if (queryParam.showWfContent == 'true') {
+        this.defaultShowWfContent = true;
+      }
+
+      delete queryParam.urlmobile;
+      delete queryParam.url;
+
+      if (purl.indexOf('.html') >= 0) {
+        let eUrl = purl;
+        let pstr = Object.keys(queryParam).map(key => {
+          return key + "=" + queryParam[key]
+        }).join("&")
+
+        if (pstr) {
+          if (purl.indexOf('.html?') >= 0) {
+            eUrl = eUrl + '&' + pstr
+          } else {
+            eUrl = eUrl + '?' + pstr
+          }
+        }
+
+        location.href = eUrl;
+        return
+      }
+
+      delete queryParam.dataId;
+      delete queryParam.showWfContent;
+      delete queryParam.access_token;
+      delete queryParam.tp;
+      delete queryParam.thirdparty_info;
+      delete queryParam.i18nLang;
+
+      let url = purl + '.vue';
+      this.queryParam = queryParam;
+      let listeners= this.option?.on;
+      this.listeners = listeners;
+
+      this.showWfContent = true;
+
+      let t = "@base/views";
+      let urlArr = [
+        '/user/bill_setting/h5_view.vue',
+        '/user/form/view/list.vue',
+        '/user/form/view/edit.vue'
+      ]
+
+      if (urlArr.includes(url)) {
+        this.wfContent = require('@base/views' + url).default;
+      } else if (url.startsWith(t)) {
+        let path = url.slice(t.length);
+        this.wfContent = require('@base/views' + path).default;
+      } else {
+        this.wfContent = require('@/views' + url).default;
+      }
+    },
+
+
+    reload(e, option) {
+      let updateParam = option?.updateParam || {};
+      Object.assign(this.formConfig, updateParam)
+      this.showRender = false;
+      this.getReportTemplate();
+    },
+    async getReportTemplate(callback) {
+      let param = {
+        objTypeCode: this.$attrs.objTypeCode,
+        objId: this.$attrs.objId,
+        taskId: this.$attrs.taskId
+      };
+      this.conditionParam = param;
+      let url, data;
+      url = USER_PREFIX + `/formTemplate/getByFormCode`;
+      data = {stringOne: this.formCode}
+
+      let that = this;
+      this.$http({
+        url: url,
+        method: `post`,
+        data: data,
+        isLoading: true,
+        loadingTarget: document.body,
+        modalStrictly: true,
+        success: res => {
+          let formTemplate = res.objx || {};
+          this.formTemplate = formTemplate;
+          this.formJson = formTemplate.formViewContent ? JSON.parse(formTemplate.formViewContent) : {};
+          this.layoutType = this.formJson.formConfig.layoutType
+          let formConfig = this.formJson.formConfig;
+          if (formConfig.searchDialogUniqueField) {
+            this.fieldKey = formConfig.searchDialogUniqueField;
+          }
+
+          this.showRender = true;
+
+
+        }
+      });
+    },
+    close() {
+      let formRef = this.$refs.vFormRef;
+      this.showDialog = false;
+      this.$emit('update:visiable', false);
+      this.option.close && this.option.close(formRef, this);
+    },
+    dialogSubmit() {
+      let formRef = this.$refs.vFormRef;
+      if (this.option.confirm) {
+        if (this.option.confirm(formRef, this) !== false) {
+          this.close();
+        }
+      } else {
+        this.close();
+      }
+    }
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+::v-deep .H5 .h5-fixed-bottom-btns {
+  bottom: 95px;
+}
+
+.list-dialog {
+  .el-dialog__body {
+    height: calc(100% - 42px);
+
+    .cont {
+      height: calc(100vh - 210px);
+
+      &.nfootBtn {
+        height: calc(100vh - 158px)
+      }
+
+      &#containt {
+        padding: 0;
+
+        ::v-deep .grid-container {
+          outline: none;
+
+          &.detail-wrap .d-cont {
+            height: calc(100vh - 150px);
+
+            .title .field-wrapper {
+              display: inline-block !important
+            }
+          }
+        }
+      }
+    }
+  }
+
+  &.is-fullscreen .el-dialog__body {
+    .cont {
+      height: calc(100vh - 110px);
+
+      &.nfootBtn {
+        height: calc(100vh - var(--xform-dialog-body-offset, 58px))
+      }
+    }
+  }
+}
+</style>

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

@@ -6,23 +6,39 @@
     v-bind="dialogConfig"
     @close="close"
   >
-    <div class="cont" v-bind="bodyConfig" id="containt">
-      <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()" v-bind="formConfig" :param="dialogParam"
-                     class="data-table_height"/>
+    <div class="cont designer-view" v-bind="bodyConfig" id="containt">
+      <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="reload"
+        v-bind="formConfig"
+        :param="dialogParam"
+        class="data-table_height"
+      />
     </div>
-    <span slot="footer" class="dialog-footer" v-if="option.showFooter!==false" v-bind="option.footerConfig">
-			<el-button type="primary" plain class="button-sty" @click="close">
-				<i class="el-icon-close el-icon"></i>
-				{{ $t2('取 消', 'system.button.cancel2') }}
-			</el-button>
-			<el-button type="primary" @click="dialogSubmit" class="button-sty">
-				<i class="el-icon-check el-icon"></i>
-				{{ $t2('确 定', 'system.button.confirm2') }}
-			</el-button>
-		</span>
+    <span
+      slot="footer"
+      class="dialog-footer"
+      v-if="option.showFooter !== false"
+      v-bind="option.footerConfig"
+    >
+      <el-button type="primary" plain class="button-sty" @click="close">
+        <i class="el-icon-close el-icon"></i>
+        {{ $t2("取 消", "system.button.cancel2") }}
+      </el-button>
+      <el-button type="primary" @click="dialogSubmit" class="button-sty" v-if="confirmButtonVisible">
+        <i class="el-icon-check el-icon"></i>
+        {{ $t2("确 定", "system.button.confirm2") }}
+      </el-button>
+    </span>
   </el-dialog>
 </template>
 
@@ -30,17 +46,15 @@
 import VFormRender from "../../../../../components/xform/form-render/index.vue";
 
 export default {
-  // name: "vabSearchDialog",
-  components: {VFormRender},
+  components: { VFormRender },
   props: {
     visiable: Boolean,
-    option: Object
+    option: Object,
   },
   mixins: [],
   inject: ["getFormConfig"],
-  mounted() {
 
-  },
+  mounted() {},
   data() {
     var that = this;
     return {
@@ -59,7 +73,10 @@ export default {
       conditionParam: null,
       formInsData: null,
       $grid: null,
-      currentLayoutType: null
+      currentLayoutType: null,
+      dataId: null,
+      formConfig: {},
+      confirmButtonVisible: true
     };
   },
   computed: {
@@ -69,13 +86,13 @@ export default {
     dialogParam() {
       return this.option?.param;
     },
-    formConfig() {
+    /* formConfig() {
       return this.option?.formConfig;
-    },
+    }, */
     dialogConfig() {
       let customClass = "dialog-style list-dialog dialog-checkbox pd_0";
       if (this.option.dialogConfig?.customClass) {
-        customClass = customClass + " " + this.option.dialogConfig.customClass
+        customClass = customClass + " " + this.option.dialogConfig.customClass;
       }
       let config = {
         title: this.formTemplate.formName,
@@ -86,41 +103,53 @@ export default {
         width: "1200px",
         fullscreen: this.option.fullscreen,
       };
-      config = Object.assign({}, config, this.option.dialogConfig, {customClass});
+      config = Object.assign({}, config, this.option.dialogConfig, { customClass });
       config.title = this.$t1(config.title);
       return config;
     },
     bodyConfig() {
       let config = {};
-      let classStr = this.currentLayoutType
+      let classStr = this.currentLayoutType;
       if (this.option.bodyConfig?.class) {
         classStr = classStr + " " + this.option.bodyConfig.class;
       }
       if (this.option.showFooter == false) {
         classStr = classStr + " nfootBtn";
       }
-      config = Object.assign({}, config, this.option.bodyConfig, {class: classStr});
+      config = Object.assign({}, config, this.option.bodyConfig, { class: classStr });
       return config;
-    }
+    },
   },
   created() {
+    /*let dataId = this.option?.formConfig?.dataId??null
+    delete this.option?.formConfig?.dataId
+    this.dataId = dataId;*/
+
+    this.formConfig = this.option?.formConfig || {};
+
     let currentFormConfig = this.getFormConfig();
-    this.currentLayoutType = currentFormConfig.layoutType
+    this.currentLayoutType = currentFormConfig.layoutType;
 
     this.selectMulti = this.option.multiple ?? true;
     this.getReportTemplate();
   },
   methods: {
-    async getReportTemplate() {
+    reload(e, option) {
+      let updateParam = option?.updateParam || {};
+      if (this.formConfig) Object.assign(this.formConfig, updateParam);
+      this.showRender = false;
+      this.getReportTemplate();
+    },
+    async getReportTemplate(callback) {
       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 };
 
       let that = this;
       this.$http({
@@ -130,26 +159,26 @@ export default {
         isLoading: true,
         loadingTarget: document.body,
         modalStrictly: true,
-        success: res => {
+        success: (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;
           let formConfig = this.formJson.formConfig;
           if (formConfig.searchDialogUniqueField) {
             this.fieldKey = formConfig.searchDialogUniqueField;
           }
 
           this.showRender = true;
-
-
-        }
+        },
       });
     },
     close() {
       let formRef = this.$refs.vFormRef;
       this.showDialog = false;
-      this.$emit('update:visiable', false);
+      this.$emit("update:visiable", false);
       this.option.close && this.option.close(formRef, this);
     },
     dialogSubmit() {
@@ -161,9 +190,12 @@ export default {
       } else {
         this.close();
       }
+    },
+    setConfirmButtonHidden(val){
+      this.confirmButtonVisible = val || false;
     }
-  }
-}
+  },
+};
 </script>
 
 <style lang="scss" scoped>
@@ -178,13 +210,17 @@ export default {
       height: calc(100vh - 210px);
 
       &.nfootBtn {
-        height: calc(100vh - 158px)
+        height: calc(100vh - 158px);
       }
-      &#containt{
-        padding:0;
-        ::v-deep .grid-container{outline: none;
-          &.detail-wrap .d-cont{height:calc(100vh - 150px);
-            .title .field-wrapper{display:inline-block !important}
+      &#containt {
+        padding: 0;
+        ::v-deep .grid-container {
+          outline: none;
+          &.detail-wrap .d-cont {
+            height: calc(100vh - 150px);
+            .title .field-wrapper {
+              display: inline-block !important;
+            }
           }
         }
       }
@@ -196,7 +232,7 @@ export default {
       height: calc(100vh - 110px);
 
       &.nfootBtn {
-        height: calc(100vh - 58px)
+        height: calc(100vh - var(--xform-dialog-body-offset, 58px));
       }
     }
   }

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

@@ -4,7 +4,7 @@
       <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()" :param="dialogParam"
+                     @reload="reload" :param="dialogParam"
                      class="data-table_height"/>
     </div>
     <span class="dialog-footer" v-if="option.showFooter!==false" v-bind="option.footerConfig">
@@ -24,7 +24,6 @@
 import VFormRender from "../../../../../components/xform/form-render/index.vue";
 
 export default {
-  // name: "vabSearchDialog",
   components: {VFormRender},
   props: {
     visiable: Boolean,
@@ -105,6 +104,10 @@ export default {
     this.getReportTemplate();
   },
   methods: {
+    reload(){
+      this.showRender = false;
+      this.getReportTemplate();
+    },
     async getReportTemplate() {
       let param = {
         objTypeCode: this.$attrs.objTypeCode,
@@ -199,7 +202,7 @@ export default {
       height: calc(100vh - 110px);
 
       &.nfootBtn {
-        height: calc(100vh - 58px)
+        height: calc(100vh - var(--xform-dialog-body-offset, 58px))
       }
     }
   }