cloud-web-corejs 1.0.54-dev.530 → 1.0.54-dev.532

package/src/components/table/util/index.js

@@ -28,9 +28,16 @@ export function getCellValue(obj) {
   let cellValue;
   if (column.slots && column.slots.filterVal) {
     cellValue = column.slots.filterVal(params);
-  } else {
+  } else if(column.renderCell){
     let result = column.renderCell(h, params);
     cellValue = vNodeRender(result);
+  }else{
+    if(column.slots?.default){
+      let result = column.slots.default(obj, h);
+      cellValue = vNodeRender(result);
+    }else{
+      cellValue = obj.row[column.field];
+    }
   }
   return cellValue;
 }

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

@@ -14,6 +14,16 @@
         ><span class="line"></span>
         <i class="el-icon-arrow-down el-icon--right"></i>
       </el-button>
+      <el-dropdown-menu slot="dropdown">
+        <el-dropdown-item
+          icon="el-icon-upload2"
+          command="1"
+        >导出</el-dropdown-item>
+        <el-dropdown-item
+          icon="el-icon-printer"
+          :command="2"
+        >打印</el-dropdown-item>
+      </el-dropdown-menu>
     </el-dropdown>
     <base-input-export
       :option="exportOption"

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

@@ -14,6 +14,10 @@
         ><span class="line"></span>
         <i class="el-icon-arrow-down el-icon--right"></i>
       </el-button>
+      <el-dropdown-menu slot="dropdown">
+        <el-dropdown-item icon="el-icon-upload2" command="1">导出</el-dropdown-item>
+        <el-dropdown-item icon="el-icon-printer" :command="2">打印</el-dropdown-item>
+      </el-dropdown-menu>
     </el-dropdown>
     <base-input-export
       :option="exportOption"

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

