vxe-table 3.8.7-beta.8 → 3.8.7
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/grid/src/grid.js +85 -45
- package/lib/grid/src/grid.min.js +1 -1
- package/lib/grid/style/style.css +13 -0
- package/lib/grid/style/style.min.css +1 -1
- package/lib/icon/style/style.css +1 -1
- package/lib/icon/style/style.min.css +1 -1
- package/lib/index.css +1 -1
- package/lib/index.umd.js +170 -51
- package/lib/index.umd.min.js +1 -1
- package/lib/style.css +1 -1
- package/lib/style.min.css +1 -1
- package/lib/tools/log.js +1 -1
- package/lib/tools/log.min.js +1 -1
- package/lib/v-x-e-table/index.js +1 -1
- package/lib/v-x-e-table/index.min.js +1 -1
- package/lib/vxe-grid/style/style.css +13 -0
- package/lib/vxe-grid/style/style.min.css +1 -1
- package/package.json +1 -1
- package/packages/grid/src/grid.js +98 -54
- package/styles/grid.scss +13 -0
- /package/lib/icon/style/{iconfont.1716698685311.ttf → iconfont.1716782461743.ttf} +0 -0
- /package/lib/icon/style/{iconfont.1716698685311.woff → iconfont.1716782461743.woff} +0 -0
- /package/lib/icon/style/{iconfont.1716698685311.woff2 → iconfont.1716782461743.woff2} +0 -0
- /package/lib/{iconfont.1716698685311.ttf → iconfont.1716782461743.ttf} +0 -0
- /package/lib/{iconfont.1716698685311.woff → iconfont.1716782461743.woff} +0 -0
- /package/lib/{iconfont.1716698685311.woff2 → iconfont.1716782461743.woff2} +0 -0
package/lib/tools/log.js
CHANGED
|
@@ -9,7 +9,7 @@ exports.warnLog = void 0;
|
|
|
9
9
|
var _conf = _interopRequireDefault(require("../v-x-e-table/src/conf"));
|
|
10
10
|
function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
|
|
11
11
|
function getLog(message, params) {
|
|
12
|
-
return "[vxe-table v".concat("3.8.7
|
|
12
|
+
return "[vxe-table v".concat("3.8.7", "] ", _conf.default.i18n(message, params));
|
|
13
13
|
}
|
|
14
14
|
function outLog(type) {
|
|
15
15
|
return function (message, params) {
|
package/lib/tools/log.min.js
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
"use strict";Object.defineProperty(exports,"__esModule",{value:!0}),exports.errLog=void 0,exports.getLog=getLog,exports.warnLog=void 0;var _conf=_interopRequireDefault(require("../v-x-e-table/src/conf"));function _interopRequireDefault(e){return e&&e.__esModule?e:{default:e}}function getLog(e,o){return"[vxe-table v".concat("3.8.7
|
|
1
|
+
"use strict";Object.defineProperty(exports,"__esModule",{value:!0}),exports.errLog=void 0,exports.getLog=getLog,exports.warnLog=void 0;var _conf=_interopRequireDefault(require("../v-x-e-table/src/conf"));function _interopRequireDefault(e){return e&&e.__esModule?e:{default:e}}function getLog(e,o){return"[vxe-table v".concat("3.8.7","] ",_conf.default.i18n(e,o))}function outLog(r){return function(e,o){e=getLog(e,o);return console[r](e),e}}var warnLog=exports.warnLog=outLog("warn"),errLog=exports.errLog=outLog("error");
|
package/lib/v-x-e-table/index.js
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
"use strict";Object.defineProperty(exports,"__esModule",{value:!0});var _exportNames={use:!0,setConfig:!0,globalConfs:!0,t:!0,_t:!0,v:!0,setup:!0,config:!0,setIcon:!0,globalStore:!0,VXETable:!0,VxeUI:!0},_xeUtils=(exports.VxeUI=exports.VXETable=void 0,exports._t=_t,exports.setConfig=exports.globalStore=exports.globalConfs=exports.default=exports.config=void 0,exports.setIcon=setIcon,exports.setup=void 0,exports.t=t,exports.use=use,exports.v=void 0,_interopRequireDefault(require("xe-utils"))),_domZindex=_interopRequireDefault(require("dom-zindex")),_conf=_interopRequireDefault(require("../v-x-e-table/src/conf")),_interceptor=require("./src/interceptor"),_renderer=(Object.keys(_interceptor).forEach(function(e){"default"===e||"__esModule"===e||Object.prototype.hasOwnProperty.call(_exportNames,e)||e in exports&&exports[e]===_interceptor[e]||Object.defineProperty(exports,e,{enumerable:!0,get:function(){return _interceptor[e]}})}),require("./src/renderer")),_commands=(Object.keys(_renderer).forEach(function(e){"default"===e||"__esModule"===e||Object.prototype.hasOwnProperty.call(_exportNames,e)||e in exports&&exports[e]===_renderer[e]||Object.defineProperty(exports,e,{enumerable:!0,get:function(){return _renderer[e]}})}),require("./src/commands")),_menus=(Object.keys(_commands).forEach(function(e){"default"===e||"__esModule"===e||Object.prototype.hasOwnProperty.call(_exportNames,e)||e in exports&&exports[e]===_commands[e]||Object.defineProperty(exports,e,{enumerable:!0,get:function(){return _commands[e]}})}),require("./src/menus")),_formats=(Object.keys(_menus).forEach(function(e){"default"===e||"__esModule"===e||Object.prototype.hasOwnProperty.call(_exportNames,e)||e in exports&&exports[e]===_menus[e]||Object.defineProperty(exports,e,{enumerable:!0,get:function(){return _menus[e]}})}),require("./src/formats")),_validators=(Object.keys(_formats).forEach(function(e){"default"===e||"__esModule"===e||Object.prototype.hasOwnProperty.call(_exportNames,e)||e in exports&&exports[e]===_formats[e]||Object.defineProperty(exports,e,{enumerable:!0,get:function(){return _formats[e]}})}),require("./src/validators")),_theme=require("./src/theme"),_utils=require("../tools/utils"),_log=require("../tools/log");function _interopRequireDefault(e){return e&&e.__esModule?e:{default:e}}function _typeof(e){return(_typeof="function"==typeof Symbol&&"symbol"==typeof Symbol.iterator?function(e){return typeof e}:function(e){return e&&"function"==typeof Symbol&&e.constructor===Symbol&&e!==Symbol.prototype?"symbol":typeof e})(e)}function _classCallCheck(e,t){if(!(e instanceof t))throw new TypeError("Cannot call a class as a function")}function _defineProperties(e,t){for(var r=0;r<t.length;r++){var o=t[r];o.enumerable=o.enumerable||!1,o.configurable=!0,"value"in o&&(o.writable=!0),Object.defineProperty(e,_toPropertyKey(o.key),o)}}function _createClass(e,t,r){return t&&_defineProperties(e.prototype,t),r&&_defineProperties(e,r),Object.defineProperty(e,"prototype",{writable:!1}),e}function _toPropertyKey(e){e=_toPrimitive(e,"string");return"symbol"==_typeof(e)?e:e+""}function _toPrimitive(e,t){if("object"!=_typeof(e)||!e)return e;var r=e[Symbol.toPrimitive];if(void 0===r)return("string"===t?String:Number)(e);r=r.call(e,t||"default");if("object"!=_typeof(r))return r;throw new TypeError("@@toPrimitive must return a primitive value.")}var installedPlugins=[];function use(e,t){return e&&e.install&&-1===installedPlugins.indexOf(e)&&(e.install(VXETable,t),installedPlugins.push(e)),VXETable}function reg(e){"development"===process.env.NODE_ENV&&VXETable.Table&&(0,_log.errLog)("vxe.error.useErr",[e]),VXETable["_".concat(e)]=1}function getExportOrImpotType(e,r){var o=[];return _xeUtils.default.objectEach(e,function(e,t){0!==e&&e!==r||o.push(t)}),o}var setConfig=exports.setConfig=function(e){return e&&(e.theme&&(0,_theme.setTheme)(e.theme),e.zIndex&&_domZindex.default.setCurrent(e.zIndex),_xeUtils.default.merge(_conf.default,e)),VXETable},VXETableConfig=function(){return _createClass(function e(){_classCallCheck(this,e)},[{key:"zIndex",get:function(){return _utils.UtilTools.getLastZIndex()}},{key:"nextZIndex",get:function(){return _utils.UtilTools.nextZIndex()}},{key:"exportTypes",get:function(){return getExportOrImpotType(_conf.default.export.types,1)}},{key:"importTypes",get:function(){return getExportOrImpotType(_conf.default.export.types,2)}}])}(),globalConfs=exports.globalConfs=new VXETableConfig;function t(e,t){return _conf.default.i18n(e,t)}function _t(e,t){return e?_xeUtils.default.toValueString(_conf.default.translate?_conf.default.translate(e,t):e):""}var v=exports.v="v3",setup=exports.setup=function(e){return"development"===process.env.NODE_ENV&&(0,_log.warnLog)("vxe.error.delFunc",["setup","setConfig"]),setConfig(e)},config=exports.config=function(e){return"development"===process.env.NODE_ENV&&(0,_log.warnLog)("vxe.error.delFunc",["setup","setConfig"]),setConfig(e)};function setIcon(e){return e&&Object.assign(_conf.default.icon,e),VXETable}var globalStore=exports.globalStore={},VXETable=exports.VXETable={v:v,version:"3.8.7
|
|
1
|
+
"use strict";Object.defineProperty(exports,"__esModule",{value:!0});var _exportNames={use:!0,setConfig:!0,globalConfs:!0,t:!0,_t:!0,v:!0,setup:!0,config:!0,setIcon:!0,globalStore:!0,VXETable:!0,VxeUI:!0},_xeUtils=(exports.VxeUI=exports.VXETable=void 0,exports._t=_t,exports.setConfig=exports.globalStore=exports.globalConfs=exports.default=exports.config=void 0,exports.setIcon=setIcon,exports.setup=void 0,exports.t=t,exports.use=use,exports.v=void 0,_interopRequireDefault(require("xe-utils"))),_domZindex=_interopRequireDefault(require("dom-zindex")),_conf=_interopRequireDefault(require("../v-x-e-table/src/conf")),_interceptor=require("./src/interceptor"),_renderer=(Object.keys(_interceptor).forEach(function(e){"default"===e||"__esModule"===e||Object.prototype.hasOwnProperty.call(_exportNames,e)||e in exports&&exports[e]===_interceptor[e]||Object.defineProperty(exports,e,{enumerable:!0,get:function(){return _interceptor[e]}})}),require("./src/renderer")),_commands=(Object.keys(_renderer).forEach(function(e){"default"===e||"__esModule"===e||Object.prototype.hasOwnProperty.call(_exportNames,e)||e in exports&&exports[e]===_renderer[e]||Object.defineProperty(exports,e,{enumerable:!0,get:function(){return _renderer[e]}})}),require("./src/commands")),_menus=(Object.keys(_commands).forEach(function(e){"default"===e||"__esModule"===e||Object.prototype.hasOwnProperty.call(_exportNames,e)||e in exports&&exports[e]===_commands[e]||Object.defineProperty(exports,e,{enumerable:!0,get:function(){return _commands[e]}})}),require("./src/menus")),_formats=(Object.keys(_menus).forEach(function(e){"default"===e||"__esModule"===e||Object.prototype.hasOwnProperty.call(_exportNames,e)||e in exports&&exports[e]===_menus[e]||Object.defineProperty(exports,e,{enumerable:!0,get:function(){return _menus[e]}})}),require("./src/formats")),_validators=(Object.keys(_formats).forEach(function(e){"default"===e||"__esModule"===e||Object.prototype.hasOwnProperty.call(_exportNames,e)||e in exports&&exports[e]===_formats[e]||Object.defineProperty(exports,e,{enumerable:!0,get:function(){return _formats[e]}})}),require("./src/validators")),_theme=require("./src/theme"),_utils=require("../tools/utils"),_log=require("../tools/log");function _interopRequireDefault(e){return e&&e.__esModule?e:{default:e}}function _typeof(e){return(_typeof="function"==typeof Symbol&&"symbol"==typeof Symbol.iterator?function(e){return typeof e}:function(e){return e&&"function"==typeof Symbol&&e.constructor===Symbol&&e!==Symbol.prototype?"symbol":typeof e})(e)}function _classCallCheck(e,t){if(!(e instanceof t))throw new TypeError("Cannot call a class as a function")}function _defineProperties(e,t){for(var r=0;r<t.length;r++){var o=t[r];o.enumerable=o.enumerable||!1,o.configurable=!0,"value"in o&&(o.writable=!0),Object.defineProperty(e,_toPropertyKey(o.key),o)}}function _createClass(e,t,r){return t&&_defineProperties(e.prototype,t),r&&_defineProperties(e,r),Object.defineProperty(e,"prototype",{writable:!1}),e}function _toPropertyKey(e){e=_toPrimitive(e,"string");return"symbol"==_typeof(e)?e:e+""}function _toPrimitive(e,t){if("object"!=_typeof(e)||!e)return e;var r=e[Symbol.toPrimitive];if(void 0===r)return("string"===t?String:Number)(e);r=r.call(e,t||"default");if("object"!=_typeof(r))return r;throw new TypeError("@@toPrimitive must return a primitive value.")}var installedPlugins=[];function use(e,t){return e&&e.install&&-1===installedPlugins.indexOf(e)&&(e.install(VXETable,t),installedPlugins.push(e)),VXETable}function reg(e){"development"===process.env.NODE_ENV&&VXETable.Table&&(0,_log.errLog)("vxe.error.useErr",[e]),VXETable["_".concat(e)]=1}function getExportOrImpotType(e,r){var o=[];return _xeUtils.default.objectEach(e,function(e,t){0!==e&&e!==r||o.push(t)}),o}var setConfig=exports.setConfig=function(e){return e&&(e.theme&&(0,_theme.setTheme)(e.theme),e.zIndex&&_domZindex.default.setCurrent(e.zIndex),_xeUtils.default.merge(_conf.default,e)),VXETable},VXETableConfig=function(){return _createClass(function e(){_classCallCheck(this,e)},[{key:"zIndex",get:function(){return _utils.UtilTools.getLastZIndex()}},{key:"nextZIndex",get:function(){return _utils.UtilTools.nextZIndex()}},{key:"exportTypes",get:function(){return getExportOrImpotType(_conf.default.export.types,1)}},{key:"importTypes",get:function(){return getExportOrImpotType(_conf.default.export.types,2)}}])}(),globalConfs=exports.globalConfs=new VXETableConfig;function t(e,t){return _conf.default.i18n(e,t)}function _t(e,t){return e?_xeUtils.default.toValueString(_conf.default.translate?_conf.default.translate(e,t):e):""}var v=exports.v="v3",setup=exports.setup=function(e){return"development"===process.env.NODE_ENV&&(0,_log.warnLog)("vxe.error.delFunc",["setup","setConfig"]),setConfig(e)},config=exports.config=function(e){return"development"===process.env.NODE_ENV&&(0,_log.warnLog)("vxe.error.delFunc",["setup","setConfig"]),setConfig(e)};function setIcon(e){return e&&Object.assign(_conf.default.icon,e),VXETable}var globalStore=exports.globalStore={},VXETable=exports.VXETable={v:v,version:"3.8.7",reg:reg,use:use,setConfig:setConfig,setIcon:setIcon,globalStore:globalStore,interceptor:_interceptor.interceptor,renderer:_renderer.renderer,commands:_commands.commands,formats:_formats.formats,menus:_menus.menus,validators:_validators.validators,t:t,_t:_t,config:config,setup:setup,globalConfs:globalConfs},VxeUI=exports.VxeUI=VXETable,_default=((0,_theme.setTheme)("light"),exports.default=VXETable);
|
|
@@ -57,6 +57,19 @@
|
|
|
57
57
|
.vxe-grid .vxe-grid--bottom-wrapper {
|
|
58
58
|
position: relative;
|
|
59
59
|
}
|
|
60
|
+
.vxe-grid .vxe-grid--table-container {
|
|
61
|
+
display: flex;
|
|
62
|
+
flex-direction: row;
|
|
63
|
+
}
|
|
64
|
+
.vxe-grid .vxe-grid--left-wrapper,
|
|
65
|
+
.vxe-grid .vxe-grid--right-wrapper {
|
|
66
|
+
flex-shrink: 0;
|
|
67
|
+
overflow: auto;
|
|
68
|
+
}
|
|
69
|
+
.vxe-grid .vxe-grid--table-wrapper {
|
|
70
|
+
flex-grow: 1;
|
|
71
|
+
overflow: hidden;
|
|
72
|
+
}
|
|
60
73
|
|
|
61
74
|
.vxe-grid {
|
|
62
75
|
font-size: 14px;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
.vxe-grid{position:relative}.vxe-grid.is--loading:before{content:"";position:absolute;top:0;left:0;width:100%;height:100%;z-index:99;-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none;background-color:rgba(255,255,255,.5)}.vxe-grid.is--loading>.vxe-table .vxe-loading{background-color:transparent}.vxe-grid.is--maximize{position:fixed;top:0;left:0;width:100%;height:100%;padding:.5em 1em;background-color:#fff}.vxe-grid .vxe-grid--bottom-wrapper,.vxe-grid .vxe-grid--form-wrapper,.vxe-grid .vxe-grid--top-wrapper{position:relative}.vxe-grid{font-size:14px}.vxe-grid.size--medium{font-size:14px}.vxe-grid.size--small{font-size:13px}.vxe-grid.size--mini{font-size:12px}
|
|
1
|
+
.vxe-grid{position:relative}.vxe-grid.is--loading:before{content:"";position:absolute;top:0;left:0;width:100%;height:100%;z-index:99;-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none;background-color:rgba(255,255,255,.5)}.vxe-grid.is--loading>.vxe-table .vxe-loading{background-color:transparent}.vxe-grid.is--maximize{position:fixed;top:0;left:0;width:100%;height:100%;padding:.5em 1em;background-color:#fff}.vxe-grid .vxe-grid--bottom-wrapper,.vxe-grid .vxe-grid--form-wrapper,.vxe-grid .vxe-grid--top-wrapper{position:relative}.vxe-grid .vxe-grid--table-container{display:flex;flex-direction:row}.vxe-grid .vxe-grid--left-wrapper,.vxe-grid .vxe-grid--right-wrapper{flex-shrink:0;overflow:auto}.vxe-grid .vxe-grid--table-wrapper{flex-grow:1;overflow:hidden}.vxe-grid{font-size:14px}.vxe-grid.size--medium{font-size:14px}.vxe-grid.size--small{font-size:13px}.vxe-grid.size--mini{font-size:12px}
|
package/package.json
CHANGED
|
@@ -140,46 +140,52 @@ function getTableOns (_vm) {
|
|
|
140
140
|
/**
|
|
141
141
|
* 渲染表单
|
|
142
142
|
*/
|
|
143
|
-
function
|
|
143
|
+
function renderForm (h, _vm) {
|
|
144
144
|
const { _e, $scopedSlots, formConfig } = _vm
|
|
145
145
|
const formSlot = $scopedSlots.form
|
|
146
146
|
const hasForm = !!(formSlot || isEnableConf(formConfig))
|
|
147
147
|
|
|
148
|
-
|
|
149
|
-
|
|
150
|
-
|
|
151
|
-
|
|
152
|
-
|
|
148
|
+
if (hasForm) {
|
|
149
|
+
return h('div', {
|
|
150
|
+
key: 'form',
|
|
151
|
+
ref: 'formWrapper',
|
|
152
|
+
class: 'vxe-grid--form-wrapper'
|
|
153
|
+
}, formSlot ? formSlot.call(_vm, { $grid: _vm }, h) : renderDefaultForm(h, _vm))
|
|
154
|
+
}
|
|
155
|
+
return _e()
|
|
153
156
|
}
|
|
154
157
|
|
|
155
158
|
/**
|
|
156
159
|
* 渲染工具栏
|
|
157
160
|
*/
|
|
158
|
-
function
|
|
161
|
+
function renderToolbar (h, _vm) {
|
|
159
162
|
const { _e, $scopedSlots, toolbarConfig, toolbar } = _vm
|
|
160
163
|
const toolbarSlot = $scopedSlots.toolbar
|
|
161
164
|
const hasToolbar = !!(toolbarSlot || isEnableConf(toolbarConfig) || toolbar)
|
|
162
165
|
|
|
163
|
-
|
|
164
|
-
|
|
165
|
-
|
|
166
|
-
|
|
167
|
-
|
|
168
|
-
|
|
169
|
-
|
|
170
|
-
|
|
171
|
-
|
|
172
|
-
|
|
173
|
-
|
|
174
|
-
|
|
175
|
-
|
|
176
|
-
|
|
166
|
+
if (hasToolbar) {
|
|
167
|
+
return h('div', {
|
|
168
|
+
key: 'toolbar',
|
|
169
|
+
ref: 'toolbarWrapper',
|
|
170
|
+
class: 'vxe-grid--toolbar-wrapper'
|
|
171
|
+
}, toolbarSlot
|
|
172
|
+
? toolbarSlot.call(_vm, { $grid: _vm }, h)
|
|
173
|
+
: [
|
|
174
|
+
h('vxe-toolbar', {
|
|
175
|
+
props: _vm.toolbarOpts,
|
|
176
|
+
ref: 'xToolbar',
|
|
177
|
+
scopedSlots: getToolbarSlots(_vm)
|
|
178
|
+
})
|
|
179
|
+
]
|
|
180
|
+
)
|
|
181
|
+
}
|
|
182
|
+
return _e()
|
|
177
183
|
}
|
|
178
184
|
|
|
179
185
|
/**
|
|
180
186
|
* 渲染表格顶部区域
|
|
181
187
|
*/
|
|
182
|
-
function
|
|
188
|
+
function renderTop (h, _vm) {
|
|
183
189
|
const { _e, $scopedSlots } = _vm
|
|
184
190
|
const topSlot = $scopedSlots.top
|
|
185
191
|
|
|
@@ -190,25 +196,51 @@ function renderTops (h, _vm) {
|
|
|
190
196
|
}, topSlot.call(_vm, { $grid: _vm }, h)) : _e()
|
|
191
197
|
}
|
|
192
198
|
|
|
199
|
+
function renderTableLeft (h, _vm) {
|
|
200
|
+
const { _e, $scopedSlots } = _vm
|
|
201
|
+
const leftSlot = $scopedSlots.left
|
|
202
|
+
if (leftSlot) {
|
|
203
|
+
return h('div', {
|
|
204
|
+
class: 'vxe-grid--left-wrapper'
|
|
205
|
+
}, leftSlot({ $grid: _vm }))
|
|
206
|
+
}
|
|
207
|
+
return _e()
|
|
208
|
+
}
|
|
209
|
+
|
|
210
|
+
function renderTableRight (h, _vm) {
|
|
211
|
+
const { _e, $scopedSlots } = _vm
|
|
212
|
+
const rightSlot = $scopedSlots.right
|
|
213
|
+
if (rightSlot) {
|
|
214
|
+
return h('div', {
|
|
215
|
+
class: 'vxe-grid--right-wrapper'
|
|
216
|
+
}, rightSlot({ $grid: _vm }))
|
|
217
|
+
}
|
|
218
|
+
return _e()
|
|
219
|
+
}
|
|
220
|
+
|
|
193
221
|
/**
|
|
194
222
|
* 渲染表格
|
|
195
223
|
*/
|
|
196
|
-
function
|
|
224
|
+
function renderTable (h, _vm) {
|
|
197
225
|
const { $scopedSlots, tableProps } = _vm
|
|
198
226
|
|
|
199
|
-
return h('
|
|
200
|
-
|
|
201
|
-
|
|
202
|
-
|
|
203
|
-
|
|
204
|
-
|
|
205
|
-
|
|
227
|
+
return h('div', {
|
|
228
|
+
class: 'vxe-grid--table-wrapper'
|
|
229
|
+
}, [
|
|
230
|
+
h('vxe-table', {
|
|
231
|
+
key: 'table',
|
|
232
|
+
props: tableProps,
|
|
233
|
+
on: getTableOns(_vm),
|
|
234
|
+
scopedSlots: $scopedSlots,
|
|
235
|
+
ref: 'xTable'
|
|
236
|
+
})
|
|
237
|
+
])
|
|
206
238
|
}
|
|
207
239
|
|
|
208
240
|
/**
|
|
209
241
|
* 渲染表格底部区域
|
|
210
242
|
*/
|
|
211
|
-
function
|
|
243
|
+
function renderBottom (h, _vm) {
|
|
212
244
|
const { _e, $scopedSlots } = _vm
|
|
213
245
|
const bottomSlot = $scopedSlots.bottom
|
|
214
246
|
|
|
@@ -222,27 +254,30 @@ function renderBottoms (h, _vm) {
|
|
|
222
254
|
/**
|
|
223
255
|
* 渲染分页
|
|
224
256
|
*/
|
|
225
|
-
function
|
|
257
|
+
function renderPager (h, _vm) {
|
|
226
258
|
const { _e, $scopedSlots, pagerConfig, proxyConfig, tablePage } = _vm
|
|
227
259
|
const pagerSlot = $scopedSlots.pager
|
|
228
260
|
const hasPager = !!(pagerSlot || isEnableConf(pagerConfig))
|
|
229
261
|
|
|
230
|
-
|
|
231
|
-
|
|
232
|
-
|
|
233
|
-
|
|
234
|
-
|
|
235
|
-
|
|
236
|
-
|
|
237
|
-
|
|
238
|
-
|
|
239
|
-
|
|
240
|
-
|
|
241
|
-
|
|
242
|
-
|
|
243
|
-
|
|
244
|
-
|
|
245
|
-
|
|
262
|
+
if (hasPager) {
|
|
263
|
+
return h('div', {
|
|
264
|
+
key: 'pager',
|
|
265
|
+
ref: 'pagerWrapper',
|
|
266
|
+
class: 'vxe-grid--pager-wrapper'
|
|
267
|
+
}, pagerSlot
|
|
268
|
+
? pagerSlot.call(_vm, { $grid: _vm }, h)
|
|
269
|
+
: [
|
|
270
|
+
h('vxe-pager', {
|
|
271
|
+
props: { ..._vm.pagerOpts, ...(proxyConfig ? tablePage : {}) },
|
|
272
|
+
on: {
|
|
273
|
+
'page-change': _vm.pageChangeEvent
|
|
274
|
+
},
|
|
275
|
+
scopedSlots: getPagerSlots(_vm)
|
|
276
|
+
})
|
|
277
|
+
]
|
|
278
|
+
)
|
|
279
|
+
}
|
|
280
|
+
return _e()
|
|
246
281
|
}
|
|
247
282
|
|
|
248
283
|
const defaultLayouts = ['Form', 'Toolbar', 'Top', 'Table', 'Bottom', 'Pager']
|
|
@@ -254,22 +289,31 @@ function renderLayout (h, _vm) {
|
|
|
254
289
|
currLayouts.forEach(name => {
|
|
255
290
|
switch (name) {
|
|
256
291
|
case 'Form':
|
|
257
|
-
vns.push(
|
|
292
|
+
vns.push(renderForm(h, _vm))
|
|
258
293
|
break
|
|
259
294
|
case 'Toolbar':
|
|
260
|
-
vns.push(
|
|
295
|
+
vns.push(renderToolbar(h, _vm))
|
|
261
296
|
break
|
|
262
297
|
case 'Top':
|
|
263
|
-
vns.push(
|
|
298
|
+
vns.push(renderTop(h, _vm))
|
|
264
299
|
break
|
|
265
300
|
case 'Table':
|
|
266
|
-
vns.push(
|
|
301
|
+
vns.push(
|
|
302
|
+
h('div', {
|
|
303
|
+
key: 'table',
|
|
304
|
+
class: 'vxe-grid--table-container'
|
|
305
|
+
}, [
|
|
306
|
+
renderTableLeft(h, _vm),
|
|
307
|
+
renderTable(h, _vm),
|
|
308
|
+
renderTableRight(h, _vm)
|
|
309
|
+
])
|
|
310
|
+
)
|
|
267
311
|
break
|
|
268
312
|
case 'Bottom':
|
|
269
|
-
vns.push(
|
|
313
|
+
vns.push(renderBottom(h, _vm))
|
|
270
314
|
break
|
|
271
315
|
case 'Pager':
|
|
272
|
-
vns.push(
|
|
316
|
+
vns.push(renderPager(h, _vm))
|
|
273
317
|
break
|
|
274
318
|
default:
|
|
275
319
|
if (process.env.VUE_APP_VXE_TABLE_ENV === 'development') {
|
package/styles/grid.scss
CHANGED
|
@@ -34,6 +34,19 @@
|
|
|
34
34
|
.vxe-grid--bottom-wrapper {
|
|
35
35
|
position: relative;
|
|
36
36
|
}
|
|
37
|
+
.vxe-grid--table-container {
|
|
38
|
+
display: flex;
|
|
39
|
+
flex-direction: row;
|
|
40
|
+
}
|
|
41
|
+
.vxe-grid--left-wrapper,
|
|
42
|
+
.vxe-grid--right-wrapper {
|
|
43
|
+
flex-shrink: 0;
|
|
44
|
+
overflow: auto;
|
|
45
|
+
}
|
|
46
|
+
.vxe-grid--table-wrapper {
|
|
47
|
+
flex-grow: 1;
|
|
48
|
+
overflow: hidden;
|
|
49
|
+
}
|
|
37
50
|
}
|
|
38
51
|
|
|
39
52
|
.vxe-grid {
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|