doway-coms 2.10.51 → 2.10.54

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "doway-coms",
-  "version": "2.10.51",
+  "version": "2.10.54",
   "description": "doway组件库",
   "author": "dowaysoft",
   "main": "packages/index.js",

package/packages/BaseGrid/src/exportCmp.vue

@@ -0,0 +1,106 @@
+<template>
+    <div>
+      <vxe-modal
+        v-model="showExport"
+        :title="exportTitle"
+        show-zoom
+        resize
+        showFooter
+        show-close
+        :mask-closable="true"
+        width="400px"
+        height="400px"
+        :destroyOnClose="true"
+      >
+      <template #default>
+      <draggable ref="dragView" v-model="exportFields">
+          <div v-for="loopField in exportFields" :key="loopField.code">
+            <a-checkbox v-model="loopField.selected">{{ loopField.title }}</a-checkbox>
+          </div>
+        </draggable>
+      </template>
+        <template #footer>
+          <Button type="primary" size="small" @click="confirmExport">确认导出</Button>
+        </template>
+      </vxe-modal>
+    </div>
+  </template>
+  
+  <script>
+import { commonExportApi } from './gridApi';
+import XEUtils from 'xe-utils';
+import { controlType } from '../../utils/enum';
+import draggable from 'vuedraggable';
+import { Button } from 'ant-design-vue';
+
+export default {
+  name: 'commonExportCmp',
+  components: {
+    draggable,
+    Button
+  },
+  props: {
+    objectService: {
+      type: String,
+      default: ''
+    }
+  },
+  data() {
+    return {
+      showExport: false,
+      exportTitle: '',
+      exportFields: [],
+      moduleCode: '',
+      dataCode: '',
+      fieldCode: '',
+      searchParam: {}
+    };
+  },
+  methods: {
+    show(moduleCodeParam, dataCodeParam, dataNameParam, fieldCodeParam, searchParamParam, fields) {
+      this.exportFields = [];
+      this.moduleCode = moduleCodeParam;
+      this.dataCode = dataCodeParam;
+      this.fieldCode = fieldCodeParam;
+      this.searchParam = searchParamParam;
+      
+      XEUtils.arrayEach(fields, (loopField) => {
+        if (loopField.ignoreExport === true || loopField.controlType === controlType.buttons) {
+          return;
+        }
+        this.exportFields.push({
+          code: loopField.field,
+          title: loopField.title,
+          selected: true
+        });
+      });
+      
+      this.exportTitle = dataNameParam + '导出字段选择';
+      this.showExport = true;
+    },
+    confirmExport() {
+      let postData = {
+        moduleCode: this.moduleCode,
+        dataCode: this.dataCode,
+        fieldCode: this.fieldCode,
+        fields: [],
+        searchParam: this.searchParam
+      };
+
+      XEUtils.arrayEach(this.exportFields, (loopField) => {
+        if (loopField.selected === true) {
+          postData.fields.push(loopField.code);
+        }
+      });
+
+      console.debug('export post data', postData);
+      commonExportApi(this.objectService, postData);
+    }
+  }
+};
+  </script>
+  
+  <style scoped>
+   
+  </style>
+  

package/packages/BaseGrid/src/gridApi.js

@@ -0,0 +1,33 @@
+import store from '../../utils/store'
+
+export function commonExportApi(objectService, data) {
+    const formExport = document.createElement('form');
+    formExport.method = 'post';
+    (formExport.action =
+      getServiceUrl(objectService) + 'v1/commonOperation/exportGridExcel?token=' + store.state.token),
+      (formExport.target = 'exportFrame');
+    const inputValue = document.createElement('input');
+    inputValue.type = 'text';
+    inputValue.name = 'exportData';
+    inputValue.value = JSON.stringify(data);
+    formExport.appendChild(inputValue);
+    document.body.appendChild(formExport);
+    formExport.submit();
+    document.body.removeChild(formExport);
+  }
+  export function getServiceUrl(objectService) {
+    let url =  process.env.VUE_APP_ERP_SERVICE_URL;
+    if (objectService === 'base') {
+      url = process.env.VUE_APP_BASE_SERVICE_URL;
+    }
+    if (objectService === 'mes') {
+      url =  process.env.VUE_APP_MES_SERVICE_URL;
+    }
+    if (objectService === 'aps') {
+      url =  process.env.VUE_APP_APS_SERVICE_URL;
+    }
+    if (objectService === 'wms') {
+      url =  process.env.VUE_APP_WMS_SERVICE_URL;
+    }
+    return url;
+  }

