cloud-web-corejs 1.0.54-dev.461 → 1.0.54-dev.463

package/package.json

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

package/src/components/vb-tabs/x-tabs.vue

@@ -58,6 +58,7 @@ export default {
         param,
         ...tabParam,
       };
+      debugger;
       if (!tab) {
         tab = newTab;
         if (this.tabs.length >= 30) {

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

@@ -7,22 +7,38 @@
     @close="close"
   >
     <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"/>
+      <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">
+        <i class="el-icon-check el-icon"></i>
+        {{ $t2("确 定", "system.button.confirm2") }}
+      </el-button>
+    </span>
   </el-dialog>
 </template>
 
@@ -31,17 +47,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 {
@@ -61,7 +75,8 @@ export default {
       formInsData: null,
       $grid: null,
       currentLayoutType: null,
-      dataId:null
+      dataId: null,
+      formConfig: {},
     };
   },
   computed: {
@@ -71,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,
@@ -88,38 +103,40 @@ 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: {
-    reload(e,option){
+    reload(e, option) {
       let updateParam = option?.updateParam || {};
-      if(this.formConfig)Object.assign(this.formConfig,updateParam)
+      if (this.formConfig) Object.assign(this.formConfig, updateParam);
       this.showRender = false;
       this.getReportTemplate();
     },
@@ -127,12 +144,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 };
 
       let that = this;
       this.$http({
@@ -142,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() {
@@ -173,9 +190,9 @@ export default {
       } else {
         this.close();
       }
-    }
-  }
-}
+    },
+  },
+};
 </script>
 
 <style lang="scss" scoped>
@@ -190,13 +207,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;
+            }
           }
         }
       }
@@ -208,7 +229,7 @@ export default {
       height: calc(100vh - 110px);
 
       &.nfootBtn {
-        height: calc(100vh - 58px)
+        height: calc(100vh - 58px);
       }
     }
   }

package/src/components/xform/form-designer/form-widget/field-widget/print-button-widget.vue

@@ -80,7 +80,10 @@ export default {
         .filter((item) => !!item.code)
         .map((item) => item.code);
       let label = null;
-      if (this.field.options.customLabelEnabled && this.field.options.label) {
+      /* if (this.field.options.customLabelEnabled && this.field.options.label) {
+        label = this.$t1(this.field.options.label);
+      } */
+      if (this.field.options.label) {
         label = this.$t1(this.field.options.label);
       }
       let option = {

package/src/components/xform/form-designer/form-widget/field-widget/print-detail-button-widget.vue

@@ -80,7 +80,10 @@ export default {
         .filter((item) => !!item.code)
         .map((item) => item.code);
       let label = null;
-      if (this.field.options.customLabelEnabled && this.field.options.label) {
+      /* if (this.field.options.customLabelEnabled && this.field.options.label) {
+        label = this.$t1(this.field.options.label);
+      } */
+      if (this.field.options.label) {
         label = this.$t1(this.field.options.label);
       }
       let option = {

package/src/components/xform/form-designer/setting-panel/property-editor/field-print-button/print-button-editor.vue

@@ -3,9 +3,9 @@
     <el-form-item label-width="0">
       <el-divider class="custom-divider">打印设置</el-divider>
     </el-form-item>
-    <el-form-item label="启用自定义按钮名称">
+    <!-- <el-form-item label="启用自定义按钮名称">
       <el-switch v-model="optionModel.customLabelEnabled"></el-switch>
-    </el-form-item>
+    </el-form-item> -->
     <el-form-item label="表格唯一名称">
       <el-input v-model="optionModel.printTableRef"></el-input>
     </el-form-item>

package/src/components/xform/form-designer/setting-panel/property-editor/field-print-button/print-detail-button-editor.vue

@@ -3,9 +3,9 @@
     <el-form-item label-width="0">
       <el-divider class="custom-divider">详情打印设置</el-divider>
     </el-form-item>
-    <el-form-item label="启用自定义按钮名称">
+    <!-- <el-form-item label="启用自定义按钮名称">
       <el-switch v-model="optionModel.customLabelEnabled"></el-switch>
-    </el-form-item>
+    </el-form-item> -->
     <el-form-item label="打印自定义条件参数">
       <a
         href="javascript:void(0);"

package/src/components/xform/form-designer/widget-panel/widgetsConfig.js

@@ -3147,7 +3147,7 @@ export const advancedFields = [
       ...defaultWfConfig,
       ...defaultWidgetShowRuleConfig,
 
-      customLabelEnabled: false,
+      // customLabelEnabled: false,
       printButtonFlag:1,
       printTableRef: "",
       printItems: [],
@@ -3189,7 +3189,7 @@ export const advancedFields = [
       ...defaultWidgetShowRuleConfig,
 
       printDetailButtonFlag:1,
-      customLabelEnabled: false,
+      // customLabelEnabled: false,
       printItems: [],
       printCustomCondition: "return {\n  id:[dataId]\n}",
 

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

@@ -237,7 +237,7 @@ export default {
           tabParam: {
             formCode,
             tabLabelField,
-            tabName: formCode + row[dataId],
+            tabName: formCode + dataId,
           },
         });
       } else {