vxe-table 3.19.33 → 3.19.34
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/es/style.css +1 -1
- package/es/table/module/custom/panel.js +11 -11
- package/es/ui/index.js +1 -1
- package/es/ui/src/log.js +1 -1
- package/lib/index.umd.js +13 -13
- package/lib/index.umd.min.js +1 -1
- package/lib/style.css +1 -1
- package/lib/table/module/custom/panel.js +11 -11
- package/lib/table/module/custom/panel.min.js +1 -1
- package/lib/ui/index.js +1 -1
- package/lib/ui/index.min.js +1 -1
- package/lib/ui/src/log.js +1 -1
- package/lib/ui/src/log.min.js +1 -1
- package/package.json +1 -1
- package/packages/table/module/custom/panel.ts +11 -11
- /package/es/{iconfont.1766363414901.ttf → iconfont.1766711835500.ttf} +0 -0
- /package/es/{iconfont.1766363414901.woff → iconfont.1766711835500.woff} +0 -0
- /package/es/{iconfont.1766363414901.woff2 → iconfont.1766711835500.woff2} +0 -0
- /package/lib/{iconfont.1766363414901.ttf → iconfont.1766711835500.ttf} +0 -0
- /package/lib/{iconfont.1766363414901.woff → iconfont.1766711835500.woff} +0 -0
- /package/lib/{iconfont.1766363414901.woff2 → iconfont.1766711835500.woff2} +0 -0
|
@@ -201,12 +201,12 @@ const renderSimplePanel = (h, _vm) => {
|
|
|
201
201
|
}, [
|
|
202
202
|
h('span', {
|
|
203
203
|
class: ['vxe-table-custom--sort-btn', {
|
|
204
|
-
'is--disabled':
|
|
204
|
+
'is--disabled': isHidden
|
|
205
205
|
}],
|
|
206
206
|
attrs: {
|
|
207
207
|
title: getI18n('vxe.custom.setting.sortHelpTip')
|
|
208
208
|
},
|
|
209
|
-
on:
|
|
209
|
+
on: isHidden
|
|
210
210
|
? {}
|
|
211
211
|
: {
|
|
212
212
|
mousedown: _vm.sortMousedownEvent,
|
|
@@ -244,7 +244,7 @@ const renderSimplePanel = (h, _vm) => {
|
|
|
244
244
|
mode: 'text',
|
|
245
245
|
icon: column.renderFixed === 'left' ? getIcon().TOOLBAR_TOOLS_FIXED_LEFT_ACTIVE : getIcon().TOOLBAR_TOOLS_FIXED_LEFT,
|
|
246
246
|
status: column.renderFixed === 'left' ? 'primary' : '',
|
|
247
|
-
disabled:
|
|
247
|
+
disabled: isHidden || (isMaxFixedColumn && !column.renderFixed),
|
|
248
248
|
title: getI18n(column.renderFixed === 'left' ? 'vxe.toolbar.cancelFixed' : 'vxe.toolbar.fixedLeft')
|
|
249
249
|
},
|
|
250
250
|
on: {
|
|
@@ -258,7 +258,7 @@ const renderSimplePanel = (h, _vm) => {
|
|
|
258
258
|
mode: 'text',
|
|
259
259
|
icon: column.renderFixed === 'right' ? getIcon().TOOLBAR_TOOLS_FIXED_RIGHT_ACTIVE : getIcon().TOOLBAR_TOOLS_FIXED_RIGHT,
|
|
260
260
|
status: column.renderFixed === 'right' ? 'primary' : '',
|
|
261
|
-
disabled:
|
|
261
|
+
disabled: isHidden || (isMaxFixedColumn && !column.renderFixed),
|
|
262
262
|
title: getI18n(column.renderFixed === 'right' ? 'vxe.toolbar.cancelFixed' : 'vxe.toolbar.fixedRight')
|
|
263
263
|
},
|
|
264
264
|
on: {
|
|
@@ -545,12 +545,12 @@ const renderPopupPanel = (h, $xeTableCustomPanel) => {
|
|
|
545
545
|
? ((isCrossDrag ? immediate : false) || column.level === 1
|
|
546
546
|
? h('div', {
|
|
547
547
|
class: ['vxe-table-custom-popup--column-sort-btn', {
|
|
548
|
-
'is--disabled':
|
|
548
|
+
'is--disabled': isHidden
|
|
549
549
|
}],
|
|
550
550
|
attrs: {
|
|
551
551
|
title: getI18n('vxe.custom.setting.sortHelpTip')
|
|
552
552
|
},
|
|
553
|
-
on: (
|
|
553
|
+
on: (isHidden
|
|
554
554
|
? {}
|
|
555
555
|
: {
|
|
556
556
|
mousedown: _vm.sortMousedownEvent,
|
|
@@ -594,7 +594,7 @@ const renderPopupPanel = (h, $xeTableCustomPanel) => {
|
|
|
594
594
|
props: {
|
|
595
595
|
type: 'integer',
|
|
596
596
|
immediate: false,
|
|
597
|
-
disabled:
|
|
597
|
+
disabled: isHidden,
|
|
598
598
|
value: column.renderResizeWidth,
|
|
599
599
|
min: customMinWidth || undefined,
|
|
600
600
|
max: customMaxWidth || undefined
|
|
@@ -622,11 +622,11 @@ const renderPopupPanel = (h, $xeTableCustomPanel) => {
|
|
|
622
622
|
value: column.renderFixed || '',
|
|
623
623
|
type: 'button',
|
|
624
624
|
size: 'mini',
|
|
625
|
-
disabled:
|
|
625
|
+
disabled: isHidden,
|
|
626
626
|
options: [
|
|
627
|
-
{ label: getI18n('vxe.custom.setting.fixedLeft'), value: 'left', disabled:
|
|
628
|
-
{ label: getI18n('vxe.custom.setting.fixedUnset'), value: '', disabled:
|
|
629
|
-
{ label: getI18n('vxe.custom.setting.fixedRight'), value: 'right', disabled:
|
|
627
|
+
{ label: getI18n('vxe.custom.setting.fixedLeft'), value: 'left', disabled: isHidden || isMaxFixedColumn },
|
|
628
|
+
{ label: getI18n('vxe.custom.setting.fixedUnset'), value: '', disabled: isHidden },
|
|
629
|
+
{ label: getI18n('vxe.custom.setting.fixedRight'), value: 'right', disabled: isHidden || isMaxFixedColumn }
|
|
630
630
|
]
|
|
631
631
|
},
|
|
632
632
|
on: {
|
package/es/ui/index.js
CHANGED
package/es/ui/src/log.js
CHANGED
package/lib/index.umd.js
CHANGED
|
@@ -2005,7 +2005,7 @@ function getClass(property, params) {
|
|
|
2005
2005
|
;// CONCATENATED MODULE: ./packages/ui/index.ts
|
|
2006
2006
|
|
|
2007
2007
|
|
|
2008
|
-
const version = "3.19.
|
|
2008
|
+
const version = "3.19.34";
|
|
2009
2009
|
core_.VxeUI.version = version;
|
|
2010
2010
|
core_.VxeUI.tableVersion = version;
|
|
2011
2011
|
core_.VxeUI.setConfig({
|
|
@@ -2715,7 +2715,7 @@ function isNodeElement(elem) {
|
|
|
2715
2715
|
const {
|
|
2716
2716
|
log: log_log
|
|
2717
2717
|
} = core_.VxeUI;
|
|
2718
|
-
const log_version = `table v${"3.19.
|
|
2718
|
+
const log_version = `table v${"3.19.34"}`;
|
|
2719
2719
|
const warnLog = log_log.create('warn', log_version);
|
|
2720
2720
|
const errLog = log_log.create('error', log_version);
|
|
2721
2721
|
;// CONCATENATED MODULE: ./packages/table/src/columnInfo.ts
|
|
@@ -9028,12 +9028,12 @@ const renderSimplePanel = (h, _vm) => {
|
|
|
9028
9028
|
class: 'vxe-table-custom--sort-option'
|
|
9029
9029
|
}, [h('span', {
|
|
9030
9030
|
class: ['vxe-table-custom--sort-btn', {
|
|
9031
|
-
'is--disabled':
|
|
9031
|
+
'is--disabled': isHidden
|
|
9032
9032
|
}],
|
|
9033
9033
|
attrs: {
|
|
9034
9034
|
title: panel_getI18n('vxe.custom.setting.sortHelpTip')
|
|
9035
9035
|
},
|
|
9036
|
-
on:
|
|
9036
|
+
on: isHidden ? {} : {
|
|
9037
9037
|
mousedown: _vm.sortMousedownEvent,
|
|
9038
9038
|
mouseup: _vm.sortMouseupEvent
|
|
9039
9039
|
}
|
|
@@ -9058,7 +9058,7 @@ const renderSimplePanel = (h, _vm) => {
|
|
|
9058
9058
|
mode: 'text',
|
|
9059
9059
|
icon: column.renderFixed === 'left' ? panel_getIcon().TOOLBAR_TOOLS_FIXED_LEFT_ACTIVE : panel_getIcon().TOOLBAR_TOOLS_FIXED_LEFT,
|
|
9060
9060
|
status: column.renderFixed === 'left' ? 'primary' : '',
|
|
9061
|
-
disabled:
|
|
9061
|
+
disabled: isHidden || isMaxFixedColumn && !column.renderFixed,
|
|
9062
9062
|
title: panel_getI18n(column.renderFixed === 'left' ? 'vxe.toolbar.cancelFixed' : 'vxe.toolbar.fixedLeft')
|
|
9063
9063
|
},
|
|
9064
9064
|
on: {
|
|
@@ -9073,7 +9073,7 @@ const renderSimplePanel = (h, _vm) => {
|
|
|
9073
9073
|
mode: 'text',
|
|
9074
9074
|
icon: column.renderFixed === 'right' ? panel_getIcon().TOOLBAR_TOOLS_FIXED_RIGHT_ACTIVE : panel_getIcon().TOOLBAR_TOOLS_FIXED_RIGHT,
|
|
9075
9075
|
status: column.renderFixed === 'right' ? 'primary' : '',
|
|
9076
|
-
disabled:
|
|
9076
|
+
disabled: isHidden || isMaxFixedColumn && !column.renderFixed,
|
|
9077
9077
|
title: panel_getI18n(column.renderFixed === 'right' ? 'vxe.toolbar.cancelFixed' : 'vxe.toolbar.fixedRight')
|
|
9078
9078
|
},
|
|
9079
9079
|
on: {
|
|
@@ -9329,12 +9329,12 @@ const renderPopupPanel = (h, $xeTableCustomPanel) => {
|
|
|
9329
9329
|
class: 'vxe-table-custom-popup--name'
|
|
9330
9330
|
}, [allowSort ? (isCrossDrag ? immediate : false) || column.level === 1 ? h('div', {
|
|
9331
9331
|
class: ['vxe-table-custom-popup--column-sort-btn', {
|
|
9332
|
-
'is--disabled':
|
|
9332
|
+
'is--disabled': isHidden
|
|
9333
9333
|
}],
|
|
9334
9334
|
attrs: {
|
|
9335
9335
|
title: panel_getI18n('vxe.custom.setting.sortHelpTip')
|
|
9336
9336
|
},
|
|
9337
|
-
on:
|
|
9337
|
+
on: isHidden ? {} : {
|
|
9338
9338
|
mousedown: _vm.sortMousedownEvent,
|
|
9339
9339
|
mouseup: _vm.sortMouseupEvent
|
|
9340
9340
|
}
|
|
@@ -9360,7 +9360,7 @@ const renderPopupPanel = (h, $xeTableCustomPanel) => {
|
|
|
9360
9360
|
props: {
|
|
9361
9361
|
type: 'integer',
|
|
9362
9362
|
immediate: false,
|
|
9363
|
-
disabled:
|
|
9363
|
+
disabled: isHidden,
|
|
9364
9364
|
value: column.renderResizeWidth,
|
|
9365
9365
|
min: customMinWidth || undefined,
|
|
9366
9366
|
max: customMaxWidth || undefined
|
|
@@ -9380,19 +9380,19 @@ const renderPopupPanel = (h, $xeTableCustomPanel) => {
|
|
|
9380
9380
|
value: column.renderFixed || '',
|
|
9381
9381
|
type: 'button',
|
|
9382
9382
|
size: 'mini',
|
|
9383
|
-
disabled:
|
|
9383
|
+
disabled: isHidden,
|
|
9384
9384
|
options: [{
|
|
9385
9385
|
label: panel_getI18n('vxe.custom.setting.fixedLeft'),
|
|
9386
9386
|
value: 'left',
|
|
9387
|
-
disabled:
|
|
9387
|
+
disabled: isHidden || isMaxFixedColumn
|
|
9388
9388
|
}, {
|
|
9389
9389
|
label: panel_getI18n('vxe.custom.setting.fixedUnset'),
|
|
9390
9390
|
value: '',
|
|
9391
|
-
disabled:
|
|
9391
|
+
disabled: isHidden
|
|
9392
9392
|
}, {
|
|
9393
9393
|
label: panel_getI18n('vxe.custom.setting.fixedRight'),
|
|
9394
9394
|
value: 'right',
|
|
9395
|
-
disabled:
|
|
9395
|
+
disabled: isHidden || isMaxFixedColumn
|
|
9396
9396
|
}]
|
|
9397
9397
|
},
|
|
9398
9398
|
on: {
|