cloud-web-corejs 1.0.54-dev.315 → 1.0.54-dev.317

package/src/components/wf/wfTaskUserRangeDialog.vue

@@ -47,7 +47,7 @@
 				<i class="el-icon-close el-icon"></i>
 				{{ $t1('取 消') }}
 			</el-button>
-			<el-button type="primary" @click="dialogPrimary" class="button-sty">
+			<el-button type="primary" @click="confirmDialog" class="button-sty">
 				<i class="el-icon-check el-icon"></i>
 				{{ $t1('确 定') }}
 			</el-button>
@@ -126,6 +126,14 @@ export default {
       this.$vxeTableUtil.initVxeTable(tableOption).then(opts => {
         that.vxeOption = opts;
       });
+    },
+    confirmDialog(){
+      let checkRows = this.checkRows;
+      if(!checkRows.length){
+        this.$baseAlert(this.$t1("请选择候选人"));
+        return
+      }
+      this.dialogPrimary(checkRows)
     }
   }
 };

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

@@ -9,7 +9,7 @@
         <span>{{ $t1('导出/打印') }}</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>

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

@@ -0,0 +1,108 @@
+<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>{{ $t1("导出/打印") }}</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 option = {
+        prefix: prefix,
+        codes,
+        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/setting-panel/property-editor/field-print-button/print-button-editor.vue

@@ -6,6 +6,13 @@
     <el-form-item label="表格唯一名称">
       <el-input v-model="optionModel.printTableRef"></el-input>
     </el-form-item>
+    <!-- <el-form-item label="打印自定义条件参数">
+      <a href="javascript:void(0);" class="a-link link-oneLind"
+         @click="editEventHandler('printCustomCondition', printConditionParams)">
+        <span>{{ optionModel.printCustomCondition }}</span>
+        <i class="el-icon-edit"></i>
+      </a>
+    </el-form-item> -->
     <el-form-item label="输出模板编码"></el-form-item>
     <el-form-item label-width="0">
       <draggable tag="ul" class="draggable-box" :list="optionModel.printItems"
@@ -47,6 +54,7 @@ export default {
   data() {
     return {
       eventParams: [],
+      printConditionParams: ["dataId", "formCode", "exportTemplate"]
     };
   },
   methods: {

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

@@ -0,0 +1,91 @@
+<template>
+  <div>
+    <el-form-item label-width="0">
+      <el-divider class="custom-divider">详情打印设置</el-divider>
+    </el-form-item>
+    <el-form-item label="打印自定义条件参数">
+      <a href="javascript:void(0);" class="a-link link-oneLind"
+         @click="editEventHandler('printCustomCondition', printConditionParams)">
+        <span>{{ optionModel.printCustomCondition }}</span>
+        <i class="el-icon-edit"></i>
+      </a>
+    </el-form-item>
+    <el-form-item label="输出模板编码"></el-form-item>
+    <el-form-item label-width="0">
+      <draggable tag="ul" class="draggable-box" :list="optionModel.printItems"
+                 v-bind="{ group: 'optionsGroup', ghostClass: 'ghost', handle: '.drag-option' }">
+        <li v-for="(item, index) in optionModel.printItems" :key="index" class="col-item">
+          <i class="el-icon-s-operation drag-option"></i>
+          <el-input v-model="item.code" class="cell-span-input" style="width: 160px !important;"></el-input>
+          <el-button circle plain size="mini" type="danger" @click="deleteItem(index)"
+                     icon="el-icon-minus" class="col-delete-button" style="position: unset;"></el-button>
+        </li>
+      </draggable>
+      <div>
+        <el-button type="text" @click="addItem" icon="el-icon-circle-plus-outline"
+                   class="add-option">
+          新增
+        </el-button>
+      </div>
+    </el-form-item>
+  </div>
+</template>
+
+<script>
+import i18n from "../../../../../../components/xform/utils/i18n";
+import eventMixin
+  from "../../../../../../components/xform/form-designer/setting-panel/property-editor/event-handler/eventMixin";
+import Draggable from 'vuedraggable';
+
+export default {
+  name: "print-detail-button-editor",
+  mixins: [i18n, eventMixin],
+  components: {
+    Draggable,
+  },
+  props: {
+    designer: Object,
+    selectedWidget: Object,
+    optionModel: Object,
+  },
+  data() {
+    return {
+      eventParams: [],
+      printConditionParams: ["dataId", "formCode", "exportTemplate"]
+    };
+  },
+  methods: {
+    deleteItem(index) {
+      this.optionModel.printItems.splice(index, 1)
+    },
+    addItem() {
+      this.optionModel.printItems.push({code: null});
+    }
+  }
+};
+</script>
+
+<style lang="scss" scoped>
+.option-items-pane ul {
+  padding-inline-start: 6px;
+  padding-left: 6px; /* 重置IE11默认样式 */
+}
+
+li.ghost {
+  background: #fff;
+  border: 2px dotted $--color-primary;
+}
+
+.drag-option {
+  cursor: move;
+}
+
+.small-padding-dialog ::v-deep .el-dialog__body {
+  padding: 10px 15px;
+}
+
+.dialog-footer .el-button {
+  width: 100px;
+}
+</style>
+

package/src/components/xform/form-designer/setting-panel/propertyRegister.js

@@ -149,7 +149,8 @@ const COMMON_PROPERTIES = {
   selectExportFlag: "select-export-button-editor",
   importEntity: "import-button-editor",
   frontImportFlag: "import2-button-editor",
-  printTableRef: "print-button-editor",
+  printButtonFlag: "print-button-editor",
+  printDetailButtonFlag: "print-detail-button-editor",
   statusParam: "field-status-editor",
   // searchDialogEventEnabled: "search-dialog-event-editor"
   clickBindEvent: "clickBindEvent-editor",

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

@@ -3133,8 +3133,50 @@ export const advancedFields = [
       },
       ...defaultWfConfig,
       ...defaultWidgetShowRuleConfig,
+
+      printButtonFlag:1,
       printTableRef: "",
       printItems: [],
+      // printCustomCondition: "",
+
+      showRuleFlag: 1,
+      showRuleEnabled: 1,
+      showRules: [],
+    },
+  },
+  {
+    type: "print-detail-button",
+    icon: "button",
+    commonFlag: !0,
+    columnFlag: true,
+    formItemFlag: !1,
+    options: {
+      name: "",
+      label: "导出/打印",
+      columnWidth: "200px",
+      size: "",
+      // displayStyle: "block",
+      disabled: !1,
+      hidden: !1,
+      type: "primary",
+      /*plain: !1,
+      round: !1,
+      circle: !1,
+      icon: "el-icon-download",*/
+      customClass: "",
+      onCreated: "",
+      onMounted: "",
+      // clickBindEvent: null,
+      onBeforeClickButton: null,
+      searchDialogConfig: {
+        ...defaultSearchDialogConfig,
+      },
+      ...defaultWfConfig,
+      ...defaultWidgetShowRuleConfig,
+
+      printDetailButtonFlag:1,
+      printItems: [],
+      printCustomCondition: "",
 
       showRuleFlag: 1,
       showRuleEnabled: 1,

package/src/components/xform/lang/zh-CN.js

@@ -71,6 +71,7 @@ export default {
       "import-button": "导入按钮",
       "import2-button": "明细导入按钮",
       "print-button": "导出/打印按钮",
+      "print-detail-button": "明细导出/打印按钮",
       "copy_button": "复制按钮",
       "rich-editor": "富文本",
       cascader: "级联选择",

package/src/views/user/form/vform/render.vue

@@ -5,7 +5,7 @@
                      :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" @openCopyEditTab="openCopyEditTab"/>
+                     :dataId.sync="dataId" :param="param" v-bind="$attrs" @openCopyEditTab="openCopyEditTab"/>
     </div>
   </div>