vxe-pc-ui 3.3.0 → 3.3.2

package/styles/variable.scss

@@ -1,104 +1,104 @@
 /*font color*/
-$vxe-ui-font-color: #606266;
-$vxe-ui-font-tinge-color: #d4d5d7;
-$vxe-ui-font-lighten-color: #797b80;
-$vxe-ui-font-darken-color: #47494c;
-$vxe-ui-font-disabled-color: #BFBFBF;
+$vxe-ui-font-color: #606266 !default;
+$vxe-ui-font-tinge-color: #d4d5d7 !default;
+$vxe-ui-font-lighten-color: #797b80 !default;
+$vxe-ui-font-darken-color: #47494c !default;
+$vxe-ui-font-disabled-color: #BFBFBF !default;
 
 /*font status color*/
-$vxe-ui-font-primary-color: #409eff;
-$vxe-ui-font-primary-hover-color: #f5f7fa;
-$vxe-ui-font-primary-tinge-color: #e8f3ff;
-$vxe-ui-font-primary-lighten-color: #73b8ff;
-$vxe-ui-font-primary-darken-color: #0d84ff;
-$vxe-ui-font-primary-disabled-color: #a6d2ff;
-
-$vxe-ui-status-success-color: #67c23a;
-$vxe-ui-status-info-color: #909399;
-$vxe-ui-status-warning-color: #e6a23c;
-$vxe-ui-status-danger-color: #f56c6c;
-$vxe-ui-status-error-color: #f56c6c;
-
-$vxe-ui-status-success-tinge-color: #eef8e9;
-$vxe-ui-status-info-tinge-color: #f5f5f6;
-$vxe-ui-status-warning-tinge-color: #fcf4e8;
-$vxe-ui-status-error-tinge-color: #fef2f2;
-$vxe-ui-status-danger-tinge-color: $vxe-ui-status-error-tinge-color;
-
-$vxe-ui-status-success-lighten-color: #85cf60;
-$vxe-ui-status-info-lighten-color: #abadb1;
-$vxe-ui-status-warning-lighten-color: #ecb869;
-$vxe-ui-status-error-lighten-color: #f89c9c;
-$vxe-ui-status-danger-lighten-color: $vxe-ui-status-error-lighten-color;
-
-$vxe-ui-status-success-darken-color: #529b2e;
-$vxe-ui-status-info-darken-color: #767980;
-$vxe-ui-status-warning-darken-color: #d48a1b;
-$vxe-ui-status-error-darken-color: #f56c6c;
-$vxe-ui-status-danger-darken-color: $vxe-ui-status-error-darken-color;
-
-$vxe-ui-status-success-disabled-color: #a3db87;
-$vxe-ui-status-info-disabled-color: #c5c7ca;
-$vxe-ui-status-warning-disabled-color: #f2cd96;
-$vxe-ui-status-error-disabled-color: #f5a8a8;
-$vxe-ui-status-danger-disabled-color: $vxe-ui-status-error-disabled-color;
+$vxe-ui-font-primary-color: #409eff !default;
+$vxe-ui-font-primary-hover-color: #f5f7fa !default;
+$vxe-ui-font-primary-tinge-color: #e8f3ff !default;
+$vxe-ui-font-primary-lighten-color: #73b8ff !default;
+$vxe-ui-font-primary-darken-color: #0d84ff !default;
+$vxe-ui-font-primary-disabled-color: #a6d2ff !default;
+
+$vxe-ui-status-success-color: #67c23a !default;
+$vxe-ui-status-info-color: #909399 !default;
+$vxe-ui-status-warning-color: #e6a23c !default;
+$vxe-ui-status-danger-color: #f56c6c !default;
+$vxe-ui-status-error-color: #f56c6c !default;
+
+$vxe-ui-status-success-tinge-color: #eef8e9 !default;
+$vxe-ui-status-info-tinge-color: #f5f5f6 !default;
+$vxe-ui-status-warning-tinge-color: #fcf4e8 !default;
+$vxe-ui-status-error-tinge-color: #fef2f2 !default;
+$vxe-ui-status-danger-tinge-color: $vxe-ui-status-error-tinge-color !default;
+
+$vxe-ui-status-success-lighten-color: #85cf60 !default;
+$vxe-ui-status-info-lighten-color: #abadb1 !default;
+$vxe-ui-status-warning-lighten-color: #ecb869 !default;
+$vxe-ui-status-error-lighten-color: #f89c9c !default;
+$vxe-ui-status-danger-lighten-color: $vxe-ui-status-error-lighten-color !default;
+
+$vxe-ui-status-success-darken-color: #529b2e !default;
+$vxe-ui-status-info-darken-color: #767980 !default;
+$vxe-ui-status-warning-darken-color: #d48a1b !default;
+$vxe-ui-status-error-darken-color: #f56c6c !default;
+$vxe-ui-status-danger-darken-color: $vxe-ui-status-error-darken-color !default;
+
+$vxe-ui-status-success-disabled-color: #a3db87 !default;
+$vxe-ui-status-info-disabled-color: #c5c7ca !default;
+$vxe-ui-status-warning-disabled-color: #f2cd96 !default;
+$vxe-ui-status-error-disabled-color: #f5a8a8 !default;
+$vxe-ui-status-danger-disabled-color: $vxe-ui-status-error-disabled-color !default;
 
 /*base*/
