cloud-web-corejs 1.0.54-dev.273 → 1.0.54-dev.275

package/src/components/wf/content.vue

@@ -77,7 +77,7 @@
         </div>
         <div v-show="tabIndex=='1'">
           <div class="title-five"><b>任务流程</b></div>
-          <div class="task-situation">
+          <div class="task-situation" style="padding-left: 14px;">
             <div class="item" v-for="wftaskLineData in wftaskData" :key="wftaskLineData.id">
               <div class="time">
                 {{ wftaskLineData.approveTime ? wftaskLineData.approveTime.substring(0, 10) : '' }}
@@ -110,14 +110,11 @@
           </div>
           <div class="postscript-box">
             <div class='item' v-for="(item,index) in wfMemoData" :key="index">
-              <div class="clearfix">
-                <div class="name">{{$t1("操作人")}}：{{item.operatorName}}</div>
-                <div class="time">{{item.createDate}}</div>
-              </div>
-              <div class="txt">{{$t1("内容")}}：{{item.content}}</div>
-              <div class="attach-box">
+              <div class="txt">{{item.content}}</div>
+              <div class="attach-box" v-if="item.attachmentDTOs && item.attachmentDTOs.length">
                 <baseUpload accept="file" multi="true" :edit="false" :widgetSize="1" :file.sync="item.attachmentDTOs"></baseUpload>
               </div>
+              <div class="time">{{item.createDate}}</div>
             </div>
           </div>
         </div>

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

@@ -0,0 +1,86 @@
+<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-button :type="field.options.type" class="button-sty" size="mini" icon="el-icon-upload2" @click="toDo('selected')"
+               :disabled="field.options.disabled">{{ getI18nLabel(field.options.label)}}
+    </el-button>
+  </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: 'select-export-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 {}
+  },
+  beforeCreate() {
+    /* 这里不能访问方法和属性！！ */
+  },
+
+  created() {
+    /* 注意：子组件mounted在父组件created之后、父组件mounted之前触发，故子组件mounted需要用到的prop
+       需要在父组件created中初始化！！ */
+    this.registerToRefList()
+    this.initEventHandler()
+
+    this.handleOnCreated()
+  },
+
+  mounted() {
+    this.handleOnMounted()
+  },
+
+  beforeDestroy() {
+    this.unregisterFromRefList()
+  },
+
+  methods: {
+    toDo(type = null) {
+      if (this.designState) {
+        return
+      }
+      let opt = {
+        title: this.field.options.exportFileName || null,
+        targetRef: this.field.options.tableRef || null,
+        pageSize: (this.field.options.exportPageSize || null),
+        showImageAtTable: this.field.options.showImageAtTable || null
+      };
+      let tableExportParam = this.handleCustomEvent(this.field.options.tableExportParam);
+      let options = {...opt, ...tableExportParam, type: type};
+      let tableRef = options?.targetRef;
+      delete options.targetRef
+      let tableWidget = this.getWidgetRef(tableRef);
+      tableWidget.exportData(options)
+    }
+  }
+
+}
+</script>
+
+<style lang="scss" scoped>
+@import "~@/styles/global.scss"; //* static-content-wrapper已引入，还需要重复引入吗？ *//
+
+</style>

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

@@ -0,0 +1,56 @@
+<template>
+  <div>
+    <el-form-item label-width="0">
+      <el-divider class="custom-divider">明细导出设置</el-divider>
+    </el-form-item>
+    <el-form-item label="导出文件名称">
+      <el-input v-model="optionModel.exportFileName"></el-input>
+    </el-form-item>
+    <el-form-item label="表格唯一名称">
+      <el-input v-model="optionModel.tableRef"></el-input>
+    </el-form-item>
+    <el-form-item label="导出列表显示图片">
+      <el-switch v-model="optionModel.showImageAtTable" @change="changeShowImageAtTable"></el-switch>
+    </el-form-item>
+    <!-- <el-form-item label="导出参数" label-width="150px">
+      <a href="javascript:void(0);" class="a-link link-oneLind"
+         @click="editEventHandler('tableExportParam', eventParams)">
+        <span>{{ optionModel.tableExportParam }}</span>
+        <i class="el-icon-edit"></i>
+      </a>
+    </el-form-item> -->
+  </div>
+</template>
+
+<script>
+import i18n from "../../../../utils/i18n";
+import eventMixin
+  from "../event-handler/eventMixin";
+
+export default {
+  name: "select-export-button-editor",
+  mixins: [i18n, eventMixin],
+  props: {
+    designer: Object,
+    selectedWidget: Object,
+    optionModel: Object,
+  },
+  data() {
+    return {
+      eventParams: [],
+    };
+  },
+  methods: {
+    changeShowImageAtTable(val) {
+      if (val) {
+        let exportPageSize = this.optionModel.exportPageSize || 0;
+        if (exportPageSize > 150) {
+          this.optionModel.exportPageSize = 150
+        }
+      }
+    }
+  }
+};
+</script>
+
+<style scoped></style>

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

@@ -143,7 +143,8 @@ const COMMON_PROPERTIES = {
   treeDataEdit: "treeData-editor",
   treePane: "tree-pane-editor",
 
-  tableExportParam: "table-export-button-editor",
+  tableExportFlag: "table-export-button-editor",
+  selectExportFlag: "select-export-button-editor",
   importEntity: "import-button-editor",
   frontImportFlag: "import2-button-editor",
   printTableRef: "print-button-editor",