From 29490a4e982505d68e3734ccd77e08286cac9b70 Mon Sep 17 00:00:00 2001 From: xuliangzhan Date: Thu, 12 Aug 2021 23:22:48 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E8=B0=83=E7=94=A8=E6=B8=85?= =?UTF-8?q?=E9=99=A4=E7=AD=9B=E9=80=89=E5=87=BD=E6=95=B0=E6=8A=A5=E9=94=99?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gulpfile.js | 7 ++++++- package.json | 34 +++++++++++++++---------------- packages/button/src/button.ts | 6 +++--- packages/checkbox/src/checkbox.ts | 2 +- packages/checkbox/src/group.ts | 2 +- packages/filter/src/panel.ts | 2 +- packages/form/src/form.ts | 10 ++++----- packages/input/src/input.ts | 6 +++--- packages/list/src/list.ts | 2 +- packages/modal/src/modal.ts | 6 +++--- packages/pager/src/pager.ts | 2 +- packages/pulldown/src/pulldown.ts | 6 +++--- packages/radio/src/button.ts | 2 +- packages/radio/src/group.ts | 2 +- packages/radio/src/radio.ts | 2 +- packages/select/src/select.ts | 6 +++--- packages/switch/src/switch.ts | 6 +++--- packages/table/src/table.ts | 6 +++--- packages/textarea/src/textarea.ts | 6 +++--- packages/toolbar/src/toolbar.ts | 6 +++--- packages/tooltip/src/tooltip.ts | 6 +++--- types/pulldown.d.ts | 1 - types/table.d.ts | 2 ++ 23 files changed, 68 insertions(+), 62 deletions(-) diff --git a/gulpfile.js b/gulpfile.js index 286e6a6aa..5d6049963 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -82,7 +82,12 @@ gulp.task('build_modules', () => { })) .pipe(gulp.dest('es')) .pipe(babel({ - presets: ['@babel/env'] + presets: [ + '@babel/env' + ], + plugins: [ + '@babel/plugin-proposal-class-properties' + ] })) .pipe(gulp.dest('lib')) .pipe(uglify()) diff --git a/package.json b/package.json index d95f6b37b..19cd2f801 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "vxe-table", - "version": "4.0.25", + "version": "4.0.26", "description": "一个基于 vue 的 PC 端表格组件，支持增删改查、虚拟滚动、懒加载、快捷菜单、数据校验、树形结构、打印导出、表单渲染、数据分页、虚拟列表、弹窗、自定义模板、渲染器、贼灵活的配置项、扩展接口等...", "scripts": { "serve": "vue-cli-service serve", @@ -29,9 +29,9 @@ "style": "lib/style.css", "typings": "types/index.d.ts", "devDependencies": { - "@types/qrcode": "^1.4.0", - "@types/resize-observer-browser": "^0.1.5", - "@types/sortablejs": "^1.10.6", + "@types/qrcode": "^1.4.1", + "@types/resize-observer-browser": "^0.1.6", + "@types/sortablejs": "^1.10.7", "@typescript-eslint/eslint-plugin": "^4.18.0", "@typescript-eslint/parser": "^4.18.0", "@vue/cli-plugin-babel": "~4.5.0", @@ -40,13 +40,13 @@ "@vue/cli-plugin-typescript": "~4.5.0", "@vue/cli-plugin-vuex": "~4.5.0", "@vue/cli-service": "~4.5.0", - "@vue/compiler-sfc": "^3.1.4", + "@vue/compiler-sfc": "^3.2.2", "@vue/eslint-config-standard": "^5.1.2", "@vue/eslint-config-typescript": "^7.0.0", - "ant-design-vue": "^2.1.6", + "ant-design-vue": "^2.2.6", "core-js": "^3.6.5", - "dayjs": "^1.10.4", - "element-plus": "^1.0.2-beta.48", + "dayjs": "^1.10.6", + "element-plus": "^1.0.2-beta.70", "eslint": "^6.7.2", "eslint-plugin-import": "^2.20.2", "eslint-plugin-node": "^11.1.0", @@ -67,18 +67,18 @@ "gulp-sourcemaps": "^2.6.5", "gulp-typescript": "^5.0.1", "gulp-uglify": "^3.0.2", - "highlight.js": "^10.5.0", + "highlight.js": "^11.2.0", "jsbarcode": "^3.11.0", - "jspdf": "^2.1.1", + "jspdf": "^2.3.1", "node-sass": "^4.14.0", "qrcode": "^1.4.4", "sass-loader": "^8.0.2", - "sortablejs": "^1.13.0", - "typescript": "~4.1.5", - "vue": "^3.1.4", - "vue-i18n": "^9.0.0", - "vue-router": "^4.0.4", - "vuex": "^4.0.0", + "sortablejs": "^1.14.0", + "typescript": "~4.3.5", + "vue": "^3.2.2", + "vue-i18n": "^9.1.7", + "vue-router": "^4.0.11", + "vuex": "^4.0.2", "vxe-table-plugin-antd": "^3.0.3", "vxe-table-plugin-element": "^3.0.3", "vxe-table-plugin-export-pdf": "^3.0.2", @@ -92,7 +92,7 @@ "xlsx": "^0.17.0" }, "peerDependencies": { - "vue": "^3.1.1", + "vue": "^3.2.2", "xe-utils": "^3.2.0" }, "vetur": { diff --git a/packages/button/src/button.ts b/packages/button/src/button.ts index ac6af175b..39053f44d 100644 --- a/packages/button/src/button.ts +++ b/packages/button/src/button.ts @@ -76,14 +76,14 @@ export default defineComponent({ const computeSize = useSize(props) - const reactData = reactive({ + const reactData = reactive({ inited: false, showPanel: false, animatVisible: false, panelIndex: 0, panelStyle: {}, panelPlacement: '' - } as ButtonReactData) + }) const internalData: ButtonInternalData = { showTime: null @@ -104,7 +104,7 @@ export default defineComponent({ reactData, internalData, getRefMaps: () => refMaps - } as VxeButtonConstructor + } as unknown as VxeButtonConstructor let buttonMethods = {} as ButtonMethods diff --git a/packages/checkbox/src/checkbox.ts b/packages/checkbox/src/checkbox.ts index 91dac1038..b07462c83 100644 --- a/packages/checkbox/src/checkbox.ts +++ b/packages/checkbox/src/checkbox.ts @@ -32,7 +32,7 @@ export default defineComponent({ xID, props, context - } as VxeCheckboxConstructor + } as unknown as VxeCheckboxConstructor let checkboxMethods = {} as CheckboxMethods diff --git a/packages/checkbox/src/group.ts b/packages/checkbox/src/group.ts index e68565b69..06a2d2097 100644 --- a/packages/checkbox/src/group.ts +++ b/packages/checkbox/src/group.ts @@ -25,7 +25,7 @@ export default defineComponent({ xID, props, context - } as VxeCheckboxGroupConstructor & VxeCheckboxGroupPrivateMethods + } as unknown as VxeCheckboxGroupConstructor & VxeCheckboxGroupPrivateMethods useSize(props) diff --git a/packages/filter/src/panel.ts b/packages/filter/src/panel.ts index 10806fc3f..16db0cd1b 100644 --- a/packages/filter/src/panel.ts +++ b/packages/filter/src/panel.ts @@ -220,7 +220,7 @@ export default defineComponent({ 'is--active': filterStore.visible }], style: filterStore.style - }, initStore.filter ? renderOptions(filterRender, compConf).concat(renderFooters()) : []) + }, initStore.filter && filterStore.visible ? renderOptions(filterRender, compConf).concat(renderFooters()) : []) } return renderVN diff --git a/packages/form/src/form.ts b/packages/form/src/form.ts index 4aa283027..17f1353e5 100644 --- a/packages/form/src/form.ts +++ b/packages/form/src/form.ts @@ -95,20 +95,20 @@ export default defineComponent({ const computeSize = useSize(props) - const reactData = reactive({ + const reactData = reactive({ collapseAll: true, staticItems: [], formItems: [] - } as FormReactData) + }) - const internalData = reactive({ + const internalData = reactive({ tooltipTimeout: null, tooltipActive: false, tooltipStore: { item: null, visible: false } - } as FormInternalData) + }) const refElem = ref() as Ref const refTooltip = ref() as Ref @@ -123,7 +123,7 @@ export default defineComponent({ context, reactData, getRefMaps: () => refMaps - } as VxeFormConstructor & VxeFormPrivateMethods + } as unknown as VxeFormConstructor & VxeFormPrivateMethods let formMethods = {} as FormMethods diff --git a/packages/input/src/input.ts b/packages/input/src/input.ts index 65786f6cd..df475ca87 100644 --- a/packages/input/src/input.ts +++ b/packages/input/src/input.ts @@ -157,7 +157,7 @@ export default defineComponent({ const computeSize = useSize(props) - const reactData = reactive({ + const reactData = reactive({ inited: false, panelIndex: 0, showPwd: false, @@ -173,7 +173,7 @@ export default defineComponent({ datePanelType: 'day', selectMonth: null, currentDate: null - } as InputReactData) + }) const refElem = ref() as Ref const refInputTarget = ref() as Ref @@ -191,7 +191,7 @@ export default defineComponent({ context, reactData, getRefMaps: () => refMaps - } as VxeInputConstructor + } as unknown as VxeInputConstructor let inputMethods = {} as InputMethods diff --git a/packages/list/src/list.ts b/packages/list/src/list.ts index 0b630332f..e5c27e940 100644 --- a/packages/list/src/list.ts +++ b/packages/list/src/list.ts @@ -67,7 +67,7 @@ export default defineComponent({ reactData, internalData, getRefMaps: () => refMaps - } as VxeListConstructor & VxeListMethods + } as unknown as VxeListConstructor & VxeListMethods let listMethods = {} as ListMethods diff --git a/packages/modal/src/modal.ts b/packages/modal/src/modal.ts index 802f6a155..9ed4a4820 100644 --- a/packages/modal/src/modal.ts +++ b/packages/modal/src/modal.ts @@ -76,7 +76,7 @@ export default defineComponent({ const computeSize = useSize(props) - const reactData = reactive({ + const reactData = reactive({ inited: false, visible: false, contentVisible: false, @@ -84,7 +84,7 @@ export default defineComponent({ modalZindex: 0, zoomLocat: null, firstOpen: false - } as ModalReactData) + }) const refElem = ref() as Ref const refModalBox = ref() as Ref @@ -101,7 +101,7 @@ export default defineComponent({ context, reactData, getRefMaps: () => refMaps - } as VxeModalConstructor & VxeModalMethods + } as unknown as VxeModalConstructor & VxeModalMethods let modalMethods = {} as ModalMethods diff --git a/packages/pager/src/pager.ts b/packages/pager/src/pager.ts index 91d2bb2ce..ab0a03445 100644 --- a/packages/pager/src/pager.ts +++ b/packages/pager/src/pager.ts @@ -68,7 +68,7 @@ export default defineComponent({ props, context, getRefMaps: () => refMaps - } as VxePagerConstructor & VxePagerPrivateMethods + } as unknown as VxePagerConstructor & VxePagerPrivateMethods let pagerMethods = {} as PagerMethods let pagerPrivateMethods = {} as PagerPrivateMethods diff --git a/packages/pulldown/src/pulldown.ts b/packages/pulldown/src/pulldown.ts index 94be573ed..f205d8084 100644 --- a/packages/pulldown/src/pulldown.ts +++ b/packages/pulldown/src/pulldown.ts @@ -27,7 +27,7 @@ export default defineComponent({ const computeSize = useSize(props) - const reactData = reactive({ + const reactData = reactive({ inited: false, panelIndex: 0, panelStyle: null, @@ -35,7 +35,7 @@ export default defineComponent({ visiblePanel: false, animatVisible: false, isActivated: false - } as PulldownReactData) + }) const refElem = ref() as Ref const refPulldowContent = ref() as Ref @@ -51,7 +51,7 @@ export default defineComponent({ context, reactData, getRefMaps: () => refMaps - } as VxePulldownConstructor & VxePulldownMethods + } as unknown as VxePulldownConstructor & VxePulldownMethods let pulldownMethods = {} as PulldownMethods diff --git a/packages/radio/src/button.ts b/packages/radio/src/button.ts index 44331b408..3681cf9dc 100644 --- a/packages/radio/src/button.ts +++ b/packages/radio/src/button.ts @@ -31,7 +31,7 @@ export default defineComponent({ xID, props, context - } as VxeRadioButtonConstructor + } as unknown as VxeRadioButtonConstructor let radioButtonMethods = {} as RadioButtonMethods diff --git a/packages/radio/src/group.ts b/packages/radio/src/group.ts index 500b00e3a..1099d8866 100644 --- a/packages/radio/src/group.ts +++ b/packages/radio/src/group.ts @@ -26,7 +26,7 @@ export default defineComponent({ props, context, name: XEUtils.uniqueId('xegroup_') - } as VxeRadioGroupConstructor & VxeRadioGroupPrivateMethods + } as unknown as VxeRadioGroupConstructor & VxeRadioGroupPrivateMethods let radioGroupMethods = {} as RadioGroupMethods diff --git a/packages/radio/src/radio.ts b/packages/radio/src/radio.ts index 72002cb13..0f04d63b2 100644 --- a/packages/radio/src/radio.ts +++ b/packages/radio/src/radio.ts @@ -30,7 +30,7 @@ export default defineComponent({ xID, props, context - } as VxeRadioConstructor + } as unknown as VxeRadioConstructor const computeSize = useSize(props) diff --git a/packages/select/src/select.ts b/packages/select/src/select.ts index a08366779..97b4e7249 100644 --- a/packages/select/src/select.ts +++ b/packages/select/src/select.ts @@ -51,7 +51,7 @@ export default defineComponent({ const computeSize = useSize(props) - const reactData = reactive({ + const reactData = reactive({ inited: false, staticOptions: [], fullGroupList: [], @@ -65,7 +65,7 @@ export default defineComponent({ visiblePanel: false, animatVisible: false, isActivated: false - } as SelectReactData) + }) const refElem = ref() as Ref const refInput = ref() as Ref @@ -82,7 +82,7 @@ export default defineComponent({ context, reactData, getRefMaps: () => refMaps - } as VxeSelectConstructor & VxeSelectMethods + } as unknown as VxeSelectConstructor & VxeSelectMethods let selectMethods = {} as SelectMethods diff --git a/packages/switch/src/switch.ts b/packages/switch/src/switch.ts index 6576a916a..a8bb396e4 100644 --- a/packages/switch/src/switch.ts +++ b/packages/switch/src/switch.ts @@ -32,18 +32,18 @@ export default defineComponent({ const computeSize = useSize(props) - const reactData = reactive({ + const reactData = reactive({ isActivated: false, hasAnimat: false, offsetLeft: 0 - } as SwitchReactData) + }) const $xeswitch = { xID, props, context, reactData - } as VxeSwitchConstructor + } as unknown as VxeSwitchConstructor const refButton = ref() as Ref diff --git a/packages/table/src/table.ts b/packages/table/src/table.ts index 61d98b393..d7327ecb1 100644 --- a/packages/table/src/table.ts +++ b/packages/table/src/table.ts @@ -35,7 +35,7 @@ export default defineComponent({ const instance = getCurrentInstance() - const reactData = reactive({ + const reactData = reactive({ // 低性能的静态列 staticColumns: [], // 渲染的列分组 @@ -213,7 +213,7 @@ export default defineComponent({ isHeader: false, isFooter: false } - } as TableReactData) + }) const internalData: TableInternalData = { tZindex: 0, @@ -578,7 +578,7 @@ export default defineComponent({ getComputeMaps: () => computeMaps, xegrid: $xegrid - } as VxeTableConstructor & VxeTableMethods & VxeTablePrivateMethods + } as unknown as VxeTableConstructor & VxeTableMethods & VxeTablePrivateMethods const eqCellValue = (row1: any, row2: any, field: string) => { const val1 = XEUtils.get(row1, field) diff --git a/packages/textarea/src/textarea.ts b/packages/textarea/src/textarea.ts index 3e9eb92b0..194dd5c14 100644 --- a/packages/textarea/src/textarea.ts +++ b/packages/textarea/src/textarea.ts @@ -44,9 +44,9 @@ export default defineComponent({ const computeSize = useSize(props) - const reactData = reactive({ + const reactData = reactive({ inputValue: props.modelValue - } as TextareaReactData) + }) const refElem = ref() as Ref const refTextarea = ref() as Ref @@ -62,7 +62,7 @@ export default defineComponent({ context, reactData, getRefMaps: () => refMaps - } as VxeTextareaConstructor + } as unknown as VxeTextareaConstructor let textareaMethods = {} as TextareaMethods diff --git a/packages/toolbar/src/toolbar.ts b/packages/toolbar/src/toolbar.ts index 50917b94e..c4516f4e8 100644 --- a/packages/toolbar/src/toolbar.ts +++ b/packages/toolbar/src/toolbar.ts @@ -36,10 +36,10 @@ export default defineComponent({ const computeSize = useSize(props) - const reactData = reactive({ + const reactData = reactive({ isRefresh: false, columns: [] - } as ToolbarReactData) + }) const refElem = ref() as Ref const refCustomWrapper = ref() as Ref @@ -62,7 +62,7 @@ export default defineComponent({ context, reactData, getRefMaps: () => refMaps - } as VxeToolbarConstructor + } as unknown as VxeToolbarConstructor let toolbarMethods = {} as ToolbarMethods diff --git a/packages/tooltip/src/tooltip.ts b/packages/tooltip/src/tooltip.ts index 36a941202..18200d544 100644 --- a/packages/tooltip/src/tooltip.ts +++ b/packages/tooltip/src/tooltip.ts @@ -31,7 +31,7 @@ export default defineComponent({ const computeSize = useSize(props) - const reactData = reactive({ + const reactData = reactive({ target: null, isUpdate: false, isHover: false, @@ -44,7 +44,7 @@ export default defineComponent({ placement: '', arrowStyle: {} } - } as TooltipReactData) + }) const refElem = ref() as Ref @@ -58,7 +58,7 @@ export default defineComponent({ context, reactData, getRefMaps: () => refMaps - } as VxeTooltipConstructor + } as unknown as VxeTooltipConstructor let tooltipMethods = {} as TooltipMethods diff --git a/types/pulldown.d.ts b/types/pulldown.d.ts index cbd5c46e2..8cf3f9037 100644 --- a/types/pulldown.d.ts +++ b/types/pulldown.d.ts @@ -27,7 +27,6 @@ export interface PulldownReactData { panelIndex: number; panelStyle: VNodeStyle | null; panelPlacement: string | null; - currentValue: null; visiblePanel: boolean; animatVisible: boolean; isActivated: boolean; diff --git a/types/table.d.ts b/types/table.d.ts index 1cb15e3f2..9b2a44f75 100644 --- a/types/table.d.ts +++ b/types/table.d.ts @@ -872,6 +872,7 @@ export interface TableReactData { isPrint: boolean; hasFooter: boolean; hasMerge: boolean; + hasTree: boolean; hasColgroup: boolean; visible: boolean; }, @@ -882,6 +883,7 @@ export interface TableReactData { type: any; isColgroup: boolean; isMerge: boolean; + isAllExpand: boolean; useStyle: boolean; original: boolean; message: boolean;