vxe-table 3.11.1 → 3.11.3

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/lib/ui/index.js CHANGED
@@ -13,7 +13,7 @@ Object.defineProperty(exports, "VxeUI", {
13
13
  exports.version = exports.validators = exports.use = exports.t = exports.setup = exports.setTheme = exports.setLanguage = exports.setIcon = exports.setI18n = exports.setConfig = exports.saveFile = exports.renderer = exports.readFile = exports.print = exports.modal = exports.menus = exports.log = exports.interceptor = exports.globalResize = exports.globalEvents = exports.getTheme = exports.getIcon = exports.getI18n = exports.getConfig = exports.formats = exports.default = exports.config = exports.commands = exports.clipboard = exports._t = void 0;
14
14
  var _core = require("@vxe-ui/core");
15
15
  var _utils = require("./src/utils");
16
- const version = exports.version = "3.11.1";
16
+ const version = exports.version = "3.11.3";
17
17
  _core.VxeUI.version = version;
18
18
  _core.VxeUI.tableVersion = version;
19
19
  _core.VxeUI.setConfig({
@@ -1 +1 @@
1
- Object.defineProperty(exports,"__esModule",{value:!0}),exports.VXETable=void 0,Object.defineProperty(exports,"VxeUI",{enumerable:!0,get:function(){return _core.VxeUI}}),exports.version=exports.validators=exports.use=exports.t=exports.setup=exports.setTheme=exports.setLanguage=exports.setIcon=exports.setI18n=exports.setConfig=exports.saveFile=exports.renderer=exports.readFile=exports.print=exports.modal=exports.menus=exports.log=exports.interceptor=exports.globalResize=exports.globalEvents=exports.getTheme=exports.getIcon=exports.getI18n=exports.getConfig=exports.formats=exports.default=exports.config=exports.commands=exports.clipboard=exports._t=void 0;var _core=require("@vxe-ui/core"),_utils=require("./src/utils");let version=exports.version="3.11.1",iconPrefix=(_core.VxeUI.version=version,_core.VxeUI.tableVersion=version,_core.VxeUI.setConfig({emptyCell:" ",table:{fit:!0,showHeader:!0,animat:!0,delayHover:250,autoResize:!0,padding:!0,minHeight:144,resizeConfig:{refreshDelay:250},radioConfig:{strict:!0},rowDragConfig:{showIcon:!0},columnDragConfig:{showIcon:!0},checkboxConfig:{strict:!0},tooltipConfig:{enterable:!0},validConfig:{showMessage:!0,autoClear:!0,autoPos:!0,message:"inline",msgMode:"single",theme:"normal"},columnConfig:{maxFixedSize:4},customConfig:{allowVisible:!0,allowResizable:!0,allowFixed:!0,allowSort:!0,showFooter:!0,placement:"top-right",modalOptions:{showMaximize:!0,mask:!0,lockView:!0,resize:!0,escClosable:!0}},sortConfig:{showIcon:!0,iconLayout:"vertical"},filterConfig:{showIcon:!0},treeConfig:{rowField:"id",parentField:"parentId",childrenField:"children",hasChildField:"hasChild",mapChildrenField:"_X_ROW_CHILD",indent:20,showIcon:!0},expandConfig:{showIcon:!0},editConfig:{showIcon:!0,showAsterisk:!0,autoFocus:!0},importConfig:{_typeMaps:{csv:1,html:1,xml:1,txt:1}},exportConfig:{_typeMaps:{csv:1,html:1,xml:1,txt:1}},printConfig:{},mouseConfig:{extension:!0},keyboardConfig:{isEsc:!0},areaConfig:{autoClear:!0,selectCellByHeader:!0,selectCellByBody:!0},clipConfig:{isCopy:!0,isCut:!0,isPaste:!0},fnrConfig:{isFind:!0,isReplace:!0},scrollX:{gt:60},scrollY:{gt:100}},grid:{formConfig:{enabled:!0},pagerConfig:{enabled:!0},toolbarConfig:{enabled:!0},proxyConfig:{enabled:!0,autoLoad:!0,showResponseMsg:!0,showActiveMsg:!0,props:{list:null,result:"result",total:"page.total",message:"message"}}},toolbar:{}}),"vxe-table-icon-"),setTheme=(_core.VxeUI.setIcon({TABLE_SORT_ASC:iconPrefix+"caret-up",TABLE_SORT_DESC:iconPrefix+"caret-down",TABLE_FILTER_NONE:iconPrefix+"funnel",TABLE_FILTER_MATCH:iconPrefix+"funnel",TABLE_EDIT:iconPrefix+"edit",TABLE_TITLE_PREFIX:iconPrefix+"question-circle-fill",TABLE_TITLE_SUFFIX:iconPrefix+"question-circle-fill",TABLE_TREE_LOADED:iconPrefix+"spinner roll",TABLE_TREE_OPEN:iconPrefix+"caret-right rotate90",TABLE_TREE_CLOSE:iconPrefix+"caret-right",TABLE_EXPAND_LOADED:iconPrefix+"spinner roll",TABLE_EXPAND_OPEN:iconPrefix+"arrow-right rotate90",TABLE_EXPAND_CLOSE:iconPrefix+"arrow-right",TABLE_CHECKBOX_CHECKED:iconPrefix+"checkbox-checked-fill",TABLE_CHECKBOX_UNCHECKED:iconPrefix+"checkbox-unchecked",TABLE_CHECKBOX_INDETERMINATE:iconPrefix+"checkbox-indeterminate-fill",TABLE_RADIO_CHECKED:iconPrefix+"radio-checked-fill",TABLE_RADIO_UNCHECKED:iconPrefix+"radio-unchecked",TABLE_CUSTOM_SORT:iconPrefix+"drag-handle",TABLE_MENU_OPTIONS:iconPrefix+"arrow-right",TABLE_DRAG_ROW:iconPrefix+"drag-handle",TABLE_DRAG_COLUMN:iconPrefix+"drag-handle",TOOLBAR_TOOLS_REFRESH:iconPrefix+"repeat",TOOLBAR_TOOLS_REFRESH_LOADING:iconPrefix+"repeat roll",TOOLBAR_TOOLS_IMPORT:iconPrefix+"upload",TOOLBAR_TOOLS_EXPORT:iconPrefix+"download",TOOLBAR_TOOLS_PRINT:iconPrefix+"print",TOOLBAR_TOOLS_FULLSCREEN:iconPrefix+"fullscreen",TOOLBAR_TOOLS_MINIMIZE:iconPrefix+"minimize",TOOLBAR_TOOLS_CUSTOM:iconPrefix+"custom-column",TOOLBAR_TOOLS_FIXED_LEFT:iconPrefix+"fixed-left",TOOLBAR_TOOLS_FIXED_LEFT_ACTIVE:iconPrefix+"fixed-left-fill",TOOLBAR_TOOLS_FIXED_RIGHT:iconPrefix+"fixed-right",TOOLBAR_TOOLS_FIXED_RIGHT_ACTIVE:iconPrefix+"fixed-right-fill"}),exports.setTheme=_core.VxeUI.setTheme),getTheme=exports.getTheme=_core.VxeUI.getTheme,setConfig=exports.setConfig=_core.VxeUI.setConfig,getConfig=exports.getConfig=_core.VxeUI.getConfig,setIcon=exports.setIcon=_core.VxeUI.setIcon,getIcon=exports.getIcon=_core.VxeUI.getIcon,setLanguage=exports.setLanguage=_core.VxeUI.setLanguage,setI18n=exports.setI18n=_core.VxeUI.setI18n,getI18n=exports.getI18n=_core.VxeUI.getI18n,globalEvents=exports.globalEvents=_core.VxeUI.globalEvents,globalResize=exports.globalResize=_core.VxeUI.globalResize,renderer=exports.renderer=_core.VxeUI.renderer,validators=exports.validators=_core.VxeUI.validators,menus=exports.menus=_core.VxeUI.menus,formats=exports.formats=_core.VxeUI.formats,commands=exports.commands=_core.VxeUI.commands,interceptor=exports.interceptor=_core.VxeUI.interceptor,clipboard=exports.clipboard=_core.VxeUI.clipboard,log=exports.log=_core.VxeUI.log,use=exports.use=_core.VxeUI.use,setup=e=>_core.VxeUI.setConfig(e),config=(exports.setup=setup,_core.VxeUI.setup=setup,e=>_core.VxeUI.setConfig(e)),t=(exports.config=config,_core.VxeUI.config=config,(e,o)=>_core.VxeUI.getI18n(e,o)),_t=(exports.t=t,_core.VxeUI.t=t,(e,o)=>(0,_utils.getFuncText)(e,o)),VXETable=(exports._t=_t,_core.VxeUI._t=_t,exports.VXETable=_core.VxeUI),saveFile=e=>_core.VxeUI.saveFile(e),readFile=(exports.saveFile=saveFile,e=>_core.VxeUI.readFile(e)),print=(exports.readFile=readFile,e=>_core.VxeUI.print(e)),modal=(exports.print=print,exports.modal={get(e){return _core.VxeUI.modal.get(e)},close(e){return _core.VxeUI.modal.close(e)},open(e){return _core.VxeUI.modal.open(e)},alert(e,o,r){return _core.VxeUI.modal.alert(e,o,r)},confirm(e,o,r){return _core.VxeUI.modal.confirm(e,o,r)},message(e,o){return _core.VxeUI.modal.message(e,o)},notification(e,o,r){return _core.VxeUI.modal.notification(e,o,r)}});var _default=exports.default=_core.VxeUI;
1
+ Object.defineProperty(exports,"__esModule",{value:!0}),exports.VXETable=void 0,Object.defineProperty(exports,"VxeUI",{enumerable:!0,get:function(){return _core.VxeUI}}),exports.version=exports.validators=exports.use=exports.t=exports.setup=exports.setTheme=exports.setLanguage=exports.setIcon=exports.setI18n=exports.setConfig=exports.saveFile=exports.renderer=exports.readFile=exports.print=exports.modal=exports.menus=exports.log=exports.interceptor=exports.globalResize=exports.globalEvents=exports.getTheme=exports.getIcon=exports.getI18n=exports.getConfig=exports.formats=exports.default=exports.config=exports.commands=exports.clipboard=exports._t=void 0;var _core=require("@vxe-ui/core"),_utils=require("./src/utils");let version=exports.version="3.11.3",iconPrefix=(_core.VxeUI.version=version,_core.VxeUI.tableVersion=version,_core.VxeUI.setConfig({emptyCell:" ",table:{fit:!0,showHeader:!0,animat:!0,delayHover:250,autoResize:!0,padding:!0,minHeight:144,resizeConfig:{refreshDelay:250},radioConfig:{strict:!0},rowDragConfig:{showIcon:!0},columnDragConfig:{showIcon:!0},checkboxConfig:{strict:!0},tooltipConfig:{enterable:!0},validConfig:{showMessage:!0,autoClear:!0,autoPos:!0,message:"inline",msgMode:"single",theme:"normal"},columnConfig:{maxFixedSize:4},customConfig:{allowVisible:!0,allowResizable:!0,allowFixed:!0,allowSort:!0,showFooter:!0,placement:"top-right",modalOptions:{showMaximize:!0,mask:!0,lockView:!0,resize:!0,escClosable:!0}},sortConfig:{showIcon:!0,iconLayout:"vertical"},filterConfig:{showIcon:!0},treeConfig:{rowField:"id",parentField:"parentId",childrenField:"children",hasChildField:"hasChild",mapChildrenField:"_X_ROW_CHILD",indent:20,showIcon:!0},expandConfig:{showIcon:!0},editConfig:{showIcon:!0,showAsterisk:!0,autoFocus:!0},importConfig:{_typeMaps:{csv:1,html:1,xml:1,txt:1}},exportConfig:{_typeMaps:{csv:1,html:1,xml:1,txt:1}},printConfig:{},mouseConfig:{extension:!0},keyboardConfig:{isEsc:!0},areaConfig:{autoClear:!0,selectCellByHeader:!0,selectCellByBody:!0},clipConfig:{isCopy:!0,isCut:!0,isPaste:!0},fnrConfig:{isFind:!0,isReplace:!0},scrollX:{gt:60},scrollY:{gt:100}},grid:{formConfig:{enabled:!0},pagerConfig:{enabled:!0},toolbarConfig:{enabled:!0},proxyConfig:{enabled:!0,autoLoad:!0,showResponseMsg:!0,showActiveMsg:!0,props:{list:null,result:"result",total:"page.total",message:"message"}}},toolbar:{}}),"vxe-table-icon-"),setTheme=(_core.VxeUI.setIcon({TABLE_SORT_ASC:iconPrefix+"caret-up",TABLE_SORT_DESC:iconPrefix+"caret-down",TABLE_FILTER_NONE:iconPrefix+"funnel",TABLE_FILTER_MATCH:iconPrefix+"funnel",TABLE_EDIT:iconPrefix+"edit",TABLE_TITLE_PREFIX:iconPrefix+"question-circle-fill",TABLE_TITLE_SUFFIX:iconPrefix+"question-circle-fill",TABLE_TREE_LOADED:iconPrefix+"spinner roll",TABLE_TREE_OPEN:iconPrefix+"caret-right rotate90",TABLE_TREE_CLOSE:iconPrefix+"caret-right",TABLE_EXPAND_LOADED:iconPrefix+"spinner roll",TABLE_EXPAND_OPEN:iconPrefix+"arrow-right rotate90",TABLE_EXPAND_CLOSE:iconPrefix+"arrow-right",TABLE_CHECKBOX_CHECKED:iconPrefix+"checkbox-checked-fill",TABLE_CHECKBOX_UNCHECKED:iconPrefix+"checkbox-unchecked",TABLE_CHECKBOX_INDETERMINATE:iconPrefix+"checkbox-indeterminate-fill",TABLE_RADIO_CHECKED:iconPrefix+"radio-checked-fill",TABLE_RADIO_UNCHECKED:iconPrefix+"radio-unchecked",TABLE_CUSTOM_SORT:iconPrefix+"drag-handle",TABLE_MENU_OPTIONS:iconPrefix+"arrow-right",TABLE_DRAG_ROW:iconPrefix+"drag-handle",TABLE_DRAG_COLUMN:iconPrefix+"drag-handle",TOOLBAR_TOOLS_REFRESH:iconPrefix+"repeat",TOOLBAR_TOOLS_REFRESH_LOADING:iconPrefix+"repeat roll",TOOLBAR_TOOLS_IMPORT:iconPrefix+"upload",TOOLBAR_TOOLS_EXPORT:iconPrefix+"download",TOOLBAR_TOOLS_PRINT:iconPrefix+"print",TOOLBAR_TOOLS_FULLSCREEN:iconPrefix+"fullscreen",TOOLBAR_TOOLS_MINIMIZE:iconPrefix+"minimize",TOOLBAR_TOOLS_CUSTOM:iconPrefix+"custom-column",TOOLBAR_TOOLS_FIXED_LEFT:iconPrefix+"fixed-left",TOOLBAR_TOOLS_FIXED_LEFT_ACTIVE:iconPrefix+"fixed-left-fill",TOOLBAR_TOOLS_FIXED_RIGHT:iconPrefix+"fixed-right",TOOLBAR_TOOLS_FIXED_RIGHT_ACTIVE:iconPrefix+"fixed-right-fill"}),exports.setTheme=_core.VxeUI.setTheme),getTheme=exports.getTheme=_core.VxeUI.getTheme,setConfig=exports.setConfig=_core.VxeUI.setConfig,getConfig=exports.getConfig=_core.VxeUI.getConfig,setIcon=exports.setIcon=_core.VxeUI.setIcon,getIcon=exports.getIcon=_core.VxeUI.getIcon,setLanguage=exports.setLanguage=_core.VxeUI.setLanguage,setI18n=exports.setI18n=_core.VxeUI.setI18n,getI18n=exports.getI18n=_core.VxeUI.getI18n,globalEvents=exports.globalEvents=_core.VxeUI.globalEvents,globalResize=exports.globalResize=_core.VxeUI.globalResize,renderer=exports.renderer=_core.VxeUI.renderer,validators=exports.validators=_core.VxeUI.validators,menus=exports.menus=_core.VxeUI.menus,formats=exports.formats=_core.VxeUI.formats,commands=exports.commands=_core.VxeUI.commands,interceptor=exports.interceptor=_core.VxeUI.interceptor,clipboard=exports.clipboard=_core.VxeUI.clipboard,log=exports.log=_core.VxeUI.log,use=exports.use=_core.VxeUI.use,setup=e=>_core.VxeUI.setConfig(e),config=(exports.setup=setup,_core.VxeUI.setup=setup,e=>_core.VxeUI.setConfig(e)),t=(exports.config=config,_core.VxeUI.config=config,(e,o)=>_core.VxeUI.getI18n(e,o)),_t=(exports.t=t,_core.VxeUI.t=t,(e,o)=>(0,_utils.getFuncText)(e,o)),VXETable=(exports._t=_t,_core.VxeUI._t=_t,exports.VXETable=_core.VxeUI),saveFile=e=>_core.VxeUI.saveFile(e),readFile=(exports.saveFile=saveFile,e=>_core.VxeUI.readFile(e)),print=(exports.readFile=readFile,e=>_core.VxeUI.print(e)),modal=(exports.print=print,exports.modal={get(e){return _core.VxeUI.modal.get(e)},close(e){return _core.VxeUI.modal.close(e)},open(e){return _core.VxeUI.modal.open(e)},alert(e,o,r){return _core.VxeUI.modal.alert(e,o,r)},confirm(e,o,r){return _core.VxeUI.modal.confirm(e,o,r)},message(e,o){return _core.VxeUI.modal.message(e,o)},notification(e,o,r){return _core.VxeUI.modal.notification(e,o,r)}});var _default=exports.default=_core.VxeUI;
package/lib/ui/src/log.js CHANGED
@@ -8,6 +8,6 @@ var _core = require("@vxe-ui/core");
8
8
  const {
9
9
  log
10
10
  } = _core.VxeUI;
11
- const version = `table v${"3.11.1"}`;
11
+ const version = `table v${"3.11.3"}`;
12
12
  const warnLog = exports.warnLog = log.create('warn', version);
13
13
  const errLog = exports.errLog = log.create('error', version);
@@ -1 +1 @@
1
- Object.defineProperty(exports,"__esModule",{value:!0}),exports.warnLog=exports.errLog=void 0;var _core=require("@vxe-ui/core");let log=_core.VxeUI.log,version="table v3.11.1",warnLog=exports.warnLog=log.create("warn",version),errLog=exports.errLog=log.create("error",version);
1
+ Object.defineProperty(exports,"__esModule",{value:!0}),exports.warnLog=exports.errLog=void 0;var _core=require("@vxe-ui/core");let log=_core.VxeUI.log,version="table v3.11.3",warnLog=exports.warnLog=log.create("warn",version),errLog=exports.errLog=log.create("error",version);
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "vxe-table",
3
- "version": "3.11.1",
3
+ "version": "3.11.3",
4
4
  "description": "一个基于 vue 的 PC 端表格组件,支持增删改查、虚拟树、拖拽排序,懒加载、快捷菜单、数据校验、树形结构、打印、导入导出、自定义模板、渲染器、JSON 配置式...",
5
5
  "scripts": {
6
6
  "update": "npm install --legacy-peer-deps",
@@ -28,7 +28,7 @@
28
28
  "style": "lib/style.css",
29
29
  "typings": "types/index.d.ts",
30
30
  "dependencies": {
31
- "vxe-pc-ui": "^3.3.1"
31
+ "vxe-pc-ui": "^3.3.2"
32
32
  },
33
33
  "devDependencies": {
34
34
  "@babel/plugin-transform-modules-commonjs": "^7.25.7",
@@ -465,6 +465,17 @@ const hideDropTip = ($xeTable: any) => {
465
465
  }
466
466
  }
467
467
 
468
+ const handleScrollToRowColumn = ($xeTable: any, fieldOrColumn: string | VxeTableDefines.ColumnInfo | null, row?: any) => {
469
+ const internalData = $xeTable
470
+
471
+ const { fullColumnIdData } = internalData
472
+ const column = handleFieldOrColumn($xeTable, fieldOrColumn)
473
+ if (column && fullColumnIdData[column.id]) {
474
+ return colToVisible($xeTable, column, row)
475
+ }
476
+ return $xeTable.$nextTick()
477
+ }
478
+
468
479
  const Methods = {
469
480
  callSlot (slotFunc: any, params: any, h: any, vNodes: any) {
470
481
  if (slotFunc) {
@@ -6309,6 +6320,8 @@ const Methods = {
6309
6320
  * @param {ColumnInfo} column 列配置
6310
6321
  */
6311
6322
  scrollToRow (row: any, fieldOrColumn: any) {
6323
+ const $xeTable = this
6324
+
6312
6325
  const rest = []
6313
6326
  if (row) {
6314
6327
  if (this.treeConfig) {
@@ -6318,7 +6331,7 @@ const Methods = {
6318
6331
  }
6319
6332
  }
6320
6333
  if (fieldOrColumn) {
6321
- rest.push(this.scrollToColumn(fieldOrColumn))
6334
+ rest.push(handleScrollToRowColumn($xeTable, fieldOrColumn, row))
6322
6335
  }
6323
6336
  return Promise.all(rest)
6324
6337
  },
@@ -6327,11 +6340,9 @@ const Methods = {
6327
6340
  * @param {ColumnInfo} column 列配置
6328
6341
  */
6329
6342
  scrollToColumn (fieldOrColumn: any) {
6330
- const column = handleFieldOrColumn(this, fieldOrColumn)
6331
- if (column && this.fullColumnMap.has(column)) {
6332
- return colToVisible(this, column)
6333
- }
6334
- return this.$nextTick()
6343
+ const $xeTable = this
6344
+
6345
+ return handleScrollToRowColumn($xeTable, fieldOrColumn)
6335
6346
  },
6336
6347
  /**
6337
6348
  * 对于树形结构中,可以直接滚动到指定深层节点中
@@ -395,7 +395,7 @@ export function rowToVisible ($xeTable: any, row: any) {
395
395
  return Promise.resolve()
396
396
  }
397
397
 
398
- export function colToVisible ($xeTable: any, column: any) {
398
+ export function colToVisible ($xeTable: any, column: any, row?: any) {
399
399
  const { columnStore, scrollXLoad, visibleColumn } = $xeTable
400
400
  const tableBody: any = $xeTable.$refs.tableBody
401
401
  const { leftList, rightList } = columnStore
@@ -414,9 +414,17 @@ export function colToVisible ($xeTable: any, column: any) {
414
414
  if (bodyElem) {
415
415
  const bodyWidth = bodyElem.clientWidth
416
416
  const bodyScrollLeft = bodyElem.scrollLeft
417
- const tdElem = bodyElem.querySelector(`.${column.id}`)
417
+ let tdElem: HTMLTableCellElement | null = null
418
+ if (row) {
419
+ const rowid = getRowid($xeTable, row)
420
+ tdElem = bodyElem.querySelector(`[rowid="${rowid}"] .${column.id}`)
421
+ }
422
+ if (!tdElem) {
423
+ tdElem = bodyElem.querySelector(`.${column.id}`)
424
+ }
418
425
  if (tdElem) {
419
- const tdOffsetLeft = tdElem.offsetLeft + (tdElem.offsetParent ? tdElem.offsetParent.offsetLeft : 0)
426
+ const tdOffsetParent = tdElem.offsetParent as HTMLElement
427
+ const tdOffsetLeft = tdElem.offsetLeft + (tdOffsetParent ? tdOffsetParent.offsetLeft : 0)
420
428
  const cellWidth = tdElem.clientWidth
421
429
  // 检测是否在可视区中
422
430
  if (tdOffsetLeft < (bodyScrollLeft + offsetFixedLeft)) {
@@ -1,40 +1,40 @@
1
1
  @use './base.scss';
2
- @use '../variable.scss' as light-variable;
2
+ @use '../variable.scss' as light_variable;
3
3
 
4
4
  [data-vxe-ui-theme="light"] {
5
5
  /*font color*/
6
- --vxe-ui-font-color: #{light-variable.$vxe-ui-font-color};
7
- --vxe-ui-font-primary-color: #{light-variable.$vxe-ui-font-primary-color};
8
- --vxe-ui-font-lighten-color: #{light-variable.$vxe-ui-font-lighten-color};
9
- --vxe-ui-font-darken-color: #{light-variable.$vxe-ui-font-darken-color};
10
- --vxe-ui-font-disabled-color: #{light-variable.$vxe-ui-font-disabled-color};
6
+ --vxe-ui-font-color: #{light_variable.$vxe-ui-font-color};
7
+ --vxe-ui-font-primary-color: #{light_variable.$vxe-ui-font-primary-color};
8
+ --vxe-ui-font-lighten-color: #{light_variable.$vxe-ui-font-lighten-color};
9
+ --vxe-ui-font-darken-color: #{light_variable.$vxe-ui-font-darken-color};
10
+ --vxe-ui-font-disabled-color: #{light_variable.$vxe-ui-font-disabled-color};
11
11
 
12
12
  /*base*/
13
- --vxe-ui-base-popup-border-color: #{light-variable.$vxe-ui-base-popup-border-color};
14
- --vxe-ui-base-popup-box-shadow: #{light-variable.$vxe-ui-base-popup-box-shadow};
13
+ --vxe-ui-base-popup-border-color: #{light_variable.$vxe-ui-base-popup-border-color};
14
+ --vxe-ui-base-popup-box-shadow: #{light_variable.$vxe-ui-base-popup-box-shadow};
15
15
 
16
16
  /*layout*/
17
- --vxe-ui-layout-background-color: #{light-variable.$vxe-ui-layout-background-color};
17
+ --vxe-ui-layout-background-color: #{light_variable.$vxe-ui-layout-background-color};
18
18
 
19
19
  /*input*/
20
- --vxe-ui-input-border-color: #{light-variable.$vxe-ui-input-border-color};
21
- --vxe-ui-input-placeholder-color: #{light-variable.$vxe-ui-input-placeholder-color};
22
- --vxe-ui-input-disabled-background-color: #{light-variable.$vxe-ui-input-disabled-background-color};
20
+ --vxe-ui-input-border-color: #{light_variable.$vxe-ui-input-border-color};
21
+ --vxe-ui-input-placeholder-color: #{light_variable.$vxe-ui-input-placeholder-color};
22
+ --vxe-ui-input-disabled-background-color: #{light_variable.$vxe-ui-input-disabled-background-color};
23
23
 
24
24
  /*loading*/
25
- --vxe-ui-loading-background-color: #{light-variable.$vxe-ui-loading-background-color};
25
+ --vxe-ui-loading-background-color: #{light_variable.$vxe-ui-loading-background-color};
26
26
 
27
27
  /*table*/
28
- --vxe-ui-table-header-background-color: #{light-variable.$vxe-ui-table-header-background-color};
29
- --vxe-ui-table-border-color: #{light-variable.$vxe-ui-table-border-color};
30
- --vxe-ui-table-row-hover-background-color: #{light-variable.$vxe-ui-table-row-hover-background-color};
31
- --vxe-ui-table-row-striped-background-color: #{light-variable.$vxe-ui-table-row-striped-background-color};
32
- --vxe-ui-table-row-hover-striped-background-color: #{light-variable.$vxe-ui-table-row-hover-striped-background-color};
33
- --vxe-ui-table-row-radio-checked-background-color: #{light-variable.$vxe-ui-table-row-radio-checked-background-color};
34
- --vxe-ui-table-row-hover-radio-checked-background-color: #{light-variable.$vxe-ui-table-row-hover-radio-checked-background-color};
35
- --vxe-ui-table-row-checkbox-checked-background-color: #{light-variable.$vxe-ui-table-row-checkbox-checked-background-color};
36
- --vxe-ui-table-row-hover-checkbox-checked-background-color: #{light-variable.$vxe-ui-table-row-hover-checkbox-checked-background-color};
37
- --vxe-ui-table-row-current-background-color: #{light-variable.$vxe-ui-table-row-current-background-color};
38
- --vxe-ui-table-row-hover-current-background-color: #{light-variable.$vxe-ui-table-row-hover-current-background-color};
39
- --vxe-ui-table-fixed-scrolling-box-shadow-color: #{light-variable.$vxe-ui-table-fixed-scrolling-box-shadow-color};
28
+ --vxe-ui-table-header-background-color: #{light_variable.$vxe-ui-table-header-background-color};
29
+ --vxe-ui-table-border-color: #{light_variable.$vxe-ui-table-border-color};
30
+ --vxe-ui-table-row-hover-background-color: #{light_variable.$vxe-ui-table-row-hover-background-color};
31
+ --vxe-ui-table-row-striped-background-color: #{light_variable.$vxe-ui-table-row-striped-background-color};
32
+ --vxe-ui-table-row-hover-striped-background-color: #{light_variable.$vxe-ui-table-row-hover-striped-background-color};
33
+ --vxe-ui-table-row-radio-checked-background-color: #{light_variable.$vxe-ui-table-row-radio-checked-background-color};
34
+ --vxe-ui-table-row-hover-radio-checked-background-color: #{light_variable.$vxe-ui-table-row-hover-radio-checked-background-color};
35
+ --vxe-ui-table-row-checkbox-checked-background-color: #{light_variable.$vxe-ui-table-row-checkbox-checked-background-color};
36
+ --vxe-ui-table-row-hover-checkbox-checked-background-color: #{light_variable.$vxe-ui-table-row-hover-checkbox-checked-background-color};
37
+ --vxe-ui-table-row-current-background-color: #{light_variable.$vxe-ui-table-row-current-background-color};
38
+ --vxe-ui-table-row-hover-current-background-color: #{light_variable.$vxe-ui-table-row-hover-current-background-color};
39
+ --vxe-ui-table-fixed-scrolling-box-shadow-color: #{light_variable.$vxe-ui-table-fixed-scrolling-box-shadow-color};
40
40
  }
@@ -1,39 +1,39 @@
1
1
  /*font color*/
2
- $vxe-ui-font-color: #606266;
3
- $vxe-ui-font-tinge-color: #d4d5d7;
4
- $vxe-ui-font-lighten-color: #797b80;
5
- $vxe-ui-font-darken-color: #47494c;
6
- $vxe-ui-font-disabled-color: #BFBFBF;
2
+ $vxe-ui-font-color: #606266 !default;
3
+ $vxe-ui-font-tinge-color: #d4d5d7 !default;
4
+ $vxe-ui-font-lighten-color: #797b80 !default;
5
+ $vxe-ui-font-darken-color: #47494c !default;
6
+ $vxe-ui-font-disabled-color: #BFBFBF !default;
7
7
 
8
8
  /*font status color*/
9
- $vxe-ui-font-primary-color: #409eff;
9
+ $vxe-ui-font-primary-color: #409eff !default;
10
10
 
11
11
  /*base*/
12
- $vxe-ui-base-popup-border-color: #DADCE0;
13
- $vxe-ui-base-popup-box-shadow: 0 0 10px 0 rgba(0, 0, 0, 0.16);
12
+ $vxe-ui-base-popup-border-color: #DADCE0 !default;
13
+ $vxe-ui-base-popup-box-shadow: 0 0 10px 0 rgba(0, 0, 0, 0.16) !default;
14
14
 
15
15
  /*layout*/
16
- $vxe-ui-layout-background-color: #ffffff;
16
+ $vxe-ui-layout-background-color: #ffffff !default;
17
17
 
18
18
  /*input*/
19
- $vxe-ui-input-border-color: #dcdfe6;
20
- $vxe-ui-input-placeholder-color: #C0C4CC;
21
- $vxe-ui-input-disabled-background-color: #f3f3f3;
19
+ $vxe-ui-input-border-color: #dcdfe6 !default;
20
+ $vxe-ui-input-placeholder-color: #C0C4CC !default;
21
+ $vxe-ui-input-disabled-background-color: #f3f3f3 !default;
22
22
 
23
23
  /*loading*/
24
- $vxe-ui-loading-background-color: rgba(255, 255, 255, 0.5);
24
+ $vxe-ui-loading-background-color: rgba(255, 255, 255, 0.5) !default;
25
25
 
26
26
  /*table*/
27
- $vxe-ui-table-header-background-color: #f8f8f9;
28
- $vxe-ui-table-border-color: #e8eaec;
29
- $vxe-ui-table-row-hover-background-color: #f5f7fa;
30
- $vxe-ui-table-row-striped-background-color: #fafafa;
31
- $vxe-ui-table-row-hover-striped-background-color: #f5f7fa;
32
- $vxe-ui-table-row-radio-checked-background-color: #fff3e0;
33
- $vxe-ui-table-row-hover-radio-checked-background-color: #ffebbc;
34
- $vxe-ui-table-row-checkbox-checked-background-color: #fff3e0;
35
- $vxe-ui-table-row-hover-checkbox-checked-background-color: #ffebbc;
36
- $vxe-ui-table-row-current-background-color: #e6f7ff;
37
- $vxe-ui-table-row-hover-current-background-color: #d7effb;
38
- $vxe-ui-table-fixed-scrolling-box-shadow-color: rgba(0, 0, 0, 0.12);
27
+ $vxe-ui-table-header-background-color: #f8f8f9 !default;
28
+ $vxe-ui-table-border-color: #e8eaec !default;
29
+ $vxe-ui-table-row-hover-background-color: #f5f7fa !default;
30
+ $vxe-ui-table-row-striped-background-color: #fafafa !default;
31
+ $vxe-ui-table-row-hover-striped-background-color: #f5f7fa !default;
32
+ $vxe-ui-table-row-radio-checked-background-color: #fff3e0 !default;
33
+ $vxe-ui-table-row-hover-radio-checked-background-color: #ffebbc !default;
34
+ $vxe-ui-table-row-checkbox-checked-background-color: #fff3e0 !default;
35
+ $vxe-ui-table-row-hover-checkbox-checked-background-color: #ffebbc !default;
36
+ $vxe-ui-table-row-current-background-color: #e6f7ff !default;
37
+ $vxe-ui-table-row-hover-current-background-color: #d7effb !default;
38
+ $vxe-ui-table-fixed-scrolling-box-shadow-color: rgba(0, 0, 0, 0.12) !default;
39
39