vxe-table 4.17.49 → 4.17.51

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 (27) hide show
  1. package/es/style.css +1 -1
  2. package/es/table/src/cell.js +4 -3
  3. package/es/table/src/table.js +1 -1
  4. package/es/ui/index.js +1 -1
  5. package/es/ui/src/log.js +1 -1
  6. package/lib/index.umd.js +1905 -1822
  7. package/lib/index.umd.min.js +1 -1
  8. package/lib/style.css +1 -1
  9. package/lib/table/src/cell.js +4 -4
  10. package/lib/table/src/cell.min.js +1 -1
  11. package/lib/table/src/table.js +1 -1
  12. package/lib/table/src/table.min.js +1 -1
  13. package/lib/ui/index.js +1 -1
  14. package/lib/ui/index.min.js +1 -1
  15. package/lib/ui/src/log.js +1 -1
  16. package/lib/ui/src/log.min.js +1 -1
  17. package/package.json +3 -2
  18. package/packages/table/module/filter/panel.ts +1 -1
  19. package/packages/table/render/index.ts +1 -1
  20. package/packages/table/src/cell.ts +4 -3
  21. package/packages/table/src/table.ts +3 -3
  22. /package/es/{iconfont.1772182532931.ttf → iconfont.1780227476672.ttf} +0 -0
  23. /package/es/{iconfont.1772182532931.woff → iconfont.1780227476672.woff} +0 -0
  24. /package/es/{iconfont.1772182532931.woff2 → iconfont.1780227476672.woff2} +0 -0
  25. /package/lib/{iconfont.1772182532931.ttf → iconfont.1780227476672.ttf} +0 -0
  26. /package/lib/{iconfont.1772182532931.woff → iconfont.1780227476672.woff} +0 -0
  27. /package/lib/{iconfont.1772182532931.woff2 → iconfont.1780227476672.woff2} +0 -0
package/es/table/src/cell.js CHANGED
@@ -368,7 +368,7 @@ export const Cell = {
368
368
  const tableInternalData = $table.internalData;
369
369
  const { isRowGroupStatus } = tableReactData;
370
370
  const { editConfig } = tableProps;
371
- const { field, slots, editRender, cellRender, rowGroupNode, aggFunc, formatter } = column;
371
+ const { field, slots, editRender, cellRender, rowGroupNode, aggFunc } = column;
372
372
  const isEnableEdit = editConfig && isEnableConf(editConfig);
373
373
  const editRenderOpts = isEnableEdit && isEnableConf(editRender) ? editRender : null;
374
374
  const cellRenderOpts = isEnableConf(cellRender) ? cellRender : null;
@@ -444,8 +444,9 @@ export const Cell = {
444
444
  return renderCellBaseVNs(params, $table.callSlot(defaultSlot, params));
445
445
  }
446
446
  const renderOpts = editRenderOpts || cellRenderOpts;
447
- // formatter > (renderTableCell | renderTableDefault)
448
- if (renderOpts && !formatter) {
447
+ // 如果是编辑表格：renderTableCell > formatter
448
+ // 如果是查看表格：renderTableDefault > formatter
449
+ if (renderOpts) {
449
450
  const compConf = renderer.get(renderOpts.name);
450
451
  if (compConf) {
451
452
  const renderFn = editRenderOpts ? (compConf.renderTableCell || compConf.renderCell) : (compConf.renderTableDefault || compConf.renderDefault);
package/es/table/src/table.js CHANGED
@@ -5300,7 +5300,7 @@ export default defineVxeComponent({
5300
5300
  cellLabel = tcFormatMethod ? tcFormatMethod(formatParams, ...formatter.slice(1)) : '';
5301
5301
  }
5302
5302
  else {
5303
- cellLabel = `${formatter(formatParams)}`;
5303
+ cellLabel = formatter(formatParams);
5304
5304
  }
5305
5305
  }
5306
5306
  else if (renderOpts && tcFormatter) {
package/es/ui/index.js CHANGED
@@ -1,6 +1,6 @@
1
1
  import { VxeUI } from '@vxe-ui/core';
2
2
  import { getFuncText } from './src/utils';
3
- export const version = "4.17.49";
3
+ export const version = "4.17.51";
4
4
  VxeUI.version = version;
5
5
  VxeUI.tableVersion = version;
6
6
  VxeUI.setConfig({
package/es/ui/src/log.js CHANGED
@@ -1,5 +1,5 @@
1
1
  import { VxeUI } from '@vxe-ui/core';
2
2
  const { log } = VxeUI;
3
- const version = `table v${"4.17.49"}`;
3
+ const version = `table v${"4.17.51"}`;
4
4
  export const warnLog = log.create('warn', version);
5
5
  export const errLog = log.create('error', version);