mirror of
https://github.com/vbenjs/vben-admin-thin-next.git
synced 2025-02-02 18:08:40 +08:00
chore: perf TableAction.vue、build/utils.ts、prettier.config.js (#868)
* perf: 优化 build 时 vite 模式判断 * perf: 优化 TableAction, 仅在 action.tooltip 存在的情况下 才使用 Tooltip 组件 * docs: 仅在 action.tooltip 存在的情况下 才使用 Tooltip 组件 * fix: 在 window 上,拉取代码后 eslint 因 endOfLine 而保错问题 * docs: 修复在 window 上,拉取代码后 eslint 因 endOfLine 而保错问题
This commit is contained in:
parent
540423ecf7
commit
7b76945bff
@ -5,9 +5,11 @@
|
||||
- 修复树形表格的带有展开图标的单元格的内容对齐问题
|
||||
- 新增`headerTop`插槽
|
||||
- **AppSearch** 修复可能会搜索隐藏菜单的问题
|
||||
- **TableAction** 仅在 action.tooltip 存在的情况下 才包裹 Tooltip 组件
|
||||
- **其它**
|
||||
- 修复菜单默认折叠的配置不起作用的问题
|
||||
- 修复`safari`浏览器报错导致网站打不开
|
||||
- 修复在 window 上,拉取代码后 eslint 因 endOfLine 而保错问题
|
||||
|
||||
### 🎫 Chores
|
||||
|
||||
|
@ -44,7 +44,7 @@ export function wrapperEnv(envConf: Recordable): ViteEnv {
|
||||
*/
|
||||
function getConfFiles() {
|
||||
const script = process.env.npm_lifecycle_script;
|
||||
const reg = new RegExp('--mode ([a-z]+) ');
|
||||
const reg = new RegExp('--mode ([a-z]+)');
|
||||
const result = reg.exec(script as string) as any;
|
||||
if (result) {
|
||||
const mode = result[1] as string;
|
||||
|
@ -15,6 +15,6 @@ module.exports = {
|
||||
requirePragma: false,
|
||||
proseWrap: 'never',
|
||||
htmlWhitespaceSensitivity: 'strict',
|
||||
endOfLine: 'lf',
|
||||
endOfLine: 'auto',
|
||||
rangeStart: 0,
|
||||
};
|
||||
|
@ -1,12 +1,16 @@
|
||||
<template>
|
||||
<div :class="[prefixCls, getAlign]" @click="onCellClick">
|
||||
<template v-for="(action, index) in getActions" :key="`${index}-${action.label}`">
|
||||
<Tooltip v-bind="getTooltip(action.tooltip)">
|
||||
<Tooltip v-if="action.tooltip" v-bind="getTooltip(action.tooltip)">
|
||||
<PopConfirmButton v-bind="action">
|
||||
<Icon :icon="action.icon" class="mr-1" v-if="action.icon" />
|
||||
{{ action.label }}
|
||||
</PopConfirmButton>
|
||||
</Tooltip>
|
||||
<PopConfirmButton v-else v-bind="action">
|
||||
<Icon :icon="action.icon" class="mr-1" v-if="action.icon" />
|
||||
{{ action.label }}
|
||||
</PopConfirmButton>
|
||||
<Divider
|
||||
type="vertical"
|
||||
class="action-divider"
|
||||
@ -126,15 +130,13 @@
|
||||
return actionColumn?.align ?? 'left';
|
||||
});
|
||||
|
||||
const getTooltip = computed(() => {
|
||||
return (data: string | TooltipProps): TooltipProps => {
|
||||
function getTooltip(data: string | TooltipProps): TooltipProps {
|
||||
if (isString(data)) {
|
||||
return { title: data, placement: 'bottom' };
|
||||
} else {
|
||||
return Object.assign({ placement: 'bottom' }, data);
|
||||
}
|
||||
};
|
||||
});
|
||||
}
|
||||
|
||||
function onCellClick(e: MouseEvent) {
|
||||
if (!props.stopButtonPropagation) return;
|
||||
|
Loading…
Reference in New Issue
Block a user