@leevan/jtui 2.0.41 → 2.0.42

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@leevan/jtui",
-  "version": "2.0.41",
+  "version": "2.0.42",
   "scripts": {
     "serve": "vue-cli-service serve",
     "build": "vue-cli-service build",
@@ -17,6 +17,9 @@
     "type": "git",
     "url": "git+http://jtgitlab.scsqzx.com/jtxa/jtui-pc.git"
   },
+  "publishConfig": {
+    "registry": "https://registry.npmjs.org/"
+  },
   "contributors": [
     "leevan",
     "lichengshuang"
@@ -32,20 +35,22 @@
   "dependencies": {
     "@vue/babel-helper-vue-jsx-merge-props": "^1.0.0",
     "@vue/babel-preset-jsx": "^1.1.2",
+    "@vxe-ui/plugin-export-xlsx": "3.3.0",
     "axios": "^1.7.9",
     "core-js": "^3.6.4",
     "echarts": "^4.2.1",
     "element-ui": "^2.15.14",
-    "exceljs": "^4.3.0",
+    "exceljs": "4.4.0",
     "moment": "^2.26.0",
     "node-sass": "^5.0.0",
     "sass-loader": "^10.1.0",
     "vue": "^2.6.11",
     "vue-furcate-tree": "^1.0.0",
     "vue-simple-uploader": "^0.7.4",
-    "vxe-table": "^3.10.4",
+    "vxe-pc-ui": "3.10.12",
+    "vxe-table": "3.19.3",
     "vxe-table-plugin-export-xlsx": "^2.2.1",
-    "xe-utils": "^3.3.2",
+    "xe-utils": "3.7.9",
     "xlsx": "^0.17.1"
   },
   "devDependencies": {

package/packages/index.js

@@ -14,12 +14,20 @@ import JtOrgtreePc from './jt-orgtree-pc'
 import SearchType from './Search-Type/index.js';
 
 //vex-table样式
-import 'vxe-table/lib/style.css';
-import VXETable from 'vxe-table';
+import 'vxe-table/lib/style.css'
+import VxeUITable from 'vxe-table'
+import VxeUIBase, { VxeUI } from 'vxe-pc-ui'
+import VxeUIPluginExportXLSX from '@vxe-ui/plugin-export-xlsx'
+import ExcelJS from 'exceljs'
+import 'vxe-pc-ui/lib/style.css'
 import './jt-table/filter.js';
 import './jt-table/comp.js';
 import 'xe-utils';
-Vue.use(VXETable);
+VxeUI.use(VxeUIPluginExportXLSX, {
+  ExcelJS
+})
+Vue.use(VxeUIBase)
+Vue.use(VxeUITable);
 
 //moment.js 
 import moment from 'moment'//导入文件 

package/packages/jt-table/filter.js

@@ -12,9 +12,6 @@ Vue.component(FilterContent.name, FilterContent)
 Vue.component(FilterComplex.name, FilterComplex)
 Vue.component(FilterExcel.name, FilterExcel)
 
-import VXETablePluginExportXLSX from 'vxe-table-plugin-export-xlsx';
-VXETable.use(VXETablePluginExportXLSX);
-
 // 创建一个简单的输入框筛选
 VXETable.renderer.add('FilterInput', {
     // 不显示底部按钮，使用自定义的按钮

package/packages/jt-table/index.vue

@@ -8,19 +8,21 @@
     <div style="position: relative" v-if="isTool">
       <vxe-toolbar
         class="jt-toolbar"
-        :custom="{ icon: 'jtIcon iconpeizhi41 colStyle' }"
+        custom
+        :custom-options="{ icon: 'jtIcon iconpeizhi41 colStyle' }"
       ></vxe-toolbar>
     </div>
     <vxe-table
       class="jt-table-class-only"
       height="auto"
       size="mini"
-      show-overflow
-      show-header-overflow
+      show-overflow="title"
+      show-header-overflow="title"
       auto-resize
-      resizable
-      highlight-current-row
-      highlight-current-column
+      :row-config="{ isCurrent: true, isHover: true}"
+      :current-row-config="{isFollowSelected: true}"
+      :column-config="{ isCurrent: true}"
+      :current-column-config="{ isFollowSelected: true }"
       keep-source
       v-if="tableType === 'default'"
       :id="id"
@@ -52,7 +54,7 @@
         trigger: 'dblclick',
         mode: 'cell',
         showStatus: true,
-        activeMethod: activeCellMethod,
+        beforeEditMethod: activeCellMethod,
       }"
       :expand-config="{
         visibleMethod,
@@ -128,7 +130,8 @@
         :align="handlerConfig.align"
         :width="handlerConfig.width"
         :fixed="handlerConfig.fixed"
-        show-overflow
+        show-overflow="title"
+        field="handler"
       >
         <template v-slot="{ row, rowIndex }">
           <el-dropdown v-if="handlerConfig.btnGroup">
@@ -203,12 +206,13 @@
       class="jt-table-class-only"
       height="auto"
       size="mini"
-      show-overflow
-      show-header-overflow
+      show-overflow="title"
+      show-header-overflow="title"
       auto-resize
-      resizable
-      highlight-current-row
-      highlight-current-column
+      :row-config="{ isCurrent: true, isHover: true}"
+      :current-row-config="{isFollowSelected: true}"
+      :column-config="{ isCurrent: true}"
+      :current-column-config="{ isFollowSelected: true }"
       keep-source
       v-if="tableType === 'bigData'"
       :header-cell-class-name="headerClass"
@@ -237,7 +241,7 @@
         trigger: 'dblclick',
         mode: 'cell',
         showStatus: true,
-        activeMethod: activeCellMethod,
+        beforeEditMethod: activeCellMethod,
       }"
       @scroll="scroll"
       @checkbox-change="selectChangeEvent"
@@ -303,7 +307,8 @@
         :align="handlerConfig.align"
         :width="handlerConfig.width"
         :fixed="handlerConfig.fixed"
-        show-overflow
+        show-overflow="title"
+        field="handler"
       >
         <template v-slot="{ row, rowIndex }">
           <el-dropdown v-if="handlerConfig.btnGroup">
@@ -382,18 +387,19 @@
       v-if="tableType === 'group'"
       :custom-config="{ storage: true, checkMethod: checkColumnMethod }"
       :border="border"
-      show-overflow
-      show-header-overflow
+      show-overflow="title"
+      show-header-overflow="title"
       height="auto"
       :max-height="maxHeight"
       auto-resize
-      resizable
-      highlight-current-row
+      :row-config="{ isCurrent: true, isHover: true}"
+      :current-row-config="{isFollowSelected: true}"
+      :column-config="{ isCurrent: true}"
+      :current-column-config="{ isFollowSelected: true }"
       :tree-config="groupConfig"
       :row-class-name="rowClassName"
       :cell-class-name="gcellClassName"
       :keyboard-config="{ isArrow: true }"
-      highlight-current-column
       @checkbox-change="treeSelectChangeEvent"
       :checkbox-config="{
         highlight: true,
@@ -423,7 +429,7 @@
       <template v-for="(item, index) in data.retjson.header">
         <vxe-table-column
           :key="index"
-          show-overflow
+          show-overflow="title"
           :tree-node="item.prop == treeField"
           :field="item.prop"
           :align="item.align"
@@ -442,7 +448,8 @@
         :align="handlerConfig.align"
         :width="handlerConfig.width"
         :fixed="handlerConfig.fixed"
-        show-overflow
+        show-overflow="title"
+        field="handler"
       >
         <template v-slot="{ row, rowIndex }">
           <el-dropdown v-if="handlerConfig.btnGroup">
@@ -531,15 +538,17 @@
       v-if="tableType === 'tree'"
       :max-height="maxHeight"
       :border="border"
-      show-overflow
-      show-header-overflow
+      show-overflow="title"
+      show-header-overflow="title"
       height="auto"
       auto-resize
       :cell-style="cellStyle_m"
       :row-style="rowStyle"
       :span-method="spanMethod"
-      resizable
-      highlight-current-row
+      :row-config="{ isCurrent: true, isHover: true}"
+      :current-row-config="{isFollowSelected: true}"
+      :column-config="{ isCurrent: true}"
+      :current-column-config="{ isFollowSelected: true }"
       :tree-config="treeConfig"
       :row-key="true"
       row-id="pkid"
@@ -561,7 +570,7 @@
         trigger: 'dblclick',
         mode: 'cell',
         showStatus: true,
-        activeMethod: activeCellMethod,
+        beforeEditMethod: activeCellMethod,
       }"
       keep-source
       :loading="loading"
@@ -609,7 +618,7 @@
           :type="treeTypeConfig.colType"
           :tree-node="index == 0"
           :key="index"
-          show-overflow
+          show-overflow="title"
           :field="item.prop"
           align="left"
           :title="item.label"
@@ -643,7 +652,7 @@
           :edit-render="item.edit"
           :tree-node="index == 0"
           :key="index"
-          show-overflow
+          show-overflow="title"
           :field="item.prop"
           :align="item.align"
           :title="item.label"
@@ -697,7 +706,8 @@
         :align="handlerConfig.align"
         :width="handlerConfig.width"
         :fixed="handlerConfig.fixed"
-        show-overflow
+        show-overflow="title"
+        field="handler"
       >
         <template v-slot="{ row, rowIndex }">
           <el-dropdown v-if="handlerConfig.btnGroup">