cloud-web-corejs 1.0.54-dev.51 → 1.0.54-dev.510

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

@@ -1,29 +1,38 @@
 <template>
   <static-content-wrapper
-    :designer="designer" :field="field" :design-state="designState"
+    :designer="designer"
+    :field="field"
+    :design-state="designState"
     :display-style="field.options.displayStyle"
-    :parent-widget="parentWidget" :parent-list="parentList"
-    :index-of-parent-list="indexOfParentList">
+    :parent-widget="parentWidget"
+    :parent-list="parentList"
+    :index-of-parent-list="indexOfParentList"
+  >
     <el-dropdown trigger="hover" v-if="designState" :disabled="field.options.disabled">
       <el-button type="primary" class="button-sty" size="mini">
-        <span>{{ $t1('导出/打印') }}</span><span class="line"></span> <i class="el-icon-arrow-down el-icon--right"></i>
+        <span>{{ getI18nLabel(field.options.label) }}</span
+        ><span class="line"></span>
+        <i class="el-icon-arrow-down el-icon--right"></i>
       </el-button>
     </el-dropdown>
-    <base-input-export :option="exportOption" :parent-target="_self" :disabled="field.options.disabled" v-else/>
+    <base-input-export
+      :option="exportOption"
+      :parent-target="getFormRef()"
+      :disabled="field.options.disabled"
+      v-else
+    />
   </static-content-wrapper>
-
 </template>
 <script>
-import emitter from '../../../../../components/xform/utils/emitter'
+import emitter from "../../../../../components/xform/utils/emitter";
 import i18n from "../../../../../components/xform/utils/i18n";
 import fieldMixin from "../../../../../components/xform/form-designer/form-widget/field-widget/fieldMixin";