-$vxe-ui-base-popup-border-color: #DADCE0;
-$vxe-ui-base-popup-box-shadow: 0 0 10px 0 rgba(0, 0, 0, 0.16);
-$vxe-ui-base-drag-background-color: #dde9fd;
-$vxe-ui-base-active-background-color: #e6f4ff;
-$vxe-ui-base-hover-background-color: rgba(0, 0, 0, 0.04);
+$vxe-ui-base-popup-border-color: #DADCE0 !default;
+$vxe-ui-base-popup-box-shadow: 0 0 10px 0 rgba(0, 0, 0, 0.16) !default;
+$vxe-ui-base-drag-background-color: #dde9fd !default;
+$vxe-ui-base-active-background-color: #e6f4ff !default;
+$vxe-ui-base-hover-background-color: rgba(0, 0, 0, 0.04) !default;
 
 /*layout*/
-$vxe-ui-layout-background-color: #ffffff;
+$vxe-ui-layout-background-color: #ffffff !default;
 
 /*input*/
-$vxe-ui-input-border-color: #dcdfe6;
-$vxe-ui-input-placeholder-color: #C0C4CC;
-$vxe-ui-input-disabled-background-color: #f3f3f3;
+$vxe-ui-input-border-color: #dcdfe6 !default;
+$vxe-ui-input-placeholder-color: #C0C4CC !default;
+$vxe-ui-input-disabled-background-color: #f3f3f3 !default;
 
 /*modal*/
-$vxe-ui-modal-header-background-color: #F8F8F8;
+$vxe-ui-modal-header-background-color: #F8F8F8 !default;
 
 /*tabs*/
-$vxe-ui-tabs-card-header-background-color: #f5f7fa;
-$vxe-ui-tabs-close-hover-background-color: rgba(0, 0, 0, 0.1);
-$vxe-ui-tabs-bar-scrolling-box-shadow-color: rgba(0, 0, 0, 0.12);
+$vxe-ui-tabs-card-header-background-color: #f5f7fa !default;
+$vxe-ui-tabs-close-hover-background-color: rgba(0, 0, 0, 0.1) !default;
+$vxe-ui-tabs-bar-scrolling-box-shadow-color: rgba(0, 0, 0, 0.12) !default;
 
 /*menu*/
-$vxe-ui-menu-item-hover-color: $vxe-ui-font-primary-color;
-$vxe-ui-menu-collapse-wrapper-box-shadow: $vxe-ui-base-popup-box-shadow;
+$vxe-ui-menu-item-hover-color: $vxe-ui-font-primary-color !default;
+$vxe-ui-menu-collapse-wrapper-box-shadow: $vxe-ui-base-popup-box-shadow !default;
 
 /*loading*/
-$vxe-ui-loading-background-color: rgba(255, 255, 255, 0.5);
+$vxe-ui-loading-background-color: rgba(255, 255, 255, 0.5) !default;
  
 /*form*/
-$vxe-ui-form-title-background-color: #f8f8f9;
-$vxe-ui-form-border-color: #e8eaec;
+$vxe-ui-form-title-background-color: #f8f8f9 !default;
+$vxe-ui-form-border-color: #e8eaec !default;
 
 /*form-design*/
-$vxe-ui-form-design-widget-hover-background-color: $vxe-ui-base-hover-background-color;
-$vxe-ui-form-design-sub-widget-hover-background-color: rgba(0, 0, 0, 0.05);
+$vxe-ui-form-design-widget-hover-background-color: $vxe-ui-base-hover-background-color !default;
+$vxe-ui-form-design-sub-widget-hover-background-color: rgba(0, 0, 0, 0.05) !default;
 
 /*list-design*/
-$vxe-ui-list-design-table-border-color: #e8eaec;
-$vxe-ui-list-design-table-header-background-color: #f8f8f9;
+$vxe-ui-list-design-table-border-color: #e8eaec !default;
+$vxe-ui-list-design-table-header-background-color: #f8f8f9 !default;
 
 /*switch*/