package/packages/BaseGrid/src/index.vue

@@ -302,10 +302,11 @@
       <template #pulldown_edit="scope" class="interceptor-class">
         <div class="interceptor-class">
           <BasePulldown
+            v-if="getCellEditExp(scope)"
             v-model="scope.row[scope.column.property]"
             :field="scope.column.property"
             :formRow="formRow"
-            :edit="getCellEditExp(scope)"
+            :edit="true"
             :showLabel="false"
             :row="scope.row"
             :api="scope.column.params.api"
@@ -331,6 +332,9 @@
             :propTableData="getTableData()"
             :disabled="editDisabled(scope)"
           />
+          <div v-else>
+            {{ gridDefaultValueDisplay(scope.row, scope.column) }}
+          </div>
         </div>
       </template>
       <template #treeSelect_edit="scope">
@@ -339,7 +343,8 @@
             v-model="scope.row[scope.column.property]"
             :field="scope.column.property"
             :formRow="formRow"
-            :edit="getCellEditExp(scope)"
+              v-if="getCellEditExp(scope)"
+            :edit="true"
             :showLabel="false"
             :row="scope.row"
             class="inner-cell-control"
@@ -355,6 +360,9 @@
             @preSearch="(searchInfo) => preSearch(searchInfo, scope)"
           >
           </BaseTreeSelect>
+          <div v-else>
+            {{ gridDefaultValueDisplay(scope.row, scope.column) }}
+          </div>
         </div>
       </template>
 
@@ -738,6 +746,7 @@
         </a-button>
       </template>
     </VxeModal> -->
+    <exportCmp :objectService="objectService" ref="exportCmpView" />
   </div>
 </template>
 <script>
@@ -773,6 +782,7 @@ import {
   Tag,
 } from 'ant-design-vue'
 import BasePagination from '../../BasePagination/index'
+import exportCmp from './exportCmp.vue'
 import BasePulldown from '../../BasePulldown/index'
 import BaseGridAdjust from '../../BaseGridAdjust/index'
 import { saveUserModuleDataFieldApi, userResetApi } from '../../utils/api'
@@ -803,6 +813,7 @@ export default {
     BaseGridAdjust,
     SeqSetting,
     Tooltip,
+    exportCmp
   },
   data() {
     return {
@@ -980,6 +991,10 @@ export default {
     },
   },
   props: {
+    objectService: {
+      type: String,
+      default: ''
+    },
     isSeqPopover: {
       type: Boolean,
       default: true,
@@ -2102,6 +2117,10 @@ export default {
       }
       if (originCol.controlType === controlType.text) {
         colParams['controlEdit'] = true
+        colParams['allowClear'] = true
+        if (originCol.hasOwnProperty('allowClear')) {
+          colParams['allowClear'] = originCol.allowClear
+        }
       }
       if (originCol.controlType === controlType.select) {
         colParams['controlEdit'] = true
@@ -2795,6 +2814,26 @@ export default {
      * 表尾按钮操作
      */
     pagerBtnClick(pagerBtnInfo) {
+      //判断系统配置导出,用来兼容老的导出模式，定义的时候用export开头
+      if(pagerBtnInfo.field.indexOf('export')===0 && pagerBtnInfo.exportMaxSize){
+        let searchParam = {
+              begin:
+                (this.pager.current - 1) *
+                this.pager.size +
+                1,
+              size: this.pager.size,
+              sorts:[],
+                // this.sorts.length > 0
+                //   ? this.sorts
+                //   : [],
+              expression: {
+                expressions: this.getFiltersList(),
+                operator: 'and',
+              },
+            };
+            this.$refs.exportCmpView.show(this.moduleCode,this.dataCode,this.dataName,pagerBtnInfo.field,searchParam,this.columns
+      )
+      }
       this.$emit('pagerButtonClick', pagerBtnInfo, this)
     },
     /**