vxe-table 4.4.0-beta.3 → 4.4.0

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.
Files changed (52) hide show
  1. package/es/form/src/form-config-item.js +23 -12
  2. package/es/form/src/form-item.js +31 -12
  3. package/es/form/src/itemInfo.js +5 -0
  4. package/es/form/style.css +11 -2
  5. package/es/icon/style.css +1 -1
  6. package/es/style.css +1 -1
  7. package/es/style.min.css +1 -1
  8. package/es/tools/log.js +1 -1
  9. package/es/v-x-e-table/index.js +1 -1
  10. package/es/vxe-form/style.css +11 -2
  11. package/lib/form/src/form-config-item.js +20 -15
  12. package/lib/form/src/form-config-item.min.js +1 -1
  13. package/lib/form/src/form-item.js +28 -15
  14. package/lib/form/src/form-item.min.js +1 -1
  15. package/lib/form/src/itemInfo.js +5 -0
  16. package/lib/form/src/itemInfo.min.js +1 -1
  17. package/lib/form/style/style.css +11 -2
  18. package/lib/form/style/style.min.css +1 -1
  19. package/lib/icon/style/style.css +1 -1
  20. package/lib/icon/style/style.min.css +1 -1
  21. package/lib/index.umd.js +55 -32
  22. package/lib/index.umd.min.js +1 -1
  23. package/lib/style.css +1 -1
  24. package/lib/style.min.css +1 -1
  25. package/lib/tools/log.js +1 -1
  26. package/lib/tools/log.min.js +1 -1
  27. package/lib/v-x-e-table/index.js +1 -1
  28. package/lib/v-x-e-table/index.min.js +1 -1
  29. package/lib/vxe-form/style/style.css +11 -2
  30. package/lib/vxe-form/style/style.min.css +1 -1
  31. package/package.json +1 -1
  32. package/packages/form/src/form-config-item.ts +32 -16
  33. package/packages/form/src/form-item.ts +44 -16
  34. package/packages/form/src/itemInfo.ts +5 -0
  35. package/styles/form.scss +11 -2
  36. package/types/component.d.ts +1 -0
  37. package/types/form-item.d.ts +35 -1
  38. package/types/form.d.ts +5 -0
  39. package/types/table.d.ts +10 -10
  40. package/types/v-x-e-table/renderer.d.ts +10 -8
  41. /package/es/icon/style/{iconfont.1684716245164.ttf → iconfont.1684975347571.ttf} +0 -0
  42. /package/es/icon/style/{iconfont.1684716245164.woff → iconfont.1684975347571.woff} +0 -0
  43. /package/es/icon/style/{iconfont.1684716245164.woff2 → iconfont.1684975347571.woff2} +0 -0
  44. /package/es/{iconfont.1684716245164.ttf → iconfont.1684975347571.ttf} +0 -0
  45. /package/es/{iconfont.1684716245164.woff → iconfont.1684975347571.woff} +0 -0
  46. /package/es/{iconfont.1684716245164.woff2 → iconfont.1684975347571.woff2} +0 -0
  47. /package/lib/icon/style/{iconfont.1684716245164.ttf → iconfont.1684975347571.ttf} +0 -0
  48. /package/lib/icon/style/{iconfont.1684716245164.woff → iconfont.1684975347571.woff} +0 -0
  49. /package/lib/icon/style/{iconfont.1684716245164.woff2 → iconfont.1684975347571.woff2} +0 -0
  50. /package/lib/{iconfont.1684716245164.ttf → iconfont.1684975347571.ttf} +0 -0
  51. /package/lib/{iconfont.1684716245164.woff → iconfont.1684975347571.woff} +0 -0
  52. /package/lib/{iconfont.1684716245164.woff2 → iconfont.1684975347571.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("4.4.0-beta.3", "] ").concat(_conf.default.i18n(message, params));
12
+ return "[vxe-table v".concat("4.4.0", "] ").concat(_conf.default.i18n(message, params));
13
13
  }
14
14
  function outLog(type) {
15
15
  return function (message, params) {
@@ -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("4.4.0-beta.3","] ").concat(_conf.default.i18n(e,o))}function outLog(r){return function(e,o){e=getLog(e,o);return console[r](e),e}}var warnLog=outLog("warn"),errLog=(exports.warnLog=warnLog,outLog("error"));exports.errLog=errLog;
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("4.4.0","] ").concat(_conf.default.i18n(e,o))}function outLog(r){return function(e,o){e=getLog(e,o);return console[r](e),e}}var warnLog=outLog("warn"),errLog=(exports.warnLog=warnLog,outLog("error"));exports.errLog=errLog;
@@ -181,7 +181,7 @@ var v = 'v4';
181
181
  exports.v = v;