-import StaticContentWrapper
-  from "../../../../../components/xform/form-designer/form-widget/field-widget/static-content-wrapper.vue";
+import StaticContentWrapper from "../../../../../components/xform/form-designer/form-widget/field-widget/static-content-wrapper.vue";
 
 export default {
   name: "print-button-widget",
-  components: {StaticContentWrapper},
-  componentName: 'FieldWidget',  //必须固定为FieldWidget，用于接收父级组件的broadcast事件
+  components: { StaticContentWrapper },
+  componentName: "FieldWidget", //必须固定为FieldWidget，用于接收父级组件的broadcast事件
   mixins: [emitter, fieldMixin, i18n],
   props: {
     field: Object,
@@ -33,13 +42,13 @@ export default {
     designer: Object,
     designState: {
       type: Boolean,
-      default: false
-    }
+      default: false,
+    },
   },
   data() {
     return {
-      exportOption: {}
-    }
+      exportOption: {},
+    };
   },
   beforeCreate() {
     /* 这里不能访问方法和属性！！ */
@@ -48,18 +57,18 @@ export default {
     this.init();
     /* 注意：子组件mounted在父组件created之后、父组件mounted之前触发，故子组件mounted需要用到的prop
        需要在父组件created中初始化！！ */
-    this.registerToRefList()
-    this.initEventHandler()
+    this.registerToRefList();
+    this.initEventHandler();
 
-    this.handleOnCreated()
+    this.handleOnCreated();
   },
 
   mounted() {
-    this.handleOnMounted()
+    this.handleOnMounted();
   },
 
   beforeDestroy() {
-    this.unregisterFromRefList()
+    this.unregisterFromRefList();
   },
 
   methods: {
@@ -67,25 +76,33 @@ export default {
       if (this.designState) return;
       let prefix = "/" + this.getFormRef().reportTemplate.serviceName;
       // let printOption = this.handleCustomEvent(this.field.options.printOption);
-      let codes = this.field.options.printItems.filter(item => !!item.code).map(item => item.code);
+      let codes = this.field.options.printItems
+        .filter((item) => !!item.code)
+        .map((item) => item.code);
+      let label = null;
+      /* 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 = {
         prefix: prefix,
         tableTarget: () => {
           return this.getWidgetRef(this.field.options.printTableRef).getGridTable();
         },
         codes,
+        label,
         // codes: ["USEREXCEL", "USERPDF", "USERPRINT", "USERHIPRINT", "USERJDPRINT", "USERPDDPRINT", "USERVIPPRINT"],
         // ...printOption
       };
-      console.log("a:", option)
+      console.log("a:", option);
       this.exportOption = option;
-    }
-  }
-
-}
+    },
+  },
+};
 </script>
 
 <style lang="scss" scoped>
 @import "~@/styles/global.scss"; //* static-content-wrapper已引入，还需要重复引入吗？ *//
-
 </style>

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

@@ -0,0 +1,116 @@
+<template>
+  <static-content-wrapper
+    :designer="designer"
+    :field="field"
+    :design-state="designState"
+    :display-style="field.options.displayStyle"
+    :parent-widget="parentWidget"
+    :parent-list="parentList"
+    :index-of-parent-list="indexOfParentList"
+  >
+    <el-dropdown trigger="hover" v-if="designState" :disabled="field.options.disabled">
+      <el-button type="primary" class="button-sty" size="mini">
+        <span>{{ getI18nLabel(field.options.label) }}</span
+        ><span class="line"></span>
+        <i class="el-icon-arrow-down el-icon--right"></i>
+      </el-button>
+    </el-dropdown>
+    <base-input-export
+      :option="exportOption"
+      :parent-target="getFormRef()"
+      :disabled="field.options.disabled"
+      v-else
+    />
+  </static-content-wrapper>
+</template>
+<script>
+import emitter from "../../../../../components/xform/utils/emitter";
+import i18n from "../../../../../components/xform/utils/i18n";
+import fieldMixin from "../../../../../components/xform/form-designer/form-widget/field-widget/fieldMixin";
+import StaticContentWrapper from "../../../../../components/xform/form-designer/form-widget/field-widget/static-content-wrapper.vue";
+
+export default {
+  name: "print-detail-button-widget",
+  components: { StaticContentWrapper },
+  componentName: "FieldWidget", //必须固定为FieldWidget，用于接收父级组件的broadcast事件
+  mixins: [emitter, fieldMixin, i18n],
+  props: {
+    field: Object,
+    parentWidget: Object,
+    parentList: Array,
+    indexOfParentList: Number,
+    designer: Object,
+    designState: {
+      type: Boolean,
+      default: false,
+    },
+  },
+  data() {
+    return {
+      exportOption: {},
+    };
+  },
+  beforeCreate() {
+    /* 这里不能访问方法和属性！！ */
+  },
+  created() {
+    this.init();
+    /* 注意：子组件mounted在父组件created之后、父组件mounted之前触发，故子组件mounted需要用到的prop
+       需要在父组件created中初始化！！ */
+    this.registerToRefList();
+    this.initEventHandler();
+
+    this.handleOnCreated();
+  },
+
+  mounted() {
+    this.handleOnMounted();
+  },
+
+  beforeDestroy() {
+    this.unregisterFromRefList();
+  },
+
+  methods: {
+    init() {
+      if (this.designState) return;
+      let prefix = "/" + this.getFormRef().reportTemplate.serviceName;
+      // let printOption = this.handleCustomEvent(this.field.options.printOption);
+      let codes = this.field.options.printItems
+        .filter((item) => !!item.code)
+        .map((item) => item.code);
+      let label = null;
+      /* 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 = {
+        prefix: prefix,
+        codes,
+        label,
+        customCondition: (exportTemplate) => {
+          let param = {
+            formData: this.formModel,
+          };
+          if (this.field.options.printCustomCondition) {
+            let param1 = this.handleCustomEvent(
+              this.field.options.printCustomCondition,
+              ["exportTemplate"],
+              [exportTemplate]
+            );
+            if (param1) param = param1;
+          }
+          return param;
+        },
+      };
+      this.exportOption = option;
+    },
+  },
+};
+</script>
+
+<style lang="scss" scoped>
+@import "~@/styles/global.scss"; //* static-content-wrapper已引入，还需要重复引入吗？ *//
+</style>

package/src/components/xform/form-designer/form-widget/field-widget/project-tag-widget.vue

@@ -1,23 +1,60 @@
 <template>
-  <form-item-wrapper :designer="designer" :field="field" :rules="rules" :design-state="designState"
-                     :parent-widget="parentWidget" :parent-list="parentList" :index-of-parent-list="indexOfParentList"
-                     :sub-form-row-index="subFormRowIndex" :sub-form-col-index="subFormColIndex"
-                     :sub-form-row-id="subFormRowId">
-    <el-button icon="el-icon-plus" type="warning" class="el-button-tag" v-if="designState"></el-button>
-    <projectTagView v-else v-model="fieldModel" :readonly="field.options.readonly"></projectTagView>
+  <form-item-wrapper
+    :designer="designer"
+    :field="field"
+    :rules="rules"
+    :design-state="designState"
+    :parent-widget="parentWidget"
+    :parent-list="parentList"
+    :index-of-parent-list="indexOfParentList"
+    :sub-form-row-index="subFormRowIndex"
+    :sub-form-col-index="subFormColIndex"
+    :sub-form-row-id="subFormRowId"
+  >
+    <el-button
+      icon="el-icon-plus"
+      type="warning"
+      class="el-button-tag"
+      v-if="designState"
+    ></el-button>
+    <div v-else>
+      <el-tag
+        v-for="(tag, index) in fieldModel"
+        :key="index"
+        type="warning"
+        :disable-transitions="false"
+        :closable="!field.options.disabled && field.options.tabDeleteEnabled"
+        @close="deleteCallback(index)"
+      >
+        <el-tooltip
+          :enterable="false"
+          effect="dark"
+          :content="tag[field.options.tagLabelField]"
+          placement="bottom"
+        >
+          <span :style="tagStyle">{{ tag[field.options.tagLabelField] }}</span>
+        </el-tooltip>
+      </el-tag>
+      <el-button
+        icon="el-icon-plus"
+        type="warning"
+        class="el-button-tag"
+        @click="openProjectTagDialog"
+        v-if="!field.options.disabled"
+      ></el-button>
+    </div>
   </form-item-wrapper>
 </template>
 
 <script>
-import FormItemWrapper from './form-item-wrapper'
-import emitter from '../../../../../components/xform/utils/emitter'
+import FormItemWrapper from "./form-item-wrapper";
+import emitter from "../../../../../components/xform/utils/emitter";
 import i18n from "../../../../../components/xform/utils/i18n";
 import fieldMixin from "../../../../../components/xform/form-designer/form-widget/field-widget/fieldMixin";
-import projectTagView from "../../../../../components/projectTag/view.vue";
 
 export default {
   name: "project-tag-widget",
-  componentName: 'FieldWidget',  //必须固定为FieldWidget，用于接收父级组件的broadcast事件
+  componentName: "FieldWidget", //必须固定为FieldWidget，用于接收父级组件的broadcast事件
   mixins: [emitter, fieldMixin, i18n],
   props: {
     field: Object,
@@ -28,38 +65,37 @@ export default {
 
     designState: {
       type: Boolean,
-      default: false
+      default: false,
     },
 
-    subFormRowIndex: { /* 子表单组件行索引，从0开始计数 */
-      type: Number,
-      default: -1
+    subFormRowIndex: {
+      /* 子表单组件行索引，从0开始计数 */ type: Number,
+      default: -1,
     },
-    subFormColIndex: { /* 子表单组件列索引，从0开始计数 */
-      type: Number,
-      default: -1
+    subFormColIndex: {
+      /* 子表单组件列索引，从0开始计数 */ type: Number,
+      default: -1,
+    },
+    subFormRowId: {
+      /* 子表单组件行Id，唯一id且不可变 */ type: String,
+      default: "",
     },
-    subFormRowId: { /* 子表单组件行Id，唯一id且不可变 */
-      type: String,
-      default: ''
-    }
   },
   components: {
-    projectTagView,
     FormItemWrapper,
   },
-  inject: ['refList', 'globalOptionData', 'globalModel', 'getFormConfig'],
+  inject: ["refList", "globalOptionData", "globalModel", "getFormConfig"],
   data() {
     return {
       oldFieldValue: [], //field组件change之前的值
       fieldModel: [],
       rules: [],
-    }
+    };
   },
   watch: {
     fieldModel(val) {
       this.handleChangeEvent(val);
-    }
+    },
   },
   computed: {
     formDataId() {
@@ -71,7 +107,18 @@ export default {
     },
     multi() {
       return this.limit !== 1;
-    }
+    },
+    tagStyle() {
+      let result = {};
+      let tagWidth = this.field.options.tagWidth;
+      if (tagWidth) {
+        result.width = tagWidth;
+        // result.overflow = "hidden";
+        result.textOverflow = "ellipsis";
+        // result.whiteSpace = "nowrap";
+      }
+      return result;
+    },
   },
   beforeCreate() {
     /* 这里不能访问方法和属性！！ */
@@ -81,21 +128,20 @@ export default {
     /* 注意：子组件mounted在父组件created之后、父组件mounted之前触发，故子组件mounted需要用到的prop
        需要在父组件created中初始化！！ */
 
+    this.initFieldModel();
+    this.registerToRefList();
+    this.initEventHandler();
+    this.buildFieldRules();
 
-    this.initFieldModel()
-    this.registerToRefList()
-    this.initEventHandler()
-    this.buildFieldRules()
-
-    this.handleOnCreated()
+    this.handleOnCreated();
   },
 
   mounted() {
-    this.handleOnMounted()
+    this.handleOnMounted();
   },
 
   beforeDestroy() {
-    this.unregisterFromRefList()
+    this.unregisterFromRefList();
   },
   methods: {
     loadDataDefaultHandle() {
@@ -103,9 +149,9 @@ export default {
       let reportTemplate = this.getFormRef().reportTemplate;
       let formCode = reportTemplate.formCode;
       let formScriptEnabled = this.field.options.formScriptEnabled || false;
-      let scriptCode = this.field.options.formScriptCode || "getList"
+      let scriptCode = this.field.options.formScriptCode || "getList";
       if (!scriptCode) return;
-      let accessParam = this.handleCustomEvent(this.field.options.formScriptParam)
+      let accessParam = this.handleCustomEvent(this.field.options.formScriptParam);
       return this.formHttp({
         scriptCode: scriptCode,
         data: {
@@ -114,18 +160,77 @@ export default {
           taBm: this.fieldKeyName,
           data: {
             ...accessParam,
-            id: dataId
-          }
+            id: dataId,
+          },
         },
-        callback: res => {
+        callback: (res) => {
           let rows = res.objx || [];
-          this.setValue(rows)
+          this.setValue(rows);
+          this.handleCustomEvent(this.field.options.formScriptSuccess, ["res"], [res]);
+        },
+      });
+    },
+    openProjectTagDialog() {
+      if (this.field.options.onClick) {
+        this.handleCustomEvent(this.field.options.onClick);
+        return;
+      }
+      let formCode = this.field.options.tagFormCode;
+      let tagLabelField = this.field.options.tagLabelField;
+      let tagUniqueField = this.field.options.tagUniqueField;
+      let tagFormLabelField = this.field.options.tagFormLabelField;
+      let tagFormUniqueField = this.field.options.tagFormUniqueField;
+      /*let checkRows = this.fieldModel.map(item => {
+        return {
+          [tagFormUniqueField]: item[tagUniqueField] ?? null,
+          [tagFormLabelField]: item[tagLabelField] ?? null,
         }
+      })*/
+      let queryParam = null;
+      if (this.field.options.tagFormParam) {
+        queryParam = this.handleCustomEvent(this.field.options.tagFormParam);
+      }
+      this.getFormRef().openSearchDialog({
+        formCode,
+        queryParam,
+        // rows: checkRows,
+        multiple: true,
+        confirm: (rows) => {
+          if (!this.field.options.tagConfirmCallback) {
+            let tagFillConfig = this.field.options.tagFillConfig || [];
+            let items = rows.map((item) => {
+              let newData = {
+                [tagUniqueField]: item[tagFormUniqueField],
+                [tagLabelField]: item[tagFormLabelField],
+              };
+              tagFillConfig.forEach((item1) => {
+                newData[item1.targetField] = item[item1.sourceField];
+              });
+              return newData;
+            });
+            this.addTagData(items);
+          } else {
+            this.handleCustomEvent(
+              this.field.options.tagConfirmCallback,
+              ["rows"],
+              [rows]
+            );
+          }
+        },
       });
-
     },
-  }
-}
+    addTagData(rows) {
+      let tagUniqueField = this.field.options.tagUniqueField;
+      let keys = this.fieldModel.map((item) => item[tagUniqueField]);
+      let items = rows.filter((item) => !keys.includes(item[tagUniqueField]));
+      this.fieldModel.push(...items);
+    },
+    deleteCallback(index) {
+      this.fieldModel.splice(index, 1);
+      this.handleCustomEvent(this.field.options.tagDeleteCallback);
+    },
+  },
+};
 </script>
 
 <style lang="scss" scoped>
@@ -136,17 +241,19 @@ export default {
 }
 
 .hideUploadDiv {
-  ::v-deep div.el-upload--picture-card { /* 隐藏最后的图片上传按钮 */
+  ::v-deep div.el-upload--picture-card {
+    /* 隐藏最后的图片上传按钮 */
     display: none;
   }
 
-  ::v-deep div.el-upload--text { /* 隐藏最后的文件上传按钮 */
+  ::v-deep div.el-upload--text {
+    /* 隐藏最后的文件上传按钮 */
     display: none;
   }
 
-  ::v-deep div.el-upload__tip { /* 隐藏最后的文件上传按钮提示 */
+  ::v-deep div.el-upload__tip {
+    /* 隐藏最后的文件上传按钮提示 */
     display: none;
   }
 }
-
 </style>

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

@@ -2,20 +2,23 @@
   <form-item-wrapper :designer="designer" :field="field" :rules="rules" :design-state="designState"
                      :parent-widget="parentWidget" :parent-list="parentList" :index-of-parent-list="indexOfParentList"
                      :sub-form-row-index="subFormRowIndex" :sub-form-col-index="subFormColIndex" :sub-form-row-id="subFormRowId">
-    <el-radio-group ref="fieldEditor" v-model="fieldModel"
+    <el-radio-group ref="fieldEditor" v-model="fieldModel" v-show="!isReadMode"
                     :disabled="field.options.disabled" :size="field.options.size"
                     @change="handleChangeEvent">
       <template v-if="!!field.options.buttonStyle">
-        <el-radio-button v-for="(item, index) in field.options.optionItems" :key="index" :label="item.value"
+        <el-radio-button v-for="(item, index) in optionItems" :key="index" :label="item.value"
                          :disabled="item.disabled" :border="field.options.border"
                          :style="{display: field.options.displayStyle}">{{ getI18nLabel(item.label) }}</el-radio-button>
       </template>
       <template v-else>
-        <el-radio v-for="(item, index) in field.options.optionItems" :key="index" :label="item.value"
+        <el-radio v-for="(item, index) in optionItems" :key="index" :label="item[valueField]"
                   :disabled="item.disabled" :border="field.options.border"
-                  :style="{display: field.options.displayStyle}">{{ getI18nLabel(item.label) }}</el-radio>
+                  :style="{display: field.options.displayStyle}">{{ getI18nLabel(item[labelField]) }}</el-radio>
       </template>
     </el-radio-group>
+    <template v-if="isReadMode">
+      <span class="readonly-mode-field">{{optionLabel}}</span>
+    </template>
   </form-item-wrapper>
 </template>
 
@@ -67,7 +70,24 @@
       }
     },
     computed: {
-
+      labelField(){
+        return this.getOptionItemLabelKey();
+      },
+      valueField(){
+        return this.getOptionItemValueKey();
+      },
+      optionItems(){
+        return this.getOptionItems();
+      },
+      fieldModelLabel() {
+        // let fieldModel = this.fieldModel;
+        // let optionItems = this.field.options.optionItems;
+        // let valueField = this.valueField;
+        // let labelField = this.labelField;
+        // let optionItem = optionItems.find(item => item[valueField] === fieldModel)
+        // return optionItem && optionItem[labelField] ? optionItem[labelField] : null;
+        return this.getOptionLabel();
+      },
     },
     beforeCreate() {
       /* 这里不能访问方法和属性！！ */
@@ -78,8 +98,8 @@
       /* 注意：子组件mounted在父组件created之后、父组件mounted之前触发，故子组件mounted需要用到的prop
          需要在父组件created中初始化！！ */
       this.handleCreatedEnterEvent();
-      this.initOptionItems()
       this.initFieldModel()
+      this.initOptionItemsHandle()
       this.registerToRefList()
       this.initEventHandler()
       this.buildFieldRules()

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

@@ -5,8 +5,8 @@
                           :index-of-parent-list="indexOfParentList"
                           :sub-form-row-index="subFormRowIndex" :sub-form-col-index="subFormColIndex"
                           :sub-form-row-id="subFormRowId">
-    <el-button class="button-sty" @click="handleButtonWidgetClick" icon="el-icon-search">
-      {{ field.options.label }}
+    <el-button class="button-sty" @click="handleButtonWidgetClick" icon="el-icon-search" :disabled="!designState &&field.options.disabled">
+      {{ getI18nLabel(field.options.label)}}
     </el-button>
   </static-content-wrapper>
 </template>