@@ -0,0 +1,92 @@
+<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('exportItem')"
+      :disabled="field.options.disabled"
+      >{{ getI18nLabel(field.options.label) }}
+    </el-button>
+  </static-content-wrapper>
+</template>
+<script>
+import emitter from "../../../utils/emitter";
+import i18n from "../../../utils/i18n";
+import fieldMixin from "./fieldMixin";
+import StaticContentWrapper from "./static-content-wrapper.vue";
+
+export default {
+  name: "select-export-item-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/form-widget/field-widget/table-export-button-widget.vue

@@ -1,40 +1,42 @@
 <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" :disabled="field.options.disabled">
       <el-button type="primary" class="button-sty" size="mini">
-        <span>{{ getI18nLabel('列表导出') }}</span><span class="line"></span> <i
-        class="el-icon-arrow-down el-icon--right"></i>
+        <span>{{ getI18nLabel("列表导出") }}</span
+        ><span class="line"></span> <i class="el-icon-arrow-down el-icon--right"></i>
       </el-button>
       <el-dropdown-menu slot="dropdown">
-        <el-dropdown-item icon="el-icon-upload2"
-                          @click.native="toDo()">
-          {{ getI18nLabel('条件导出') }}
+        <el-dropdown-item icon="el-icon-upload2" @click.native="toDo()">
+          {{ getI18nLabel("条件导出") }}
         </el-dropdown-item>
-        <el-dropdown-item icon="el-icon-upload2"
-                          @click.native="toDo('selected')">
-          {{ getI18nLabel('选择导出') }}
+        <el-dropdown-item icon="el-icon-upload2" @click.native="toDo('selected')">
+          {{ getI18nLabel("选择导出") }}
         </el-dropdown-item>
-
+        <!-- <el-dropdown-item icon="el-icon-upload2" @click.native="toDo('exportItem')">
+          {{ getI18nLabel("选择导出明细") }}
+        </el-dropdown-item> -->
       </el-dropdown-menu>
     </el-dropdown>
   </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: "table-export-button-widget",
-  components: {StaticContentWrapper},
-  componentName: 'FieldWidget',  //必须固定为FieldWidget，用于接收父级组件的broadcast事件
+  components: { StaticContentWrapper },
+  componentName: "FieldWidget", //必须固定为FieldWidget，用于接收父级组件的broadcast事件
   mixins: [emitter, fieldMixin, i18n],
   props: {
     field: Object,
@@ -44,11 +46,11 @@ export default {
     designer: Object,
     designState: {
       type: Boolean,
-      default: false
-    }
+      default: false,
+    },
   },
   data() {
-    return {}
+    return {};
   },
   beforeCreate() {
     /* 这里不能访问方法和属性！！ */
@@ -57,44 +59,42 @@ export default {
   created() {
     /* 注意：子组件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: {
     toDo(type = null) {
       if (this.designState) {
-        return
+        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
+        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 options = { ...opt, ...tableExportParam, type: type };
       let tableRef = options?.targetRef;
-      delete options.targetRef
+      delete options.targetRef;
       let tableWidget = this.getWidgetRef(tableRef);
-      tableWidget.exportData(options)
-    }
-  }
-
-}
+      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/container-data-table/data-table-editor.vue

@@ -6,6 +6,9 @@
     <el-form-item :label="i18nt('designer.setting.tableHeight')">
       <el-input v-model="optionModel.tableHeight"></el-input>
     </el-form-item>
+    <el-form-item label="行高度（px）">
+      <el-input v-model="optionModel.tableRowHeight"></el-input>
+    </el-form-item>
     <!--    <el-form-item :label="i18nt('designer.setting.customClass')">
           <el-select v-model="optionModel.customClass" multiple="" filterable="" allow-create="" default-first-option="">
             <el-option v-for="(e, t) in cssClassList" :key="t" :value="e" :label="e"></el-option>
@@ -47,7 +50,11 @@
           tag="ul"
           class="draggable-box"
           :list="optionModel.gridPageSizeList"
-          v-bind="{ group: 'optionsGroup', ghostClass: 'ghost', handle: '.drag-option' }"
+          v-bind="{
+            group: 'optionsGroup',
+            ghostClass: 'ghost',
+            handle: '.drag-option',
+          }"
         >
           <li
             v-for="(item, index) in optionModel.gridPageSizeList"
@@ -133,52 +140,38 @@
     <el-form-item :label="i18nt('排序脚本编码')" v-if="optionModel.isEditTable">
       <el-input v-model="optionModel.sortScriptCode"></el-input>
     </el-form-item>
-    <!--    <el-form-item :label="i18nt('上级关联字段')">
-          <el-input v-model="optionModel.parentField"></el-input>
-        </el-form-item>
-        <el-form-item label="编辑表格默认数据" label-width="150px">
-          <a href="javascript:void(0);" class="a-link link-oneLind"
-             @click="editEventHandler('editDefaultRow', tableConfigParams)">
-            <span>{{ optionModel.editDefaultRow }}</span>
-            <i class="el-icon-edit"></i>
-          </a>
-        </el-form-item>-->
-    <!--    <el-form-item :label="i18nt('designer.setting.tableDataEdit')">
-          <el-button type="primary" plain="" round="" @click="openTableDataEdit">{{
-              i18nt('designer.setting.editAction')
-            }}
-          </el-button>
-        </el-form-item>-->
-    <!--    <el-form-item :label="i18nt('designer.setting.dsEnabled')">
-          <el-switch v-model="optionModel.dsEnabled"></el-switch>
-        </el-form-item>-->
-    <!-- <el-form-item v-if="optionModel.dsEnabled" :label="i18nt('designer.setting.dsName')">
-      <el-select v-model="optionModel.dsName" filterable="" clearable="">
-        <el-option v-for="(e, t) in dataSourceList" :key="t" :value="e.uniqueName" :label="e.uniqueName" :title="e.description"></el-option>
-      </el-select>
-    </el-form-item> -->
-    <!-- <el-form-item v-if="!optionModel.dsEnabled" :label="i18nt('designer.setting.showButtonsColumn')">
-      <el-switch v-model="optionModel.showButtonsColumn" @change="handleShowButtonsColumnChange"></el-switch>
-    </el-form-item> -->
-    <!--    <el-form-item v-if="optionModel.dsEnabled" :label="i18nt('请求访问')">
-          &lt;!&ndash; <el-button type="primary" plain="" round="" @click="openSqlEditDialog">{{ i18nt('designer.setting.editAction') }}</el-button> &ndash;&gt;
-          <el-input
-            class="search-input"
-            max="200"
-            v-model="optionModel.accessName"
-            @clear="
-          optionModel.accessCode = '';
-              $forceUpdate();
-            "
-            v-el-readonly
-            clearable
-          >
-            <i slot="suffix" class="el-input__icon el-icon-search" @click="showRequestaccessDialog=true"></i>
-          </el-input>
-        </el-form-item>-->
-    <!-- <el-form-item v-if="optionModel.showButtonsColumn" :label="i18nt('designer.setting.buttonsColumnEdit')">
-      <el-button type="primary" plain="" round="" @click="editButtonsColumn">{{ i18nt('designer.setting.editAction') }}</el-button>
-    </el-form-item> -->
+
+    <el-form-item label-width="0">
+      <el-divider class="custom-divider-margin-top">明细导出设置</el-divider>
+    </el-form-item>
+    <el-form-item :label="i18nt('明细导出脚本编码')">
+      <el-input v-model="optionModel.exportItemScriptCode"></el-input>
+    </el-form-item>
+    <el-form-item label="自定义明细导出参数" label-width="150px">
+      <a
+        href="javascript:void(0);"
+        class="a-link link-oneLind"
+        @click="editEventHandler('exportItemParam', tableConfigParams)"
+      >
+        <span>{{ optionModel.exportItemParam }}</span>
+        <i class="el-icon-edit"></i>
+      </a>
+    </el-form-item>
+    <el-form-item label="明细导出列维护" label-width="150px">
+      <a
+        href="javascript:void(0);"
+        class="a-link link-oneLind"
+        @click="openExportItemColumnsDialog"
+      >
+        <span>{{
+          optionModel.exportItemColumns && optionModel.exportItemColumns.length
+            ? "已维护"
+            : null
+        }}</span>
+        <i class="el-icon-edit"></i>
+      </a>
+    </el-form-item>
+
     <el-dialog
       v-if="dataDialogVisible"
       custom-class="dialog-style list-dialog"
@@ -311,6 +304,13 @@
       :selectedWidget="selectedWidget"
       :optionModel="optionModel"
     />
+    <exportItemColumnsDialog
+      v-if="showExportItemColumnsDialog"
+      :visiable.sync="showExportItemColumnsDialog"
+      :designer="designer"
+      :selectedWidget="selectedWidget"
+      :optionModel="optionModel"
+    />
   </div>
 </template>
 
@@ -325,6 +325,8 @@ import tableColumnDialog from "./table-column-dialog.vue";
 import eventMixin from "../../../../../../components/xform/form-designer/setting-panel/property-editor/event-handler/eventMixin";
 import setttingConfig from "@/settings";
 
+import exportItemColumnsDialog from "./exportItemColumns-dialog.vue";
+
 export default {
   name: "data-table-editor",
   componentName: "PropertyEditor",
@@ -334,6 +336,7 @@ export default {
     requestaccessDialog,
     // conditionEditor,
     tableColumnDialog,
+    exportItemColumnsDialog,
   },
   props: {
     designer: Object,
@@ -528,6 +531,7 @@ export default {
       },
       defaultCheckedKeys: [],
       tableConfigParams: ["dataId", "formCode"],
+      showExportItemColumnsDialog: false,
     };
   },
   computed: {
@@ -935,6 +939,9 @@ export default {
       }
       this.optionModel.gridPageSizeList.push({ value: 50 });
     },
+    openExportItemColumnsDialog() {
+      this.showExportItemColumnsDialog = true;
+    },
   },
 };
 </script>