182
182
  var VXETable = {
183
183
  v: v,
184
- version: "4.4.0-beta.3",
184
+ version: "4.4.0",
185
185
  setup: _setup.setup,
186
186
  interceptor: _interceptor.interceptor,
187
187
  renderer: _renderer.renderer,
@@ -1 +1 @@
1
- "use strict";Object.defineProperty(exports,"__esModule",{value:!0});var _exportNames={use:!0,t:!0,_t:!0,config:!0,v:!0,VXETable:!0},_xeUtils=(exports.VXETable=void 0,exports._t=_t,exports.default=exports.config=void 0,exports.t=t,exports.use=use,exports.v=void 0,_interopRequireDefault(require("xe-utils"))),_conf=_interopRequireDefault(require("./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")),_hooks=(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/hooks")),_setup=(Object.keys(_hooks).forEach(function(e){"default"===e||"__esModule"===e||Object.prototype.hasOwnProperty.call(_exportNames,e)||e in exports&&exports[e]===_hooks[e]||Object.defineProperty(exports,e,{enumerable:!0,get:function(){return _hooks[e]}})}),require("./src/setup")),_utils=(Object.keys(_setup).forEach(function(e){"default"===e||"__esModule"===e||Object.prototype.hasOwnProperty.call(_exportNames,e)||e in exports&&exports[e]===_setup[e]||Object.defineProperty(exports,e,{enumerable:!0,get:function(){return _setup[e]}})}),require("../tools/utils"));function _interopRequireDefault(e){return e&&e.__esModule?e:{default:e}}function getExportOrImpotType(e,r){var o=[];return _xeUtils.default.objectEach(e,function(e,t){0!==e&&e!==r||o.push(t)}),o}var installedPlugins=[];function use(e,t){return e&&e.install&&-1===installedPlugins.indexOf(e)&&(e.install(VXETable,t),installedPlugins.push(e)),VXETable}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 VXETableConfig=function(){function e(){}return Object.defineProperty(e.prototype,"zIndex",{get:function(){return(0,_utils.getLastZIndex)()},enumerable:!1,configurable:!0}),Object.defineProperty(e.prototype,"nextZIndex",{get:function(){return(0,_utils.nextZIndex)()},enumerable:!1,configurable:!0}),Object.defineProperty(e.prototype,"exportTypes",{get:function(){return getExportOrImpotType(_conf.default.export.types,1)},enumerable:!1,configurable:!0}),Object.defineProperty(e.prototype,"importTypes",{get:function(){return getExportOrImpotType(_conf.default.export.types,2)},enumerable:!1,configurable:!0}),e}(),config=new VXETableConfig,v=(exports.config=config,"v4"),VXETable={v:exports.v=v,version:"4.4.0-beta.3",setup:_setup.setup,interceptor:_interceptor.interceptor,renderer:_renderer.renderer,commands:_commands.commands,formats:_formats.formats,menus:_menus.menus,hooks:_hooks.hooks,config:config,use:use,t:t,_t:_t},_default=exports.VXETable=VXETable;exports.default=_default;
1
+ "use strict";Object.defineProperty(exports,"__esModule",{value:!0});var _exportNames={use:!0,t:!0,_t:!0,config:!0,v:!0,VXETable:!0},_xeUtils=(exports.VXETable=void 0,exports._t=_t,exports.default=exports.config=void 0,exports.t=t,exports.use=use,exports.v=void 0,_interopRequireDefault(require("xe-utils"))),_conf=_interopRequireDefault(require("./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")),_hooks=(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/hooks")),_setup=(Object.keys(_hooks).forEach(function(e){"default"===e||"__esModule"===e||Object.prototype.hasOwnProperty.call(_exportNames,e)||e in exports&&exports[e]===_hooks[e]||Object.defineProperty(exports,e,{enumerable:!0,get:function(){return _hooks[e]}})}),require("./src/setup")),_utils=(Object.keys(_setup).forEach(function(e){"default"===e||"__esModule"===e||Object.prototype.hasOwnProperty.call(_exportNames,e)||e in exports&&exports[e]===_setup[e]||Object.defineProperty(exports,e,{enumerable:!0,get:function(){return _setup[e]}})}),require("../tools/utils"));function _interopRequireDefault(e){return e&&e.__esModule?e:{default:e}}function getExportOrImpotType(e,r){var o=[];return _xeUtils.default.objectEach(e,function(e,t){0!==e&&e!==r||o.push(t)}),o}var installedPlugins=[];function use(e,t){return e&&e.install&&-1===installedPlugins.indexOf(e)&&(e.install(VXETable,t),installedPlugins.push(e)),VXETable}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 VXETableConfig=function(){function e(){}return Object.defineProperty(e.prototype,"zIndex",{get:function(){return(0,_utils.getLastZIndex)()},enumerable:!1,configurable:!0}),Object.defineProperty(e.prototype,"nextZIndex",{get:function(){return(0,_utils.nextZIndex)()},enumerable:!1,configurable:!0}),Object.defineProperty(e.prototype,"exportTypes",{get:function(){return getExportOrImpotType(_conf.default.export.types,1)},enumerable:!1,configurable:!0}),Object.defineProperty(e.prototype,"importTypes",{get:function(){return getExportOrImpotType(_conf.default.export.types,2)},enumerable:!1,configurable:!0}),e}(),config=new VXETableConfig,v=(exports.config=config,"v4"),VXETable={v:exports.v=v,version:"4.4.0",setup:_setup.setup,interceptor:_interceptor.interceptor,renderer:_renderer.renderer,commands:_commands.commands,formats:_formats.formats,menus:_menus.menus,hooks:_hooks.hooks,config:config,use:use,t:t,_t:_t},_default=exports.VXETable=VXETable;exports.default=_default;
@@ -117,14 +117,22 @@
117
117
  }
118
118
 
119
119
  .vxe-form .vxe-form--gather {
120
- display: inline-block;
120
+ display: inline-flex;
121
+ flex-direction: row;
122
+ flex-wrap: wrap;
123
+ align-content: flex-start;
124
+ }
125
+ .vxe-form .vxe-form--wrapper {
126
+ display: flex;
127
+ flex-direction: row;
128
+ flex-wrap: wrap;
121
129
  }
122
130
  .vxe-form .vxe-form--item {
123
131
  display: none;
124
132
  padding: 0.5em 0.8em 0.5em 0;
125
133
  }
126
134
  .vxe-form .vxe-form--item.is--active:not(.is--hidden) {
127
- display: inline-block;
135
+ display: inline-flex;
128
136
  }
129
137
 
130
138
  .vxe-form--item.is--colon .vxe-form--item-title-postfix:after {
@@ -173,6 +181,7 @@
173
181
  display: flex;
174
182
  flex-direction: row;
175
183
  align-items: center;
184
+ flex-grow: 1;
176
185
  }
177
186
  .vxe-form--item .vxe-form--item-inner .vxe-form--item-title {
178
187
  flex-shrink: 0;
@@ -1 +1 @@
1
- .vxe-form--item .vxe-default-input[type=reset]:hover,.vxe-form--item .vxe-default-input[type=submit]:hover{color:#5faeff;border-color:#73b8ff}.vxe-form{position:relative;font-size:14px;color:#606266;font-family:-apple-system,BlinkMacSystemFont,Segoe UI,PingFang SC,Hiragino Sans GB,Microsoft YaHei,Helvetica Neue,Helvetica,Arial,sans-serif,Apple Color Emoji,Segoe UI Emoji,Segoe UI Symbol;background-color:#fff;text-align:left}.vxe-form-slots{display:none}.vxe-form--item-content,.vxe-form--item-trigger-node{display:inline-block;vertical-align:middle}.vxe-form--item-title{display:flex;flex-direction:row;max-width:320px;padding-right:.8em}.vxe-form--item-title.is--ellipsis .vxe-form--item-title-content{overflow:hidden;text-overflow:ellipsis;white-space:nowrap}.vxe-form--item-title .vxe-form--item-title-postfix,.vxe-form--item-title .vxe-form--item-title-prefix,.vxe-form--item-title .vxe-form--item-title-suffix{flex-shrink:0}.vxe-form--item-title .vxe-form--item-title-prefix,.vxe-form--item-title .vxe-form--item-title-suffix{cursor:help;vertical-align:middle}.vxe-form--item-title .vxe-form--item-title-prefix{margin-right:.25em}.vxe-form--item-title .vxe-form--item-title-suffix{margin-left:.2em}.vxe-form--item-title .vxe-form--item-title-postfix{display:flex;align-items:center}.vxe-form--item-title .vxe-form--item-title-content{flex-grow:1}.vxe-form--item-title .vxe-form--item-title-label{vertical-align:middle}.vxe-form--item-trigger-node{font-size:12px;min-width:100px;color:#909399;text-align:center;-webkit-user-select:none;-moz-user-select:none;user-select:none;cursor:pointer}.vxe-form--item-trigger-node .vxe-form--item-trigger-icon{display:inline-block;margin:0 .25em;transition:all .1s}.vxe-form--item-valid{position:absolute;width:100%;font-size:12px;line-height:1.2em;color:#f56c6c;background-color:inherit;z-index:1;opacity:0;transform-origin:center top;transform:scaleY(0);transition:all .2s ease-in-out}.vxe-form .vxe-form--gather{display:inline-block}.vxe-form .vxe-form--item{display:none;padding:.5em .8em .5em 0}.vxe-form .vxe-form--item.is--active:not(.is--hidden){display:inline-block}.vxe-form--item.is--colon .vxe-form--item-title-postfix:after{content:":";font-weight:400;margin-left:.2em}.vxe-form--item.is--asterisk.is--required .vxe-form--item-title-content:before{content:"*";color:#f56c6c;font-family:Verdana,Arial,Tahoma;margin-right:.2em;font-weight:400;vertical-align:middle}.vxe-form--item.is--span .vxe-default-input:not([type=submit]):not([type=reset]),.vxe-form--item.is--span .vxe-default-select,.vxe-form--item.is--span .vxe-default-textarea,.vxe-form--item.is--span .vxe-input,.vxe-form--item.is--span .vxe-select,.vxe-form--item.is--span .vxe-textarea{width:100%}.vxe-form--item.is--error .vxe-default-input,.vxe-form--item.is--error .vxe-default-select,.vxe-form--item.is--error .vxe-default-textarea,.vxe-form--item.is--error .vxe-input>.vxe-input--inner,.vxe-form--item.is--error .vxe-select,.vxe-form--item.is--error .vxe-select.is--active>.vxe-input .vxe-input--inner,.vxe-form--item.is--error .vxe-textarea>.vxe-textarea--inner{border-color:#f56c6c}.vxe-form--item.is--error .vxe-default-input[type=search]:focus,.vxe-form--item.is--error .vxe-default-input[type=text]:focus,.vxe-form--item.is--error .vxe-default-select:focus,.vxe-form--item.is--error .vxe-default-textarea:focus,.vxe-form--item.is--error .vxe-input>.vxe-input--inner:focus,.vxe-form--item.is--error .vxe-textarea>.vxe-textarea--inner:focus{border-color:#f56c6c}.vxe-form--item.is--error .vxe-form--item-valid{opacity:1;transform:scaleY(1)}.vxe-form--item .vxe-form--item-inner{display:flex;flex-direction:row;align-items:center}.vxe-form--item .vxe-form--item-inner .vxe-form--item-title{flex-shrink:0}.vxe-form--item .vxe-form--item-inner .vxe-form--item-content{position:relative;flex-grow:1;word-break:break-all}.vxe-form--item .vxe-default-input,.vxe-form--item .vxe-default-select,.vxe-form--item .vxe-default-textarea{outline:0;border:1px solid #dcdfe6;border-radius:4px}.vxe-form--item .vxe-default-input,.vxe-form--item .vxe-default-select{height:34px}.vxe-form--item .vxe-default-input{padding:0 .8em}.vxe-form--item .vxe-default-textarea{padding:.3em .6em}.vxe-form--item .vxe-default-input[type=number]{padding-right:.2em}.vxe-form--item .vxe-default-input[type=search],.vxe-form--item .vxe-default-input[type=text]{padding:0 1em}.vxe-form--item .vxe-default-input[type=search],.vxe-form--item .vxe-default-input[type=text],.vxe-form--item .vxe-default-select,.vxe-form--item .vxe-default-textarea{color:#606266}.vxe-form--item .vxe-default-input[type=search]:focus,.vxe-form--item .vxe-default-input[type=text]:focus,.vxe-form--item .vxe-default-select:focus,.vxe-form--item .vxe-default-textarea:focus{border:1px solid #409eff}.vxe-form--item .vxe-default-input[type=search][disabled],.vxe-form--item .vxe-default-input[type=text][disabled],.vxe-form--item .vxe-default-select[disabled],.vxe-form--item .vxe-default-textarea[disabled]{cursor:not-allowed;background-color:#f3f3f3}.vxe-form--item .vxe-default-input[type=reset],.vxe-form--item .vxe-default-input[type=submit]{line-height:32px;background-color:#fff;cursor:pointer}.vxe-form--item .vxe-default-input[type=reset]:active,.vxe-form--item .vxe-default-input[type=submit]:active{color:#3699ff;border-color:#3699ff}.vxe-form--item .vxe-default-input[type=date]::-webkit-inner-spin-button{margin-top:6px}.vxe-form--item .vxe-default-input[type=date]::-webkit-inner-spin-button,.vxe-form--item .vxe-default-input[type=number]::-webkit-inner-spin-button{height:24px}.vxe-form--item .vxe-default-input::-moz-placeholder{color:#c0c4cc}.vxe-form--item .vxe-default-input::placeholder{color:#c0c4cc}.vxe-form--item .vxe-default-input[type=search],.vxe-form--item .vxe-default-input[type=text],.vxe-form--item .vxe-default-select,.vxe-form--item .vxe-default-textarea{width:180px}.vxe-form--item .vxe-default-textarea{resize:none;vertical-align:middle}.vxe-form--item .vxe-default-textarea::-moz-placeholder{color:#c0c4cc}.vxe-form--item .vxe-default-textarea::placeholder{color:#c0c4cc}.vxe-form .vxe-form--item-inner{min-height:36px}.vxe-form .vxe-form--item-inner>.align--center{text-align:center}.vxe-form .vxe-form--item-inner>.align--left{text-align:left}.vxe-form .vxe-form--item-inner>.align--right{text-align:right}.vxe-form.size--medium{font-size:14px}.vxe-form.size--medium .vxe-form--item-inner{min-height:34px}.vxe-form.size--medium .vxe-default-input[type=reset],.vxe-form.size--medium .vxe-default-input[type=submit]{line-height:30px}.vxe-form.size--medium .vxe-default-input,.vxe-form.size--medium .vxe-default-select{height:32px}.vxe-form.size--small{font-size:13px}.vxe-form.size--small .vxe-form--item-inner{min-height:32px}.vxe-form.size--small .vxe-default-input[type=reset],.vxe-form.size--small .vxe-default-input[type=submit]{line-height:28px}.vxe-form.size--small .vxe-default-input,.vxe-form.size--small .vxe-default-select{height:30px}.vxe-form.size--mini{font-size:12px}.vxe-form.size--mini .vxe-form--item-inner{min-height:30px}.vxe-form.size--mini .vxe-default-input[type=reset],.vxe-form.size--mini .vxe-default-input[type=submit]{line-height:26px}.vxe-form.size--mini .vxe-default-input,.vxe-form.size--mini .vxe-default-select{height:28px}
1
+ .vxe-form--item .vxe-default-input[type=reset]:hover,.vxe-form--item .vxe-default-input[type=submit]:hover{color:#5faeff;border-color:#73b8ff}.vxe-form{position:relative;font-size:14px;color:#606266;font-family:-apple-system,BlinkMacSystemFont,Segoe UI,PingFang SC,Hiragino Sans GB,Microsoft YaHei,Helvetica Neue,Helvetica,Arial,sans-serif,Apple Color Emoji,Segoe UI Emoji,Segoe UI Symbol;background-color:#fff;text-align:left}.vxe-form-slots{display:none}.vxe-form--item-content,.vxe-form--item-trigger-node{display:inline-block;vertical-align:middle}.vxe-form--item-title{display:flex;flex-direction:row;max-width:320px;padding-right:.8em}.vxe-form--item-title.is--ellipsis .vxe-form--item-title-content{overflow:hidden;text-overflow:ellipsis;white-space:nowrap}.vxe-form--item-title .vxe-form--item-title-postfix,.vxe-form--item-title .vxe-form--item-title-prefix,.vxe-form--item-title .vxe-form--item-title-suffix{flex-shrink:0}.vxe-form--item-title .vxe-form--item-title-prefix,.vxe-form--item-title .vxe-form--item-title-suffix{cursor:help;vertical-align:middle}.vxe-form--item-title .vxe-form--item-title-prefix{margin-right:.25em}.vxe-form--item-title .vxe-form--item-title-suffix{margin-left:.2em}.vxe-form--item-title .vxe-form--item-title-postfix{display:flex;align-items:center}.vxe-form--item-title .vxe-form--item-title-content{flex-grow:1}.vxe-form--item-title .vxe-form--item-title-label{vertical-align:middle}.vxe-form--item-trigger-node{font-size:12px;min-width:100px;color:#909399;text-align:center;-webkit-user-select:none;-moz-user-select:none;user-select:none;cursor:pointer}.vxe-form--item-trigger-node .vxe-form--item-trigger-icon{display:inline-block;margin:0 .25em;transition:all .1s}.vxe-form--item-valid{position:absolute;width:100%;font-size:12px;line-height:1.2em;color:#f56c6c;background-color:inherit;z-index:1;opacity:0;transform-origin:center top;transform:scaleY(0);transition:all .2s ease-in-out}.vxe-form .vxe-form--gather{display:inline-flex;flex-direction:row;flex-wrap:wrap;align-content:flex-start}.vxe-form .vxe-form--wrapper{display:flex;flex-direction:row;flex-wrap:wrap}.vxe-form .vxe-form--item{display:none;padding:.5em .8em .5em 0}.vxe-form .vxe-form--item.is--active:not(.is--hidden){display:inline-flex}.vxe-form--item.is--colon .vxe-form--item-title-postfix:after{content:":";font-weight:400;margin-left:.2em}.vxe-form--item.is--asterisk.is--required .vxe-form--item-title-content:before{content:"*";color:#f56c6c;font-family:Verdana,Arial,Tahoma;margin-right:.2em;font-weight:400;vertical-align:middle}.vxe-form--item.is--span .vxe-default-input:not([type=submit]):not([type=reset]),.vxe-form--item.is--span .vxe-default-select,.vxe-form--item.is--span .vxe-default-textarea,.vxe-form--item.is--span .vxe-input,.vxe-form--item.is--span .vxe-select,.vxe-form--item.is--span .vxe-textarea{width:100%}.vxe-form--item.is--error .vxe-default-input,.vxe-form--item.is--error .vxe-default-select,.vxe-form--item.is--error .vxe-default-textarea,.vxe-form--item.is--error .vxe-input>.vxe-input--inner,.vxe-form--item.is--error .vxe-select,.vxe-form--item.is--error .vxe-select.is--active>.vxe-input .vxe-input--inner,.vxe-form--item.is--error .vxe-textarea>.vxe-textarea--inner{border-color:#f56c6c}.vxe-form--item.is--error .vxe-default-input[type=search]:focus,.vxe-form--item.is--error .vxe-default-input[type=text]:focus,.vxe-form--item.is--error .vxe-default-select:focus,.vxe-form--item.is--error .vxe-default-textarea:focus,.vxe-form--item.is--error .vxe-input>.vxe-input--inner:focus,.vxe-form--item.is--error .vxe-textarea>.vxe-textarea--inner:focus{border-color:#f56c6c}.vxe-form--item.is--error .vxe-form--item-valid{opacity:1;transform:scaleY(1)}.vxe-form--item .vxe-form--item-inner{display:flex;flex-direction:row;align-items:center;flex-grow:1}.vxe-form--item .vxe-form--item-inner .vxe-form--item-title{flex-shrink:0}.vxe-form--item .vxe-form--item-inner .vxe-form--item-content{position:relative;flex-grow:1;word-break:break-all}.vxe-form--item .vxe-default-input,.vxe-form--item .vxe-default-select,.vxe-form--item .vxe-default-textarea{outline:0;border:1px solid #dcdfe6;border-radius:4px}.vxe-form--item .vxe-default-input,.vxe-form--item .vxe-default-select{height:34px}.vxe-form--item .vxe-default-input{padding:0 .8em}.vxe-form--item .vxe-default-textarea{padding:.3em .6em}.vxe-form--item .vxe-default-input[type=number]{padding-right:.2em}.vxe-form--item .vxe-default-input[type=search],.vxe-form--item .vxe-default-input[type=text]{padding:0 1em}.vxe-form--item .vxe-default-input[type=search],.vxe-form--item .vxe-default-input[type=text],.vxe-form--item .vxe-default-select,.vxe-form--item .vxe-default-textarea{color:#606266}.vxe-form--item .vxe-default-input[type=search]:focus,.vxe-form--item .vxe-default-input[type=text]:focus,.vxe-form--item .vxe-default-select:focus,.vxe-form--item .vxe-default-textarea:focus{border:1px solid #409eff}.vxe-form--item .vxe-default-input[type=search][disabled],.vxe-form--item .vxe-default-input[type=text][disabled],.vxe-form--item .vxe-default-select[disabled],.vxe-form--item .vxe-default-textarea[disabled]{cursor:not-allowed;background-color:#f3f3f3}.vxe-form--item .vxe-default-input[type=reset],.vxe-form--item .vxe-default-input[type=submit]{line-height:32px;background-color:#fff;cursor:pointer}.vxe-form--item .vxe-default-input[type=reset]:active,.vxe-form--item .vxe-default-input[type=submit]:active{color:#3699ff;border-color:#3699ff}.vxe-form--item .vxe-default-input[type=date]::-webkit-inner-spin-button{margin-top:6px}.vxe-form--item .vxe-default-input[type=date]::-webkit-inner-spin-button,.vxe-form--item .vxe-default-input[type=number]::-webkit-inner-spin-button{height:24px}.vxe-form--item .vxe-default-input::-moz-placeholder{color:#c0c4cc}.vxe-form--item .vxe-default-input::placeholder{color:#c0c4cc}.vxe-form--item .vxe-default-input[type=search],.vxe-form--item .vxe-default-input[type=text],.vxe-form--item .vxe-default-select,.vxe-form--item .vxe-default-textarea{width:180px}.vxe-form--item .vxe-default-textarea{resize:none;vertical-align:middle}.vxe-form--item .vxe-default-textarea::-moz-placeholder{color:#c0c4cc}.vxe-form--item .vxe-default-textarea::placeholder{color:#c0c4cc}.vxe-form .vxe-form--item-inner{min-height:36px}.vxe-form .vxe-form--item-inner>.align--center{text-align:center}.vxe-form .vxe-form--item-inner>.align--left{text-align:left}.vxe-form .vxe-form--item-inner>.align--right{text-align:right}.vxe-form.size--medium{font-size:14px}.vxe-form.size--medium .vxe-form--item-inner{min-height:34px}.vxe-form.size--medium .vxe-default-input[type=reset],.vxe-form.size--medium .vxe-default-input[type=submit]{line-height:30px}.vxe-form.size--medium .vxe-default-input,.vxe-form.size--medium .vxe-default-select{height:32px}.vxe-form.size--small{font-size:13px}.vxe-form.size--small .vxe-form--item-inner{min-height:32px}.vxe-form.size--small .vxe-default-input[type=reset],.vxe-form.size--small .vxe-default-input[type=submit]{line-height:28px}.vxe-form.size--small .vxe-default-input,.vxe-form.size--small .vxe-default-select{height:30px}.vxe-form.size--mini{font-size:12px}.vxe-form.size--mini .vxe-form--item-inner{min-height:30px}.vxe-form.size--mini .vxe-default-input[type=reset],.vxe-form.size--mini .vxe-default-input[type=submit]{line-height:26px}.vxe-form.size--mini .vxe-default-input,.vxe-form.size--mini .vxe-default-select{height:28px}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "vxe-table",
3
- "version": "4.4.0-beta.3",
3
+ "version": "4.4.0",
4
4
  "description": "一个基于 vue 的 PC 端表格组件,支持增删改查、虚拟列表、虚拟树、懒加载、快捷菜单、数据校验、树形结构、打印导出、表单渲染、数据分页、弹窗、自定义模板、渲染器等...",
5
5
  "scripts": {
6
6
  "update": "npm install --legacy-peer-deps",
@@ -28,12 +28,14 @@ const VxeFormConfigItem = defineComponent({
28
28
  const item = props.itemConfig as VxeFormDefines.ItemInfo
29
29
  const { collapseAll } = reactData
30
30
  const validOpts = computeValidOpts.value
31
- const { slots, title, visible, folding, field, collapseNode, itemRender, showError, errRule, className, titleOverflow, children } = item
31
+ const { slots, title, visible, folding, field, collapseNode, itemRender, showError, errRule, className, titleOverflow, children, showTitle, contentClassName, contentStyle, titleClassName, titleStyle } = item
32
32
  const compConf = isEnableConf(itemRender) ? VXETable.renderer.get(itemRender.name) : null
33
33
  const itemClassName = compConf ? compConf.itemClassName : ''
34
34
  const itemStyle = compConf ? compConf.itemStyle : null
35
35
  const itemContentClassName = compConf ? compConf.itemContentClassName : ''
36
36
  const itemContentStyle = compConf ? compConf.itemContentStyle : null
37
+ const itemTitleClassName = compConf ? compConf.itemTitleClassName : ''
38
+ const itemTitleStyle = compConf ? compConf.itemTitleStyle : null
37
39
  const defaultSlot = slots ? slots.default : null
38
40
  const titleSlot = slots ? slots.title : null
39
41
  const span = item.span || allSpan
@@ -43,10 +45,10 @@ const VxeFormConfigItem = defineComponent({
43
45
  const titleColon = XEUtils.eqNull(item.titleColon) ? allTitleColon : item.titleColon
44
46
  const titleAsterisk = XEUtils.eqNull(item.titleAsterisk) ? allTitleAsterisk : item.titleAsterisk
45
47
  const itemOverflow = (XEUtils.isUndefined(titleOverflow) || XEUtils.isNull(titleOverflow)) ? allTitleOverflow : titleOverflow
46
- const showEllipsis = itemOverflow === 'ellipsis'
47
- const showTitle = itemOverflow === 'title'
48
- const showTooltip = itemOverflow === true || itemOverflow === 'tooltip'
49
- const hasEllipsis = showTitle || showTooltip || showEllipsis
48
+ const ovEllipsis = itemOverflow === 'ellipsis'
49
+ const ovTitle = itemOverflow === 'title'
50
+ const ovTooltip = itemOverflow === true || itemOverflow === 'tooltip'
51
+ const hasEllipsis = ovTitle || ovTooltip || ovEllipsis
50
52
  const params = { data, field, property: field, item, $form: $xeform, $grid: $xeform.xegrid }
51
53
  if (visible === false) {
52
54
  return createCommentVNode()
@@ -104,7 +106,7 @@ const VxeFormConfigItem = defineComponent({
104
106
  }, errRule.content)
105
107
  )
106
108
  }
107
- const ons = showTooltip ? {
109
+ const ons = ovTooltip ? {
108
110
  onMouseenter (evnt: MouseEvent) {
109
111
  $xeform.triggerTitleTipEvent(evnt, params)
110
112
  },
@@ -132,19 +134,33 @@ const VxeFormConfigItem = defineComponent({
132
134
  h('div', {
133
135
  class: 'vxe-form--item-inner'
134
136
  }, [
135
- title || titleSlot ? h('div', {
136
- class: ['vxe-form--item-title', titleAlign ? `align--${titleAlign}` : null, {
137
- 'is--ellipsis': hasEllipsis
138
- }],
139
- style: titleWidth ? {
140
- width: isNaN(titleWidth as number) ? titleWidth : `${titleWidth}px`
141
- } : null,
142
- title: showTitle ? getFuncText(title) : null,
137
+ (showTitle !== false) && (title || titleSlot) ? h('div', {
138
+ class: [
139
+ 'vxe-form--item-title',
140
+ titleAlign ? `align--${titleAlign}` : '',
141
+ hasEllipsis ? 'is--ellipsis' : '',
142
+ itemTitleClassName ? (XEUtils.isFunction(itemTitleClassName) ? itemTitleClassName(params) : itemTitleClassName) : '',
143
+ titleClassName ? (XEUtils.isFunction(titleClassName) ? titleClassName(params) : titleClassName) : ''
144
+ ],
145
+ style: Object.assign(
146
+ {},
147
+ XEUtils.isFunction(itemTitleStyle) ? itemTitleStyle(params) : itemTitleStyle,
148
+ XEUtils.isFunction(titleStyle) ? titleStyle(params) : titleStyle,
149
+ titleWidth ? {
150
+ width: isNaN(titleWidth as number) ? titleWidth : `${titleWidth}px`
151
+ } : null
152
+ ),
153
+ title: ovTitle ? getFuncText(title) : null,
143
154
  ...ons
144
155
  }, renderTitle($xeform, item)) : null,
145
156
  h('div', {
146
- class: ['vxe-form--item-content', align ? `align--${align}` : '', itemContentClassName ? (XEUtils.isFunction(itemContentClassName) ? itemContentClassName(params) : itemContentClassName) : ''],
147
- style: XEUtils.isFunction(itemContentStyle) ? itemContentStyle(params) : itemContentStyle
157
+ class: [
158
+ 'vxe-form--item-content',
159
+ align ? `align--${align}` : '',
160
+ itemContentClassName ? (XEUtils.isFunction(itemContentClassName) ? itemContentClassName(params) : itemContentClassName) : '',
161
+ contentClassName ? (XEUtils.isFunction(contentClassName) ? contentClassName(params) : contentClassName) : ''
162
+ ],
163
+ style: Object.assign({}, XEUtils.isFunction(itemContentStyle) ? itemContentStyle(params) : itemContentStyle, XEUtils.isFunction(contentStyle) ? contentStyle(params) : contentStyle)
148
164
  }, contentVNs)
149
165
  ])
150
166
  ])
@@ -30,7 +30,15 @@ export const formItemProps = {
30
30
  type: Boolean as PropType<VxeFormItemPropTypes.TitleAsterisk>,
31
31
  default: null
32
32
  },
33
+ showTitle: {
34
+ type: Boolean,
35
+ default: true
36
+ },
33
37
  className: [String, Function] as PropType<VxeFormItemPropTypes.ClassName>,
38
+ contentClassName: [String, Function] as PropType<VxeFormItemPropTypes.ContentClassName>,
39
+ contentStyle: [Object, Function] as PropType<VxeFormItemPropTypes.ContentStyle>,
40
+ titleClassName: [String, Function] as PropType<VxeFormItemPropTypes.TitleClassName>,
41
+ titleStyle: [Object, Function] as PropType<VxeFormItemPropTypes.TitleStyle>,
34
42
  titleOverflow: {
35
43
  type: [Boolean, String] as PropType<VxeFormItemPropTypes.TitleOverflow>,
36
44
  default: null
@@ -77,12 +85,14 @@ export default defineComponent({
77
85
  const { collapseAll } = reactData
78
86
  const { computeValidOpts } = $xeform.getComputeMaps()
79
87
  const validOpts = computeValidOpts.value
80
- const { slots, title, visible, folding, field, collapseNode, itemRender, showError, errRule, className, titleOverflow } = item
88
+ const { slots, title, visible, folding, field, collapseNode, itemRender, showError, errRule, className, titleOverflow, showTitle, contentClassName, contentStyle, titleClassName, titleStyle } = item
81
89
  const compConf = isEnableConf(itemRender) ? VXETable.renderer.get(itemRender.name) : null
82
90
  const itemClassName = compConf ? compConf.itemClassName : ''
83
91
  const itemStyle = compConf ? compConf.itemStyle : null
84
92
  const itemContentClassName = compConf ? compConf.itemContentClassName : ''
85
93
  const itemContentStyle = compConf ? compConf.itemContentStyle : null
94
+ const itemTitleClassName = compConf ? compConf.itemTitleClassName : ''
95
+ const itemTitleStyle = compConf ? compConf.itemTitleStyle : null
86
96
  const defaultSlot = slots ? slots.default : null
87
97
  const titleSlot = slots ? slots.title : null
88
98
  const span = item.span || props.span
@@ -92,10 +102,10 @@ export default defineComponent({
92
102
  const titleColon = XEUtils.eqNull(item.titleColon) ? allTitleColon : item.titleColon
93
103
  const titleAsterisk = XEUtils.eqNull(item.titleAsterisk) ? allTitleAsterisk : item.titleAsterisk
94
104
  const itemOverflow = (XEUtils.isUndefined(titleOverflow) || XEUtils.isNull(titleOverflow)) ? allTitleOverflow : titleOverflow
95
- const showEllipsis = itemOverflow === 'ellipsis'
96
- const showTitle = itemOverflow === 'title'
97
- const showTooltip = itemOverflow === true || itemOverflow === 'tooltip'
98
- const hasEllipsis = showTitle || showTooltip || showEllipsis
105
+ const ovEllipsis = itemOverflow === 'ellipsis'
106
+ const ovTitle = itemOverflow === 'title'
107
+ const ovTooltip = itemOverflow === true || itemOverflow === 'tooltip'
108
+ const hasEllipsis = ovTitle || ovTooltip || ovEllipsis
99
109
  const params = { data, field, property: field, item, $form: $xeform, $grid: $xeform.xegrid }
100
110
  let isRequired = false
101
111
  if (visible === false) {
@@ -140,7 +150,7 @@ export default defineComponent({
140
150
  }, errRule.message)
141
151
  )
142
152
  }
143
- const ons = showTooltip ? {
153
+ const ons = ovTooltip ? {
144
154
  onMouseenter (evnt: MouseEvent) {
145
155
  $xeform.triggerTitleTipEvent(evnt, params)
146
156
  },
@@ -169,19 +179,37 @@ export default defineComponent({
169
179
  h('div', {
170
180
  class: 'vxe-form--item-inner'
171
181
  }, [
172
- title || titleSlot ? h('div', {
173
- class: ['vxe-form--item-title', titleAlign ? `align--${titleAlign}` : null, {
174
- 'is--ellipsis': hasEllipsis
175
- }],
176
- style: titleWidth ? {
177
- width: isNaN(titleWidth as number) ? titleWidth : `${titleWidth}px`
178
- } : null,
179
- title: showTitle ? getFuncText(title) : null,
182
+ (showTitle !== false) && (title || titleSlot) ? h('div', {
183
+ class: [
184
+ 'vxe-form--item-title',
185
+ titleAlign ? `align--${titleAlign}` : '',
186
+ hasEllipsis ? 'is--ellipsis' : '',
187
+ itemTitleClassName ? (XEUtils.isFunction(itemTitleClassName) ? itemTitleClassName(params) : itemTitleClassName) : '',
188
+ titleClassName ? (XEUtils.isFunction(titleClassName) ? titleClassName(params) : titleClassName) : ''
189
+ ],
190
+ style: Object.assign(
191
+ {},
192
+ XEUtils.isFunction(itemTitleStyle) ? itemTitleStyle(params) : itemTitleStyle,
193
+ XEUtils.isFunction(titleStyle) ? titleStyle(params) : titleStyle,
194
+ titleWidth ? {
195
+ width: isNaN(titleWidth as number) ? titleWidth : `${titleWidth}px`
196
+ } : null
197
+ ),
198
+ title: ovTitle ? getFuncText(title) : null,
180
199
  ...ons
181
200
  }, renderTitle($xeform, item)) : null,
182
201
  h('div', {
183
- class: ['vxe-form--item-content', align ? `align--${align}` : '', itemContentClassName ? (XEUtils.isFunction(itemContentClassName) ? itemContentClassName(params) : itemContentClassName) : ''],
184
- style: XEUtils.isFunction(itemContentStyle) ? itemContentStyle(params) : itemContentStyle
202
+ class: [
203
+ 'vxe-form--item-content',
204
+ align ? `align--${align}` : '',
205
+ itemContentClassName ? (XEUtils.isFunction(itemContentClassName) ? itemContentClassName(params) : itemContentClassName) : '',
206
+ contentClassName ? (XEUtils.isFunction(contentClassName) ? contentClassName(params) : contentClassName) : ''
207
+ ],
208
+ style: Object.assign(
209
+ {},
210
+ XEUtils.isFunction(itemContentStyle) ? itemContentStyle(params) : itemContentStyle,
211
+ XEUtils.isFunction(contentStyle) ? contentStyle(params) : contentStyle
212
+ )
185
213
  }, contentVNs)
186
214
  ])
187
215
  ])
@@ -15,12 +15,17 @@ export class ItemInfo {
15
15
  titlePrefix: item.titlePrefix,
16
16
  titleSuffix: item.titleSuffix,
17
17
  titleOverflow: item.titleOverflow,
18
+ showTitle: item.showTitle,
18
19
  resetValue: item.resetValue,
19
20
  visibleMethod: item.visibleMethod,
20
21
  visible: item.visible,
21
22
  folding: item.folding,
22
23
  collapseNode: item.collapseNode,
23
24
  className: item.className,
25
+ contentClassName: item.contentClassName,
26
+ contentStyle: item.contentStyle,
27
+ titleClassName: item.titleClassName,
28
+ titleStyle: item.titleStyle,
24
29
  itemRender: item.itemRender,
25
30
  // 渲染属性
26
31
  showError: false,
package/styles/form.scss CHANGED
@@ -93,14 +93,22 @@
93
93
 
94
94
  .vxe-form {
95
95
  .vxe-form--gather {
96
- display: inline-block;
96
+ display: inline-flex;
97
+ flex-direction: row;
98
+ flex-wrap: wrap;
99
+ align-content: flex-start;
100
+ }
101
+ .vxe-form--wrapper {
102
+ display: flex;
103
+ flex-direction: row;
104
+ flex-wrap: wrap;
97
105
  }
98
106
  .vxe-form--item {
99
107
  display: none;
100
108
  padding: 0.5em 0.8em 0.5em 0;
101
109
  &.is--active {
102
110
  &:not(.is--hidden) {
103
- display: inline-block;
111
+ display: inline-flex;
104
112
  }
105
113
  }
106
114
  }
@@ -169,6 +177,7 @@
169
177
  display: flex;
170
178
  flex-direction: row;
171
179
  align-items: center;
180
+ flex-grow: 1;
172
181
  .vxe-form--item-title {
173
182
  flex-shrink: 0;
174
183
  }
@@ -21,5 +21,6 @@ export interface VxeEvent {
21
21
  }
22
22
 
23
23
  export type VNodeStyle = Record<string, string | number>
24
+ export type VNodeClassName = Record<string, boolean>
24
25
 
25
26
  export type SlotVNodeType = JSX.Element | VNode | string | number
@@ -1,5 +1,5 @@
1
1
  import { VNode } from 'vue'
2
- import { VXEComponent } from './component'
2
+ import { VXEComponent, VNodeStyle } from './component'
3
3
  import { VxeFormConstructor, VxeFormDefines, VxeFormPropTypes } from './form'
4
4
  import { VxeGridConstructor } from './grid'
5
5
  import { VxeTooltipPropTypes } from './tooltip'
@@ -50,10 +50,30 @@ export interface VxeFormItemProps {
50
50
  * 是否显示必填字段的红色星号
51
51
  */
52
52
  titleAsterisk?: VxeFormItemPropTypes.TitleAsterisk
53
+ /**
54
+ * 是否显示标题
55
+ */
56
+ showTitle?: VxeFormItemPropTypes.ShowTitle
53
57
  /**
54
58
  * 给表单项附加 className
55
59
  */
56
60
  className?: VxeFormItemPropTypes.ClassName
61
+ /**
62
+ * 给表单项内容附加 className
63
+ */
64
+ contentClassName?: VxeFormItemPropTypes.ContentClassName
65
+ /**
66
+ * 给表单项内容附加样式
67
+ */
68
+ contentStyle?: VxeFormItemPropTypes.ContentStyle
69
+ /**
70
+ * 给表单项标题附加 className
71
+ */
72
+ titleClassName?: VxeFormItemPropTypes.TitleClassName
73
+ /**
74
+ * 给表单项标题附加样式
75
+ */
76
+ titleStyle?: VxeFormItemPropTypes.TitleStyle
57
77
  /**
58
78
  * 前缀配置项
59
79
  */
@@ -100,6 +120,7 @@ export namespace VxeFormItemPropTypes {
100
120
  export type TitleWidth = VxeFormPropTypes.TitleWidth
101
121
  export type TitleColon = VxeFormPropTypes.TitleColon
102
122
  export type TitleAsterisk = VxeFormPropTypes.TitleAsterisk
123
+ export type ShowTitle = boolean
103
124
 
104
125
  interface ClassNameParams {
105
126
  $form: VxeFormConstructor
@@ -112,6 +133,19 @@ export namespace VxeFormItemPropTypes {
112
133
  property: string
113
134
  }
114
135
  export type ClassName = string | ((params: ClassNameParams) => string)
136
+
137
+ interface ContentClassNameParams extends ClassNameParams{}
138
+ export type ContentClassName = string | ((params: ContentClassNameParams) => string)
139
+
140
+ interface ContentStyleParams extends ClassNameParams{}
141
+ export type ContentStyle = VNodeStyle | ((params: ContentStyleParams) => VNodeStyle)
142
+
143
+ interface TitleClassNameParams extends ClassNameParams{}
144
+ export type TitleClassName = string | ((params: TitleClassNameParams) => string)
145
+
146
+ interface TitleStyleParams extends ClassNameParams{}
147
+ export type TitleStyle = VNodeStyle | ((params: TitleStyleParams) => VNodeStyle)
148
+
115
149
  export type Readonly = boolean
116
150
 
117
151
  interface PrefixOption {
package/types/form.d.ts CHANGED
@@ -217,12 +217,17 @@ export namespace VxeFormDefines {
217
217
  titlePrefix: VxeFormItemPropTypes.TitlePrefix
218
218
  titleSuffix: VxeFormItemPropTypes.TitleSuffix
219
219
  titleOverflow: VxeFormItemPropTypes.TitleOverflow
220
+ showTitle: VxeFormItemPropTypes.ShowTitle
220
221
  resetValue: VxeFormItemPropTypes.ResetValue
221
222
  visibleMethod: VxeFormItemPropTypes.VisibleMethod
222
223
  visible: VxeFormItemPropTypes.Visible
223
224
  folding: VxeFormItemPropTypes.Folding
224
225
  collapseNode: VxeFormItemPropTypes.CollapseNode
225
226
  className: VxeFormItemPropTypes.ClassName
227
+ contentClassName: VxeFormItemPropTypes.ContentClassName
228
+ contentStyle: VxeFormItemPropTypes.ContentStyle
229
+ titleClassName: VxeFormItemPropTypes.TitleClassName
230
+ titleStyle: VxeFormItemPropTypes.TitleStyle
226
231
  readonly: VxeFormItemPropTypes.Readonly
227
232
  itemRender: VxeFormItemPropTypes.ItemRender
228
233
  // 渲染属性
package/types/table.d.ts CHANGED
@@ -467,33 +467,33 @@ export interface TablePublicMethods<DT = VxeTableDataRow> {
467
467
  /**
468
468
  * 用于 row-config.isCurrent,获取当前行的行数据
469
469
  */
470
- getCurrentRecord(): any
470
+ getCurrentRecord(): DT | null
471
471
  /**
472
472
  * 用于 type=radio,获取当已选中的行数据
473
473
  */
474
- getRadioRecord(isFull?: boolean): any
474
+ getRadioRecord(isFull?: boolean): DT | null
475
475
  /**
476
476
  * 用于 column-config.isCurrent,设置某列行为高亮状态
477
477
  * @param columnOrField 列对象或字段名
478
478
  */
479
- setCurrentColumn(fieldOrColumn: VxeColumnPropTypes.Field | VxeTableDefines.ColumnInfo<any>): Promise<any>
479
+ setCurrentColumn(fieldOrColumn: VxeColumnPropTypes.Field | VxeTableDefines.ColumnInfo<any>): Promise<void>
480
480
  /**
481
481
  * 用于 column-config.isCurrent,手动清空当前高亮的状态
482
482
  */
483
- clearCurrentColumn(): Promise<any>
483
+ clearCurrentColumn(): Promise<void>
484
484
  /**
485
485
  * 手动对表格进行排序
486
486
  * @param sortConfs 字段名、多列排序
487
487
  * @param order 排序方式
488
488
  */
489
- sort(field: string, order?: VxeTablePropTypes.SortOrder): Promise<any>
490
- sort(sortConfs: VxeTableDefines.SortConfs, order?: VxeTablePropTypes.SortOrder): Promise<any>
491
- sort(sortConfs: VxeTableDefines.SortConfs[], order?: VxeTablePropTypes.SortOrder): Promise<any>
489
+ sort(field: string, order?: VxeTablePropTypes.SortOrder): Promise<void>
490
+ sort(sortConfs: VxeTableDefines.SortConfs, order?: VxeTablePropTypes.SortOrder): Promise<void>
491
+ sort(sortConfs: VxeTableDefines.SortConfs[], order?: VxeTablePropTypes.SortOrder): Promise<void>
492
492
  /**
493
493
  * 手动清空排序条件,数据会恢复成未排序的状态
494
494
  * @param columnOrField 列对象或字段名
495
495
  */
496
- clearSort(fieldOrColumn?: VxeColumnPropTypes.Field | VxeTableDefines.ColumnInfo<any> | null): Promise<any>
496
+ clearSort(fieldOrColumn?: VxeColumnPropTypes.Field | VxeTableDefines.ColumnInfo<any> | null): Promise<void>
497
497
  /**
498
498
  * 判断指定列是否为排序状态,如果为空则判断所有列
499
499
  * @param columnOrField 列对象或字段名
@@ -2441,13 +2441,13 @@ export namespace VxeTableDefines {
2441
2441
  newValue: any
2442
2442
  oldValue: any
2443
2443
  }
2444
- export interface CurrentChangeEventParams<D = VxeTableDataRow> extends TableEventParams<D>, CurrentChangeParams { }
2444
+ export interface CurrentChangeEventParams<D = VxeTableDataRow> extends TableEventParams<D>, CurrentChangeParams<D> { }
2445
2445
 
2446
2446
  export interface RadioChangeParams<D = VxeTableDataRow> extends TableBaseCellParams<D> {
2447
2447
  newValue: any
2448
2448
  oldValue: any
2449
2449
  }
2450
- export interface RadioChangeEventParams<D = VxeTableDataRow> extends TableEventParams<D>, RadioChangeParams { }
2450
+ export interface RadioChangeEventParams<D = VxeTableDataRow> extends TableEventParams<D>, RadioChangeParams<D> { }
2451
2451
 
2452
2452
  export interface CheckboxChangeParams<D = VxeTableDataRow> extends TableBaseCellParams<D> {
2453
2453
  checked: boolean
@@ -1,4 +1,4 @@
1
- import { SlotVNodeType, VNodeStyle } from '../component'
1
+ import { SlotVNodeType, VNodeStyle, VNodeClassName } from '../component'
2
2
  import { VxeTableDefines, VxeTableConstructor, VxeTablePropTypes, VxeTableDataRow } from '../table'
3
3
  import { VxeGridConstructor } from '../grid'
4
4
  import { VxeColumnPropTypes } from '../column'
@@ -17,7 +17,7 @@ export interface DefineRendererOption<T> {
17
17
  className?: string
18
18
 
19
19
  // 筛选渲染
20
- filterClassName?: string | ((params: VxeGlobalRendererHandles.RenderFilterParams) => string | { [key: string]: boolean })
20
+ filterClassName?: string | ((params: VxeGlobalRendererHandles.RenderFilterParams) => string | VNodeClassName)
21
21
  showFilterFooter?: boolean
22
22
  renderFilter?(renderOpts: VxeGlobalRendererHandles.RenderFilterOptions, params: VxeGlobalRendererHandles.RenderFilterParams): T
23
23
  filterMethod?(params: VxeGlobalRendererHandles.FilterMethodParams): boolean
@@ -28,8 +28,8 @@ export interface DefineRendererOption<T> {
28
28
  defaultFilterMethod?(params: VxeGlobalRendererHandles.FilterMethodParams): boolean
29
29
 
30
30
  // 单元格渲染
31
- cellClassName?: string | ((params: VxeGlobalRendererHandles.RenderDefaultParams) => string | { [key: string]: boolean })
32
- cellStyle?: string | VNodeStyle | ((params: VxeGlobalRendererHandles.RenderDefaultParams) => string | VNodeStyle)
31
+ cellClassName?: string | ((params: VxeGlobalRendererHandles.RenderDefaultParams) => string | VNodeClassName)
32
+ cellStyle?: VNodeStyle | ((params: VxeGlobalRendererHandles.RenderDefaultParams) => VNodeStyle)
33
33
  renderHeader?(renderOpts: VxeGlobalRendererHandles.RenderHeaderOptions, params: VxeGlobalRendererHandles.RenderHeaderParams): T
34
34
  renderDefault?(renderOpts: VxeGlobalRendererHandles.RenderDefaultOptions, params: VxeGlobalRendererHandles.RenderDefaultParams): T
35
35
  renderFooter?(renderOpts: VxeGlobalRendererHandles.RenderFooterOptions, params: VxeGlobalRendererHandles.RenderFooterParams): T
@@ -50,10 +50,12 @@ export interface DefineRendererOption<T> {
50
50
  renderToolbarTool?(renderOpts: VxeGlobalRendererHandles.RenderToolOptions, params: VxeGlobalRendererHandles.RenderToolParams): T
51
51
 
52
52
  // 表单-项渲染
53
- itemClassName?: string | ((params: VxeGlobalRendererHandles.RenderItemTitleParams) => string | { [key: string]: boolean })
54
- itemStyle?: string | VNodeStyle | ((params: VxeGlobalRendererHandles.RenderItemTitleParams) => string | VNodeStyle)
55
- itemContentClassName?: string | ((params: VxeGlobalRendererHandles.RenderItemTitleParams) => string | { [key: string]: boolean })
56
- itemContentStyle?: string | VNodeStyle | ((params: VxeGlobalRendererHandles.RenderItemTitleParams) => string | VNodeStyle)
53
+ itemClassName?: string | ((params: VxeGlobalRendererHandles.RenderItemTitleParams) => string | VNodeClassName)
54
+ itemStyle?: VNodeStyle | ((params: VxeGlobalRendererHandles.RenderItemTitleParams) => VNodeStyle)
55
+ itemContentClassName?: string | ((params: VxeGlobalRendererHandles.RenderItemTitleParams) => string | VNodeClassName)
56
+ itemContentStyle?: VNodeStyle | ((params: VxeGlobalRendererHandles.RenderItemTitleParams) => VNodeStyle)
57
+ itemTitleClassName?: string | ((params: VxeGlobalRendererHandles.RenderItemTitleParams) => string | VNodeClassName)
58
+ itemTitleStyle?: VNodeStyle | ((params: VxeGlobalRendererHandles.RenderItemTitleParams) => VNodeStyle)
57
59
  renderItemTitle?(renderOpts: VxeGlobalRendererHandles.RenderItemTitleOptions, params: VxeGlobalRendererHandles.RenderItemTitleParams): T
58
60
  renderItemContent?(renderOpts: VxeGlobalRendererHandles.RenderItemContentOptions, params: VxeGlobalRendererHandles.RenderItemContentParams): T
59
61
  itemVisibleMethod?(params: VxeGlobalRendererHandles.ItemVisibleMethodParams): boolean