vxe-table 3.23.0-beta.1 → 3.23.0-beta.3

package/es/table/module/export/export-panel.js

@@ -1,7 +1,7 @@
 import { defineVxeComponent } from '../../../ui/src/comp';
 import { VxeUI } from '../../../ui';
 import XEUtils from 'xe-utils';
-import { formatText } from '../../../ui/src/utils';
+import { formatText, getDefaultConfig } from '../../../ui/src/utils';
 import { createComponentLog } from '../../../ui/src/log';
 const { errLog } = createComponentLog('table');
 const { getI18n, getIcon, globalMixins, renderEmptyElement } = VxeUI;
@@ -226,6 +226,10 @@ export default {
             const { hasTree, hasRowGroup, hasMerge, isPrint, hasColgroup, columns } = storeData;
             const { isHeader } = defaultOptions;
             const colVNs = [];
+            const exportOpts = $xeTable.computeExportOpts;
+            const printOpts = $xeTable.computePrintOpts;
+            const modelOptions = (isPrint ? printOpts : exportOpts).modelOptions || {};
+            const settingOptions = (isPrint ? printOpts : exportOpts).settingOptions || {};
             const checkedAll = $xeExportPanel.computeCheckedAll;
             const showSheet = $xeExportPanel.computeShowSheet;
             const supportMerge = $xeExportPanel.computeSupportMerge;
@@ -285,17 +289,19 @@ export default {
                     props: {
                         id: 'VXE_EXPORT_MODAL',
                         value: storeData.visible,
-                        title: getI18n(isPrint ? 'vxe.export.printTitle' : 'vxe.export.expTitle'),
-                        width: 660,
-                        minWidth: 500,
-                        minHeight: 400,
+                        title: modelOptions.title || getI18n(isPrint ? 'vxe.export.printTitle' : 'vxe.export.expTitle'),
+                        width: modelOptions.width || 660,
+                        height: modelOptions.height,
+                        minWidth: modelOptions.minWidth || 500,
+                        minHeight: modelOptions.minHeight || 400,
                         mask: true,
                         lockView: true,
                         showFooter: true,
                         escClosable: true,
                         maskClosable: true,
-                        showMaximize: true,
-                        resize: true,
+                        showMinimize: modelOptions.showMinimize,
+                        showMaximize: getDefaultConfig(modelOptions.showMaximize, true),
+                        resize: getDefaultConfig(modelOptions.resize, true),
                         loading: reactData.loading
                     },
                     on: {
@@ -338,7 +344,7 @@ export default {
                                         }, [
                                             h('tbody', [
                                                 [
-                                                    isPrint
+                                                    isPrint || settingOptions.showFileName === false
                                                         ? renderEmptyElement($xeTable)
                                                         : h('tr', [
                                                             h('td', getI18n('vxe.export.expName')),
@@ -361,7 +367,7 @@ export default {
                                                                     : renderEmptyElement($xeTable)
                                                             ])
                                                         ]),
-                                                    isPrint
+                                                    isPrint || settingOptions.showType === false
                                                         ? renderEmptyElement($xeTable)
                                                         : h('tr', [
                                                             h('td', getI18n('vxe.export.expType')),
@@ -379,7 +385,7 @@ export default {
                                                                 })
                                                             ])
                                                         ]),
-                                                    isPrint || showSheet
+                                                    (isPrint || showSheet) && settingOptions.showSheet !== false
                                                         ? h('tr', [
                                                             h('td', getI18n('vxe.export.expSheetName')),
                                                             h('td', [
@@ -402,58 +408,62 @@ export default {
                                                             ])
                                                         ])
                                                         : renderEmptyElement($xeTable),
-                                                    h('tr', [
-                                                        h('td', getI18n('vxe.export.expMode')),
-                                                        h('td', [
-                                                            h(VxeUISelectComponent, {
-                                                                props: {
-                                                                    value: defaultOptions.mode,
-                                                                    options: storeData.modeList
-                                                                },
-                                                                on: {
-                                                                    modelValue(value) {
-                                                                        defaultOptions.mode = value;
+                                                    settingOptions.showMode === false
+                                                        ? renderEmptyElement($xeTable)
+                                                        : h('tr', [
+                                                            h('td', getI18n('vxe.export.expMode')),
+                                                            h('td', [
+                                                                h(VxeUISelectComponent, {
+                                                                    props: {
+                                                                        value: defaultOptions.mode,
+                                                                        options: storeData.modeList
+                                                                    },
+                                                                    on: {
+                                                                        modelValue(value) {
+                                                                            defaultOptions.mode = value;
+                                                                        }
                                                                     }
-                                                                }
-                                                            })
-                                                        ])
-                                                    ]),
-                                                    h('tr', [
-                                                        h('td', [getI18n('vxe.export.expColumn')]),
-                                                        h('td', [
-                                                            h('div', {
-                                                                class: 'vxe-table-export--panel-column'
-                                                            }, [
-                                                                h('ul', {
-                                                                    class: 'vxe-table-export--panel-column-header'
+                                                                })
+                                                            ])
+                                                        ]),
+                                                    settingOptions.showColumn === false
+                                                        ? renderEmptyElement($xeTable)
+                                                        : h('tr', [
+                                                            h('td', [getI18n('vxe.export.expColumn')]),
+                                                            h('td', [
+                                                                h('div', {
+                                                                    class: 'vxe-table-export--panel-column'
                                                                 }, [
-                                                                    h('li', {
-                                                                        class: ['vxe-table-export--panel-column-option', {
-                                                                                'is--checked': isAllChecked,
-                                                                                'is--indeterminate': isAllIndeterminate
-                                                                            }],
-                                                                        attrs: {
-                                                                            title: getI18n('vxe.table.allTitle')
-                                                                        },
-                                                                        on: {
-                                                                            click: $xeExportPanel.allColumnEvent
-                                                                        }
+                                                                    h('ul', {
+                                                                        class: 'vxe-table-export--panel-column-header'
                                                                     }, [
-                                                                        h('span', {
-                                                                            class: ['vxe-checkbox--icon', isAllIndeterminate ? getIcon().TABLE_CHECKBOX_INDETERMINATE : (isAllChecked ? getIcon().TABLE_CHECKBOX_CHECKED : getIcon().TABLE_CHECKBOX_UNCHECKED)]
-                                                                        }),
-                                                                        h('span', {
-                                                                            class: 'vxe-checkbox--label'
-                                                                        }, getI18n('vxe.export.expCurrentColumn'))
-                                                                    ])
-                                                                ]),
-                                                                h('ul', {
-                                                                    class: 'vxe-table-export--panel-column-body'
-                                                                }, colVNs)
+                                                                        h('li', {
+                                                                            class: ['vxe-table-export--panel-column-option', {
+                                                                                    'is--checked': isAllChecked,
+                                                                                    'is--indeterminate': isAllIndeterminate
+                                                                                }],
+                                                                            attrs: {
+                                                                                title: getI18n('vxe.table.allTitle')
+                                                                            },
+                                                                            on: {
+                                                                                click: $xeExportPanel.allColumnEvent
+                                                                            }
+                                                                        }, [
+                                                                            h('span', {
+                                                                                class: ['vxe-checkbox--icon', isAllIndeterminate ? getIcon().TABLE_CHECKBOX_INDETERMINATE : (isAllChecked ? getIcon().TABLE_CHECKBOX_CHECKED : getIcon().TABLE_CHECKBOX_UNCHECKED)]
+                                                                            }),
+                                                                            h('span', {
+                                                                                class: 'vxe-checkbox--label'
+                                                                            }, getI18n('vxe.export.expCurrentColumn'))
+                                                                        ])
+                                                                    ]),
+                                                                    h('ul', {
+                                                                        class: 'vxe-table-export--panel-column-body'
+                                                                    }, colVNs)
+                                                                ])
                                                             ])
-                                                        ])
-                                                    ]),
-                                                    isPrint
+                                                        ]),
+                                                    isPrint && (settingOptions.showWidthMode !== false)
                                                         ? h('tr', [
                                                             h('td', getI18n('vxe.export.widthMode')),
                                                             h('td', [
@@ -473,154 +483,156 @@ export default {
                                                             ])
                                                         ])
                                                         : renderEmptyElement($xeTable),
-                                                    h('tr', [
-                                                        h('td', getI18n('vxe.export.expOpts')),
-                                                        parameterSlot
-                                                            ? h('td', [
-                                                                h('div', {
-                                                                    class: 'vxe-table-export--panel-option-row'
-                                                                }, $xeTable.callSlot(parameterSlot, params, h))
-                                                            ])
-                                                            : h('td', [
-                                                                h('div', {
-                                                                    class: 'vxe-table-export--panel-option-row'
-                                                                }, VxeUICheckboxComponent
-                                                                    ? [
-                                                                        h(VxeUICheckboxComponent, {
-                                                                            props: {
-                                                                                value: hasEmptyData || isHeader,
-                                                                                disabled: hasEmptyData,
-                                                                                title: getI18n('vxe.export.expHeaderTitle'),
-                                                                                content: getI18n('vxe.export.expOptHeader')
-                                                                            },
-                                                                            on: {
-                                                                                input(value) {
-                                                                                    defaultOptions.isHeader = value;
-                                                                                }
-                                                                            }
-                                                                        }),
-                                                                        h(VxeUICheckboxComponent, {
-                                                                            props: {
-                                                                                value: defaultOptions.isFooter,
-                                                                                disabled: !storeData.hasFooter,
-                                                                                title: getI18n('vxe.export.expFooterTitle'),
-                                                                                content: getI18n('vxe.export.expOptFooter')
-                                                                            },
-                                                                            on: {
-                                                                                input(value) {
-                                                                                    defaultOptions.isFooter = value;
+                                                    settingOptions.showParameter === false
+                                                        ? renderEmptyElement($xeTable)
+                                                        : h('tr', [
+                                                            h('td', getI18n('vxe.export.expOpts')),
+                                                            parameterSlot
+                                                                ? h('td', [
+                                                                    h('div', {
+                                                                        class: 'vxe-table-export--panel-option-row'
+                                                                    }, $xeTable.callSlot(parameterSlot, params, h))
+                                                                ])
+                                                                : h('td', [
+                                                                    h('div', {
+                                                                        class: 'vxe-table-export--panel-option-row'
+                                                                    }, VxeUICheckboxComponent
+                                                                        ? [
+                                                                            h(VxeUICheckboxComponent, {
+                                                                                props: {
+                                                                                    value: hasEmptyData || isHeader,
+                                                                                    disabled: hasEmptyData,
+                                                                                    title: getI18n('vxe.export.expHeaderTitle'),
+                                                                                    content: getI18n('vxe.export.expOptHeader')
+                                                                                },
+                                                                                on: {
+                                                                                    input(value) {
+                                                                                        defaultOptions.isHeader = value;
+                                                                                    }
                                                                                 }
-                                                                            }
-                                                                        }),
-                                                                        h(VxeUICheckboxComponent, {
-                                                                            props: {
-                                                                                value: isHeader ? defaultOptions.isTitle : false,
-                                                                                disabled: !isHeader,
-                                                                                title: getI18n('vxe.export.expTitleTitle'),
-                                                                                content: getI18n('vxe.export.expOptTitle')
-                                                                            },
-                                                                            on: {
-                                                                                input(value) {
-                                                                                    defaultOptions.isTitle = value;
+                                                                            }),
+                                                                            h(VxeUICheckboxComponent, {
+                                                                                props: {
+                                                                                    value: defaultOptions.isFooter,
+                                                                                    disabled: !storeData.hasFooter,
+                                                                                    title: getI18n('vxe.export.expFooterTitle'),
+                                                                                    content: getI18n('vxe.export.expOptFooter')
+                                                                                },
+                                                                                on: {
+                                                                                    input(value) {
+                                                                                        defaultOptions.isFooter = value;
+                                                                                    }
                                                                                 }
-                                                                            }
-                                                                        }),
-                                                                        h(VxeUICheckboxComponent, {
-                                                                            props: {
-                                                                                value: isHeader && hasColgroup && supportMerge ? defaultOptions.isColgroup : false,
-                                                                                disabled: !isHeader || !hasColgroup || !supportMerge,
-                                                                                title: getI18n('vxe.export.expColgroupTitle'),
-                                                                                content: getI18n('vxe.export.expOptColgroup')
-                                                                            },
-                                                                            on: {
-                                                                                input(value) {
-                                                                                    defaultOptions.isColgroup = value;
+                                                                            }),
+                                                                            h(VxeUICheckboxComponent, {
+                                                                                props: {
+                                                                                    value: isHeader ? defaultOptions.isTitle : false,
+                                                                                    disabled: !isHeader,
+                                                                                    title: getI18n('vxe.export.expTitleTitle'),
+                                                                                    content: getI18n('vxe.export.expOptTitle')
+                                                                                },
+                                                                                on: {
+                                                                                    input(value) {
+                                                                                        defaultOptions.isTitle = value;
+                                                                                    }
                                                                                 }
-                                                                            }
-                                                                        })
-                                                                    ]
-                                                                    : []),
-                                                                h('div', {
-                                                                    class: 'vxe-table-export--panel-option-row'
-                                                                }, VxeUICheckboxComponent
-                                                                    ? [
-                                                                        h(VxeUICheckboxComponent, {
-                                                                            props: {
-                                                                                value: hasEmptyData ? false : defaultOptions.original,
-                                                                                disabled: hasEmptyData,
-                                                                                title: getI18n('vxe.export.expOriginalTitle'),
-                                                                                content: getI18n('vxe.export.expOptOriginal')
-                                                                            },
-                                                                            on: {
-                                                                                input(value) {
-                                                                                    defaultOptions.original = value;
+                                                                            }),
+                                                                            h(VxeUICheckboxComponent, {
+                                                                                props: {
+                                                                                    value: isHeader && hasColgroup && supportMerge ? defaultOptions.isColgroup : false,
+                                                                                    disabled: !isHeader || !hasColgroup || !supportMerge,
+                                                                                    title: getI18n('vxe.export.expColgroupTitle'),
+                                                                                    content: getI18n('vxe.export.expOptColgroup')
+                                                                                },
+                                                                                on: {
+                                                                                    input(value) {
+                                                                                        defaultOptions.isColgroup = value;
+                                                                                    }
                                                                                 }
-                                                                            }
-                                                                        }),
-                                                                        h(VxeUICheckboxComponent, {
-                                                                            props: {
-                                                                                value: hasMerge && supportMerge && checkedAll ? defaultOptions.isMerge : false,
-                                                                                disabled: hasEmptyData || !hasMerge || !supportMerge || !checkedAll,
-                                                                                title: getI18n('vxe.export.expMergeTitle'),
-                                                                                content: getI18n('vxe.export.expOptMerge')
-                                                                            },
-                                                                            on: {
-                                                                                input(value) {
-                                                                                    defaultOptions.isMerge = value;
+                                                                            })
+                                                                        ]
+                                                                        : []),
+                                                                    h('div', {
+                                                                        class: 'vxe-table-export--panel-option-row'
+                                                                    }, VxeUICheckboxComponent
+                                                                        ? [
+                                                                            h(VxeUICheckboxComponent, {
+                                                                                props: {
+                                                                                    value: hasEmptyData ? false : defaultOptions.original,
+                                                                                    disabled: hasEmptyData,
+                                                                                    title: getI18n('vxe.export.expOriginalTitle'),
+                                                                                    content: getI18n('vxe.export.expOptOriginal')
+                                                                                },
+                                                                                on: {
+                                                                                    input(value) {
+                                                                                        defaultOptions.original = value;
+                                                                                    }
                                                                                 }
-                                                                            }
-                                                                        }),
-                                                                        isPrint
-                                                                            ? renderEmptyElement($xeTable)
-                                                                            : h(VxeUICheckboxComponent, {
+                                                                            }),
+                                                                            h(VxeUICheckboxComponent, {
                                                                                 props: {
-                                                                                    value: supportStyle ? defaultOptions.useStyle : false,
-                                                                                    disabled: !supportStyle,
-                                                                                    title: getI18n('vxe.export.expUseStyleTitle'),
-                                                                                    content: getI18n('vxe.export.expOptUseStyle')
+                                                                                    value: hasMerge && supportMerge && checkedAll ? defaultOptions.isMerge : false,
+                                                                                    disabled: hasEmptyData || !hasMerge || !supportMerge || !checkedAll,
+                                                                                    title: getI18n('vxe.export.expMergeTitle'),
+                                                                                    content: getI18n('vxe.export.expOptMerge')
                                                                                 },
                                                                                 on: {
                                                                                     input(value) {
-                                                                                        defaultOptions.useStyle = value;
+                                                                                        defaultOptions.isMerge = value;
                                                                                     }
                                                                                 }
-                                                                            })
-                                                                    ]
-                                                                    : []),
-                                                                h('div', {
-                                                                    class: 'vxe-table-export--panel-option-row'
-                                                                }, VxeUICheckboxComponent
-                                                                    ? [
-                                                                        h(VxeUICheckboxComponent, {
-                                                                            props: {
-                                                                                value: hasTree ? defaultOptions.isTreeAllExpanded : false,
-                                                                                disabled: hasEmptyData || !hasTree,
-                                                                                title: getI18n('vxe.export.expTreeAllExpandTitle'),
-                                                                                content: getI18n('vxe.export.expOptTreeAllExpand')
-                                                                            },
-                                                                            on: {
-                                                                                input(value) {
-                                                                                    defaultOptions.isTreeAllExpanded = value;
+                                                                            }),
+                                                                            isPrint
+                                                                                ? renderEmptyElement($xeTable)
+                                                                                : h(VxeUICheckboxComponent, {
+                                                                                    props: {
+                                                                                        value: supportStyle ? defaultOptions.useStyle : false,
+                                                                                        disabled: !supportStyle,
+                                                                                        title: getI18n('vxe.export.expUseStyleTitle'),
+                                                                                        content: getI18n('vxe.export.expOptUseStyle')
+                                                                                    },
+                                                                                    on: {
+                                                                                        input(value) {
+                                                                                            defaultOptions.useStyle = value;
+                                                                                        }
+                                                                                    }
+                                                                                })
+                                                                        ]
+                                                                        : []),
+                                                                    h('div', {
+                                                                        class: 'vxe-table-export--panel-option-row'
+                                                                    }, VxeUICheckboxComponent
+                                                                        ? [
+                                                                            h(VxeUICheckboxComponent, {
+                                                                                props: {
+                                                                                    value: hasTree ? defaultOptions.isTreeAllExpanded : false,
+                                                                                    disabled: hasEmptyData || !hasTree,
+                                                                                    title: getI18n('vxe.export.expTreeAllExpandTitle'),
+                                                                                    content: getI18n('vxe.export.expOptTreeAllExpand')
+                                                                                },
+                                                                                on: {
+                                                                                    input(value) {
+                                                                                        defaultOptions.isTreeAllExpanded = value;
+                                                                                    }
                                                                                 }
-                                                                            }
-                                                                        }),
-                                                                        h(VxeUICheckboxComponent, {
-                                                                            props: {
-                                                                                value: hasRowGroup ? defaultOptions.isRowGroupAllExpanded : false,
-                                                                                disabled: hasEmptyData || !hasRowGroup,
-                                                                                title: getI18n('vxe.export.expRowGroupAllExpandTitle'),
-                                                                                content: getI18n('vxe.export.expOptRowGroupAllExpand')
-                                                                            },
-                                                                            on: {
-                                                                                input(value) {
-                                                                                    defaultOptions.isRowGroupAllExpanded = value;
+                                                                            }),
+                                                                            h(VxeUICheckboxComponent, {
+                                                                                props: {
+                                                                                    value: hasRowGroup ? defaultOptions.isRowGroupAllExpanded : false,
+                                                                                    disabled: hasEmptyData || !hasRowGroup,
+                                                                                    title: getI18n('vxe.export.expRowGroupAllExpandTitle'),
+                                                                                    content: getI18n('vxe.export.expOptRowGroupAllExpand')
+                                                                                },
+                                                                                on: {
+                                                                                    input(value) {
+                                                                                        defaultOptions.isRowGroupAllExpanded = value;
+                                                                                    }
                                                                                 }
-                                                                            }
-                                                                        })
-                                                                    ]
-                                                                    : [])
-                                                            ])
-                                                    ])
+                                                                            })
+                                                                        ]
+                                                                        : [])
+                                                                ])
+                                                        ])
                                                 ]
                                             ])
                                         ])

package/es/table/module/export/import-panel.js

@@ -1,7 +1,7 @@
 import { defineVxeComponent } from '../../../ui/src/comp';
 import { VxeUI } from '../../../ui';
 import XEUtils from 'xe-utils';
-import { parseFile } from '../../../ui/src/utils';
+import { getDefaultConfig, parseFile } from '../../../ui/src/utils';
 import { createComponentLog } from '../../../ui/src/log';
 const { errLog } = createComponentLog('table');
 const { getI18n, getIcon, globalMixins, renderEmptyElement } = VxeUI;
@@ -131,7 +131,10 @@ export default {
             const { defaultOptions, storeData } = props;
             const selectName = $xeImportPanel.computeSelectName;
             const hasFile = $xeImportPanel.computeHasFile;
+            const importOpts = $xeTable.computeImportOpts;
             const parseTypeLabel = $xeImportPanel.computeParseTypeLabel;
+            const modelOptions = importOpts.modelOptions || {};
+            const settingOptions = importOpts.settingOptions || {};
             const slots = defaultOptions.slots || {};
             const topSlot = slots.top;
             const bottomSlot = slots.bottom;
@@ -142,17 +145,19 @@ export default {
                 props: {
                     id: 'VXE_IMPORT_MODAL',
                     value: storeData.visible,
-                    title: getI18n('vxe.import.impTitle'),
-                    width: 540,
-                    minWidth: 360,
-                    minHeight: 240,
+                    title: modelOptions.title || getI18n('vxe.import.impTitle'),
+                    width: modelOptions.width || 540,
+                    height: modelOptions.height,
+                    minWidth: modelOptions.minWidth || 360,
+                    minHeight: modelOptions.minHeight || 240,
                     mask: true,
                     lockView: true,
                     showFooter: true,
                     escClosable: true,
                     maskClosable: true,
-                    showMaximize: true,
-                    resize: true,
+                    showMinimize: modelOptions.showMinimize,
+                    showMaximize: getDefaultConfig(modelOptions.showMaximize, true),
+                    resize: getDefaultConfig(modelOptions.resize, true),
                     loading: reactData.loading
                 },
                 on: {
@@ -226,22 +231,24 @@ export default {
                                                 h('td', getI18n('vxe.import.impType')),
                                                 h('td', parseTypeLabel)
                                             ]),
-                                            h('tr', [
-                                                h('td', getI18n('vxe.import.impMode')),
-                                                h('td', [
-                                                    h('vxe-select', {
-                                                        props: {
-                                                            value: defaultOptions.mode,
-                                                            options: storeData.modeList
-                                                        },
-                                                        on: {
-                                                            modelValue(value) {
-                                                                defaultOptions.mode = value;
+                                            settingOptions.showMode === false
+                                                ? renderEmptyElement($xeTable)
+                                                : h('tr', [
+                                                    h('td', getI18n('vxe.import.impMode')),
+                                                    h('td', [
+                                                        h('vxe-select', {
+                                                            props: {
+                                                                value: defaultOptions.mode,
+                                                                options: storeData.modeList
+                                                            },
+                                                            on: {
+                                                                modelValue(value) {
+                                                                    defaultOptions.mode = value;
+                                                                }
                                                             }
-                                                        }
-                                                    })
+                                                        })
+                                                    ])
                                                 ])
-                                            ])
                                         ])
                                     ])
                                 ]),