vue2-client 1.4.0 → 1.4.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vue2-client",
-  "version": "1.4.0",
+  "version": "1.4.2",
   "private": false,
   "scripts": {
     "serve": "vue-cli-service serve",

package/src/base-client/components/common/Upload/Upload.vue

@@ -37,7 +37,7 @@
 
 import { post } from '@vue2-client/services/api'
 import { mapState } from 'vuex'
-import { upload } from '@/services/api/common'
+import { upload } from '@vue2-client/services/api/common'
 
 export default {
   name: 'uploads',

package/src/base-client/components/common/XFormTable/XFormTable.vue

@@ -55,7 +55,7 @@
             <a-dropdown v-if="!buttonState || buttonState.export">
               <a-menu slot="overlay">
                 <a-menu-item :disabled="selectedRowKeys.length === 0" key="1" @click="handleExport(true)"><a-icon :style="iconStyle" type="ordered-list" />导出选中数据</a-menu-item>
-                <a-menu-item key="2" @click="handleExport"><a-icon :style="iconStyle" type="snippets" />导出本页数据</a-menu-item>
+                <a-menu-item key="2" @click="handleExport(false)"><a-icon :style="iconStyle" type="snippets" />导出本页数据</a-menu-item>
                 <a-menu-item key="3" @click="handleExportByQuery"><a-icon :style="iconStyle" type="download" />导出所有符合条件的数据</a-menu-item>
               </a-menu>
               <a-button>导出 <a-icon type="down" /> </a-button>
@@ -87,7 +87,7 @@ import { mapState } from 'vuex'
 import { Modal } from 'ant-design-vue'
 import { post } from '@vue2-client/services/api/restTools'
 import { CommonTempTable } from '@vue2-client/services/api/commonTempTable'
-import { exportJson } from '@/utils/excel/Export2Excel'
+import { exportJson } from '@vue2-client/utils/excel/Export2Excel'
 
 export default {
   name: 'XFormTable',
@@ -236,7 +236,8 @@ export default {
       this.$refs.xTable.clearRowKeys()
     },
     setParams (res) {
-      this.tableColumns = res.columnJson
+      // 深拷贝json，避免筛选列报错
+      this.tableColumns = JSON.parse(JSON.stringify(res.columnJson))
       this.formItems = res.formJson
       this.buttonState = res.buttonState
       this.serviceName = res.serviceName