vxe-pc-ui 4.16.13 → 4.16.15

package/packages/print/src/util.ts

@@ -8,7 +8,7 @@ import type { VxePrintProps, VxePrintPropTypes, VxePrintDefines, VxePrintConstru
 let printFrame: any
 
 // 默认导出或打印的 HTML 样式
-const defaultHtmlStyle = 'body{padding:0;font-family:"Microsoft YaHei",微软雅黑,"MicrosoftJhengHei",华文细黑,STHeiti,MingLiu}body *{-webkit-box-sizing:border-box;box-sizing:border-box}.vxe-table{border-collapse:collapse;text-align:left;border-spacing:0}.vxe-table:not(.is--print){table-layout:fixed}.vxe-table,.vxe-table th,.vxe-table td,.vxe-table td{border-color:#D0D0D0;border-style:solid;border-width:0}.vxe-table.is--print{width:100%}.border--default,.border--full,.border--outer{border-top-width:1px}.border--default,.border--full,.border--outer{border-left-width:1px}.border--outer,.border--default th,.border--default td,.border--full th,.border--full td,.border--outer th,.border--inner th,.border--inner td{border-bottom-width:1px}.border--default,.border--outer,.border--full th,.border--full td{border-right-width:1px}.border--default th,.border--full th,.border--outer th{background-color:#f8f8f9}.vxe-table td>div,.vxe-table th>div{padding:.5em .4em}.col--center{text-align:center}.col--right{text-align:right}.vxe-table:not(.is--print) .col--ellipsis>div{overflow:hidden;text-overflow:ellipsis;white-space:nowrap;word-break:break-all}.vxe-table--tree-node{text-align:left}.vxe-table--tree-node-wrapper{position:relative}.vxe-table--tree-icon-wrapper{position:absolute;top:50%;width:1em;height:1em;text-align:center;-webkit-transform:translateY(-50%);transform:translateY(-50%);-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none;cursor:pointer}.vxe-table--tree-unfold-icon,.vxe-table--tree-fold-icon{position:absolute;width:0;height:0;border-style:solid;border-width:.5em;border-right-color:transparent;border-bottom-color:transparent}.vxe-table--tree-unfold-icon{left:.3em;top:0;border-left-color:#939599;border-top-color:transparent}.vxe-table--tree-fold-icon{left:0;top:.3em;border-left-color:transparent;border-top-color:#939599}.vxe-table--tree-cell{display:block;padding-left:1.5em}.vxe-table input[type="checkbox"]{margin:0}.vxe-table input[type="checkbox"],.vxe-table input[type="radio"],.vxe-table input[type="checkbox"]+span,.vxe-table input[type="radio"]+span{vertical-align:middle;padding-left:0.4em}'
+const defaultHtmlStyle = 'body{padding:0;color:rgba(0,0,0,0.7);font-family:"Microsoft YaHei",微软雅黑,"MicrosoftJhengHei",华文细黑,STHeiti,MingLiu;}body *{-webkit-box-sizing:border-box;box-sizing:border-box;}.vxe-table{border-collapse:collapse;text-align:left;border-spacing:0;}.vxe-table.is--default-width,.vxe-table.is--auto-width{width:100%;}.vxe-table.is--scale-width{table-layout:fixed;}.vxe-table,.vxe-table th,.vxe-table td,.vxe-table td{word-break:break-all;border-color:#D0D0D0;border-style:solid;border-width:0;}.border--default,.border--full,.border--outer{border-top-width:1px;}.border--default,.border--full,.border--outer{border-left-width:1px}.border--outer,.border--default th,.border--default td,.border--full th,.border--full td,.border--outer th,.border--inner th,.border--inner td{border-bottom-width:1px;}.border--default,.border--outer,.border--full th,.border--full td{border-right-width:1px;}.border--default th,.border--full th,.border--outer th{background-color:#f8f8f9;}.vxe-table td>div,.vxe-table th>div{padding:0.5em 0.4em;}.col--center{text-align:center;}.col--right{text-align:right;}.vxe-table .col--ellipsis>div{overflow:hidden;text-overflow:ellipsis;white-space:nowrap;word-break:break-all;}.vxe-table--tree-node{text-align:left;}.vxe-table--tree-node-wrapper{position:relative;}.vxe-table--tree-icon-wrapper{position:absolute;top:50%;width:1em;height:1em;text-align:center;-webkit-transform:translateY(-50%);transform:translateY(-50%);-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none;cursor:pointer;}.vxe-table--tree-unfold-icon,.vxe-table--tree-fold-icon{position:absolute;width:0;height:0;border-style:solid;border-width:0.5em;border-right-color:transparent;border-bottom-color:transparent;}.vxe-table--tree-unfold-icon{left:.3em;top:0;border-left-color:#939599;border-top-color:transparent;}.vxe-table--tree-fold-icon{left:0;top:.3em;border-left-color:transparent;border-top-color:#939599;}.vxe-table--tree-cell{display:block;padding-left:1.5em;}.vxe-table input[type="checkbox"]{margin:0;}.vxe-table input[type="checkbox"],.vxe-table input[type="radio"],.vxe-table input[type="checkbox"]+span,.vxe-table input[type="radio"]+span{vertical-align:middle;padding-left:0.4em}'
 
 export function trimHtml (html: string) {
   return `${html}`.replace(/(<!---->)/, '')
@@ -136,7 +136,6 @@ function createHtmlPage (opts: VxePrintProps & { _pageBreaks: boolean }, printHt
     '.vxe-print-page-break--content{flex-grow:1;overflow:hidden;}',
     `.vxe-print-page-break--footer-page-number{font-size:${pnStyOpts.fontSize || '1.2em'};color:${pnStyOpts.color || defaultFontColor};text-align:${opts.footerAlign || pnStyOpts.textAlign || 'center'};}`,
     '</style>',
-    '<style>.vxe-table{white-space:pre;}</style>',
     `<style>${defaultHtmlStyle}</style>`,
     isPbMode ? '<style>body{margin:0;}</style>' : '',
     customStyle ? `<style>${customStyle}</style>` : '',

package/styles/components/splitter.scss

@@ -162,7 +162,6 @@
   border-radius: var(--vxe-ui-base-border-radius);
   color: var(--vxe-ui-layout-background-color);
   background-color: var(--vxe-ui-splitter-handle-button-background-color);
-  border: 1px solid var(--vxe-ui-input-border-color);
   cursor: pointer;
   pointer-events: all;
   @include baseMixin.createAnimationTransition(transform, 0.1s);
@@ -174,7 +173,7 @@
     transform: scale(0.9);
   }
   & > i {
-    font-size: 0.6em;
+    font-size: 0.76em;
   }
 }
 .vxe-splitter-panel-handle {
@@ -197,8 +196,8 @@
       height: 100%;
     }
     .vxe-splitter-panel-action-btn {
-      width: var(--vxe-ui-splitter-handle-bar-horizontal-width);
-      height: var(--vxe-ui-splitter-handle-bar-horizontal-height);
+      width: var(--vxe-ui-splitter-handle-bar-horizontal-action-btn-width);
+      height: var(--vxe-ui-splitter-handle-bar-horizontal-action-btn-height);
     }
   }
   &.is--vertical {
@@ -220,8 +219,8 @@
       width: 100%;
     }
     .vxe-splitter-panel-action-btn {
-      width: var(--vxe-ui-splitter-handle-bar-vertical-width);
-      height: var(--vxe-ui-splitter-handle-bar-vertical-height);
+      width: var(--vxe-ui-splitter-handle-bar-vertical-action-btn-width);
+      height: var(--vxe-ui-splitter-handle-bar-vertical-action-btn-height);
     }
   }
   &.is--resize {

package/styles/print/default.css

@@ -0,0 +1,154 @@
+body {
+	padding: 0;
+	color: rgba(0,0,0,0.7);
+	font-family: "Microsoft YaHei",微软雅黑,"MicrosoftJhengHei",华文细黑,STHeiti,MingLiu;
+}
+
+body * {
+	-webkit-box-sizing: border-box;
+	box-sizing: border-box;
+}
+
+.vxe-table {
+	border-collapse: collapse;
+	text-align: left;
+	border-spacing: 0;
+}
+
+.vxe-table.is--default-width,
+.vxe-table.is--auto-width {
+	width: 100%;
+}
+.vxe-table.is--scale-width {
+	table-layout: fixed;
+}
+
+.vxe-table,
+.vxe-table th,
+.vxe-table td,
+.vxe-table td {
+  word-break: break-all;
+	border-color: #D0D0D0;
+	border-style: solid;
+	border-width: 0;
+}
+
+.border--default,
+.border--full,
+.border--outer {
+	border-top-width: 1px;
+}
+
+.border--default,
+.border--full,
+.border--outer {
+	border-left-width: 1px
+}
+
+.border--outer,
+.border--default th,
+.border--default td,
+.border--full th,
+.border--full td,
+.border--outer th,
+.border--inner th,
+.border--inner td {
+	border-bottom-width: 1px;
+}
+
+.border--default,
+.border--outer,.border--full th,
+.border--full td {
+	border-right-width: 1px;
+}
+
+.border--default th,
+.border--full th,
+.border--outer th {
+	background-color: #f8f8f9;
+}
+
+.vxe-table td>div,
+.vxe-table th>div {
+	padding: 0.5em 0.4em;
+}
+
+.col--center {
+	text-align: center;
+}
+
+.col--right {
+	text-align: right;
+}
+
+.vxe-table .col--ellipsis>div {
+	overflow: hidden;
+	text-overflow: ellipsis;
+	white-space: nowrap;
+	word-break: break-all;
+}
+
+.vxe-table--tree-node {
+	text-align: left;
+}
+
+.vxe-table--tree-node-wrapper {
+	position: relative;
+}
+
+.vxe-table--tree-icon-wrapper {
+	position: absolute;
+	top: 50%;
+	width: 1em;
+	height: 1em;
+	text-align: center;
+	-webkit-transform: translateY(-50%);
+	transform: translateY(-50%);
+	-webkit-user-select: none;
+	-moz-user-select: none;
+	-ms-user-select: none;
+	user-select: none;
+	cursor: pointer;
+}
+
+.vxe-table--tree-unfold-icon,
+.vxe-table--tree-fold-icon {
+	position: absolute;
+	width: 0;
+	height: 0;
+	border-style: solid;
+	border-width: 0.5em;
+	border-right-color: transparent;
+	border-bottom-color: transparent;
+}
+
+.vxe-table--tree-unfold-icon {
+	left: .3em;
+	top: 0;
+	border-left-color: #939599;
+	border-top-color: transparent;
+}
+
+.vxe-table--tree-fold-icon {
+	left: 0;
+	top: .3em;
+	border-left-color: transparent;
+	border-top-color: #939599;
+}
+
+.vxe-table--tree-cell {
+	display: block;
+	padding-left: 1.5em;
+}
+
+.vxe-table input[type="checkbox"] {
+	margin: 0;
+}
+
+.vxe-table input[type="checkbox"],
+.vxe-table input[type="radio"],
+.vxe-table input[type="checkbox"]+span,
+.vxe-table input[type="radio"]+span {
+	vertical-align: middle;
+	padding-left: 0.4em;
+}

package/styles/theme/base.scss

@@ -247,11 +247,15 @@
   --vxe-ui-calendar-festival-selected-color: var(--vxe-ui-calendar-selected-color);
   --vxe-ui-calendar-notice-selected-background-color: var(--vxe-ui-calendar-selected-color);
 
-  /*split*/
-  --vxe-ui-splitter-handle-bar-horizontal-width: 0.68em;
-  --vxe-ui-splitter-handle-bar-horizontal-height: 3.2em;
-  --vxe-ui-splitter-handle-bar-vertical-width: var(--vxe-ui-splitter-handle-bar-horizontal-height);
+  /*splitter*/
+  --vxe-ui-splitter-handle-bar-horizontal-width: 0.65em;
+  // --vxe-ui-splitter-handle-bar-horizontal-height: 3.2em;
+  // --vxe-ui-splitter-handle-bar-vertical-width: var(--vxe-ui-splitter-handle-bar-horizontal-height);
   --vxe-ui-splitter-handle-bar-vertical-height: var(--vxe-ui-splitter-handle-bar-horizontal-width);
+  --vxe-ui-splitter-handle-bar-horizontal-action-btn-width: var(--vxe-ui-splitter-handle-bar-horizontal-width);
+  --vxe-ui-splitter-handle-bar-horizontal-action-btn-height: 3em;
+  --vxe-ui-splitter-handle-bar-vertical-action-btn-width: var(--vxe-ui-splitter-handle-bar-horizontal-action-btn-height);
+  --vxe-ui-splitter-handle-bar-vertical-action-btn-height: var(--vxe-ui-splitter-handle-bar-horizontal-action-btn-width);
   --vxe-ui-splitter-resizable-line-color: #D9DDDF;
   --vxe-ui-splitter-resizable-drag-line-color: var(--vxe-ui-font-primary-color);
 

package/styles/theme/dark.scss

@@ -115,7 +115,7 @@
   /*rate*/
   --vxe-ui-rate-item-color: #bd9537;
 
-  /*split*/
+  /*splitter*/
   --vxe-ui-splitter-handle-button-background-color: #9f9f9f;
   --vxe-ui-splitter-handle-bar-background-color: #444444;
   --vxe-ui-splitter-handle-bar-hover-background-color: #606060;

package/styles/theme/light.scss

@@ -114,7 +114,7 @@
   /*rate*/
   --vxe-ui-rate-item-color: #{light_variable.$vxe-ui-rate-item-color};
 
-  /*split*/
+  /*splitter*/
   --vxe-ui-splitter-handle-button-background-color: #{light_variable.$vxe-ui-splitter-handle-button-background-color};
   --vxe-ui-splitter-handle-bar-background-color: #{light_variable.$vxe-ui-splitter-handle-bar-background-color};
   --vxe-ui-splitter-handle-bar-hover-background-color: #{light_variable.$vxe-ui-splitter-handle-bar-hover-background-color};

package/styles/variable.scss

@@ -109,9 +109,9 @@ $vxe-ui-tree-drag-over-background-color: rgba(255,255,200,0.3) !default;
 $vxe-ui-rate-item-color: #f7ba2a !default;
 
 /*split*/
-$vxe-ui-splitter-handle-button-background-color: #8b8b8b;
-$vxe-ui-splitter-handle-bar-background-color: #e2e2e3;
-$vxe-ui-splitter-handle-bar-hover-background-color: #d8d8d8;
+$vxe-ui-splitter-handle-button-background-color: #a4a4a4 !default;
+$vxe-ui-splitter-handle-bar-background-color: #e2e2e3 !default;
+$vxe-ui-splitter-handle-bar-hover-background-color: #d8d8d8 !default;
 
 /*cascader*/
 $vxe-ui-cascader-node-hover-background-color: #f5f7fa !default;

package/types/components/table.d.ts

@@ -1531,6 +1531,10 @@ export namespace VxeTablePropTypes {
    * 提示信息配置项
    */
   export interface TooltipConfig<D = VxeTablePropTypes.Row> {
+    /**
+     * 当 show-overflow=true 时，默认使用指定提示类型
+     */
+    mode?: 'ellipsis' | 'title' | 'tooltip' | '' | null
     /**
      * 所有单元格开启工具提示
      */
@@ -2967,7 +2971,7 @@ export namespace VxeTablePropTypes {
   /**
      * 导入参数
      */
-  export interface ImportConfig {
+  export interface ImportConfig<D = any> {
     // 内置属性
     _typeMaps?: Record<string, number>
 
@@ -3039,9 +3043,10 @@ export namespace VxeTablePropTypes {
     colid?: number
     type?: string
     field?: string
+    width?: number | string
   }
 
-  interface ExportAndPrintConfig {
+  interface ExportAndPrintConfig<D = any> {
     /**
      * 文件名
      */
@@ -3171,7 +3176,7 @@ export namespace VxeTablePropTypes {
   /**
    * 导出参数
    */
-  export interface ExportConfig extends ExportAndPrintConfig {
+  export interface ExportConfig<D = any> extends ExportAndPrintConfig<D> {
     // 内置属性
     _typeMaps?: Record<string, number>
     /**
@@ -3215,7 +3220,7 @@ export namespace VxeTablePropTypes {
     }): void
   }
   export interface ExportOpts extends ExportConfig { }
-  export interface ExportHandleOptions extends Exclude<ExportConfig, 'filename' | 'sheetName'> {
+  export interface ExportHandleOptions extends Exclude<ExportConfig, 'filename' | 'sheetName'>, PrintConfig {
     filename: string
     sheetName: string
     data: any[]
@@ -3229,6 +3234,10 @@ export namespace VxeTablePropTypes {
      * @private
      */
     _isCustomData?: boolean
+    /**
+     * @private
+     */
+    _columnConfs?: VxeTableDefines.ColumnInfo[] | ExportOrPrintColumnOption[]
     /**
      * @private
      */
@@ -3238,7 +3247,11 @@ export namespace VxeTablePropTypes {
   /**
    * 打印参数
    */
-  export interface PrintConfig extends ExportAndPrintConfig {
+  export interface PrintConfig<D = any> extends ExportAndPrintConfig<D> {
+    /**
+     * 列宽计算模式，支持默认default，等比例scale，自适应auto
+     */
+    widthMode?: 'default' | 'scale' | 'auto' | '' | null
     /**
      * 打印样式
      */
@@ -3550,15 +3563,15 @@ export interface VxeTableProps<D = any> {
   /**
    * 导出配置项
    */
-  exportConfig?: VxeTablePropTypes.ExportConfig
+  exportConfig?: VxeTablePropTypes.ExportConfig<D>
   /**
    * 导入配置项
    */
-  importConfig?: VxeTablePropTypes.ImportConfig
+  importConfig?: VxeTablePropTypes.ImportConfig<D>
   /**
    * 打印配置项
    */
-  printConfig?: VxeTablePropTypes.PrintConfig
+  printConfig?: VxeTablePropTypes.PrintConfig<D>
   /**
    * 展开行配置项
    */
@@ -4720,12 +4733,14 @@ export interface TableMethods<DT = any> {
    * @param checked 是否选中
    */
   setCheckboxRow(rows: any | any[], checked: boolean): Promise<any>
+  // 后续可能废弃
+  setCheckboxRowKey(keys: string | number | (string | number)[] | null | undefined, checked: boolean): Promise<any>
   /**
    * 用于 type=checkbox，设置行为选中状态，第二个参数为选中与否
    * @param keys 指定主键
    * @param checked 是否选中
    */
-  setCheckboxRowKey(keys: string | number | (string | number)[] | null | undefined, checked: boolean): Promise<any>
+  setCheckboxRowByKey(keys: string | number | (string | number)[] | null | undefined, checked: boolean): Promise<any>
   /**
    * 用于 type=checkbox，判断列头复选框是否被选中
    */
@@ -4812,11 +4827,12 @@ export interface TableMethods<DT = any> {
    * @param row 指定行
    */
   setRadioRow(row: any): Promise<any>
+  setRadioRowKey(key: string | number | null | undefined): Promise<any>
   /**
    * 用于 type=radio，设置某一行为选中状态
    * @param key 指定主键
    */
-  setRadioRowKey(key: string | number | null | undefined): Promise<any>
+  setRadioByRowKey(key: string | number | null | undefined): Promise<any>
   /**
    * 将指定行设置为取消/标记待删除状态
    */
@@ -5995,6 +6011,7 @@ export namespace VxeTableDefines {
      * 是否展开所有分组层级
      */
     isRowGroupAllExpanded: boolean
+    widthMode?: 'default' | 'scale' | 'auto' | '' | null
     useStyle: boolean
     original: boolean
     message: boolean

package/types/components/tree.d.ts

@@ -35,6 +35,9 @@ export namespace VxeTreePropTypes {
    * 提示信息配置项
    */
   export interface TooltipConfig<D = any> {
+    /**
+     * 当 show-overflow=true 时，默认使用指定提示类型
+     */
     mode?: 'ellipsis' | 'title' | 'tooltip' | '' | null
     /**
      * 所有节点开启工具提示