-$vxe-ui-switch-close-background-color: rgba(0,0,0,0.35);
+$vxe-ui-switch-close-background-color: rgba(0,0,0,0.35) !default;
 
 /*upload*/
-$vxe-ui-upload-drag-over-background-color:rgba(255,255,200,0.8);
+$vxe-ui-upload-drag-over-background-color:rgba(255,255,200,0.8) !default;
 
 /*tree*/
-$vxe-ui-tree-node-hover-background-color: #f5f7fa;
-$vxe-ui-tree-node-radio-checked-background-color: #fff3e0;
-$vxe-ui-tree-node-hover-radio-checked-background-color: #ffebbc;
-$vxe-ui-tree-node-checkbox-checked-background-color: #fff3e0;
-$vxe-ui-tree-node-hover-checkbox-checked-background-color: #ffebbc;
-$vxe-ui-tree-node-current-background-color: #e6f7ff;
-$vxe-ui-tree-node-hover-current-background-color: #d7effb;
+$vxe-ui-tree-node-hover-background-color: #f5f7fa !default;
+$vxe-ui-tree-node-radio-checked-background-color: #fff3e0 !default;
+$vxe-ui-tree-node-hover-radio-checked-background-color: #ffebbc !default;
+$vxe-ui-tree-node-checkbox-checked-background-color: #fff3e0 !default;
+$vxe-ui-tree-node-hover-checkbox-checked-background-color: #ffebbc !default;
+$vxe-ui-tree-node-current-background-color: #e6f7ff !default;
+$vxe-ui-tree-node-hover-current-background-color: #d7effb !default;
 
 /*rate*/
-$vxe-ui-rate-item-color: #f7ba2a;
+$vxe-ui-rate-item-color: #f7ba2a !default;

package/types/components/grid.d.ts

@@ -384,6 +384,9 @@ export namespace VxeGridDefines {
   export interface RowDragstartEventParams<D = any> extends GridEventParams<D>, VxeTableDefines.RowDragstartEventParams<D> { }
   export interface RowDragoverEventParams<D = any> extends GridEventParams<D>, VxeTableDefines.RowDragoverEventParams<D> { }
   export interface RowDragendEventParams<D = any> extends GridEventParams<D>, VxeTableDefines.RowDragendEventParams<D> { }
+  export interface ColumnDragstartEventParams<D = any> extends GridEventParams<D>, VxeTableDefines.ColumnDragstartEventParams<D> { }
+  export interface ColumnDragoverEventParams<D = any> extends GridEventParams<D>, VxeTableDefines.ColumnDragoverEventParams<D> { }
+  export interface ColumnDragendEventParams<D = any> extends GridEventParams<D>, VxeTableDefines.ColumnDragendEventParams<D> { }
 
   export interface ProxyQueryEventParams<D = any> extends GridEventParams<D> {
     status: boolean

package/types/components/table.d.ts

@@ -2719,7 +2719,7 @@ export interface TableInternalData<D = any> {
   // 上一个拖动的行
   prevDragRow?: any
   // 上一个拖动的列
-  prevDragCol?: any
+  prevDragCol?: VxeTableDefines.ColumnInfo
   prevDragPos?: 'top' | 'bottom' | 'left' | 'right' | ''
 
   // 特殊标识

package/types/components/upload.d.ts

@@ -34,6 +34,8 @@ export namespace VxeUploadPropTypes {
   }
   export type FileTypes = string[]
   export type SingleMode = boolean
+  export type DragToUpload = boolean
+  export type PasteToUpload = boolean
   export type KeyField = string
   export type UrlMode = boolean
   export type Multiple = boolean
@@ -111,6 +113,8 @@ export interface VxeUploadProps {
   fileTypes?: VxeUploadPropTypes.FileTypes
   multiple?: VxeUploadPropTypes.Multiple
   singleMode?: VxeUploadPropTypes.SingleMode
+  dragToUpload?: VxeUploadPropTypes.DragToUpload
+  pasteToUpload?: VxeUploadPropTypes.PasteToUpload
   keyField?: VxeUploadPropTypes.KeyField
   urlMode?: VxeUploadPropTypes.UrlMode
   /**
@@ -157,7 +161,8 @@ export interface VxeUploadPrivateComputed extends UploadPrivateComputed { }
 
 export interface UploadReactData {
   isDrag: boolean
-  showMorePopup: boolean,
+  showMorePopup: boolean
+  isActivated: boolean
   fileList: VxeUploadDefines.FileObjItem[]
   fileCacheMaps: Record<string, VxeUploadDefines.FileCacheItem>
 }