自动填充组件api搜索

代码生成路径大小写修正
折叠组件样式修改
信息体组件可带出部门
详情页子表样式调整:按钮下移
栅格字段栅格数配置不生效
自动编号页面样式修正、增加编号配置可排序用于修改编号配置生成规则、修正自动编号编辑缺陷
列表页样式修正
详情页按钮间距修正
This commit is contained in:
yaoyn
2024-05-17 17:05:14 +08:00
parent 21eb71d35d
commit 5fa642dc64
19 changed files with 162 additions and 76 deletions

View File

@ -4,12 +4,12 @@
<Tooltip v-if="action.tooltip" v-bind="getTooltip(action.tooltip)">
<PopConfirmButton v-bind="action">
<Icon :icon="action.icon" :class="{ 'mr-1': !!action.label }" v-if="action.icon" />
<template v-if="action.label">{{ action.label }}</template>
<template v-if="action.label"><span :style="action.style">{{ action.label }}</span></template>
</PopConfirmButton>
</Tooltip>
<PopConfirmButton v-else placement="leftBottom" v-bind="action">
<Icon :icon="action.icon" :class="{ 'mr-1': !!action.label }" v-if="action.icon" />
<template v-if="action.label">{{ action.label }}</template>
<template v-if="action.label"><span :style="action.style">{{ action.label }}</span></template>
</PopConfirmButton>
<Divider
type="vertical"

View File

@ -1,17 +1,32 @@
<template>
<div style="width: 100%" :class="{ flex: toolBarWidth + formWidth + 200 < tableWidth }">
<div style="width: 100%;margin:20px;" :class="{ flex: toolBarWidth + formWidth + 200 < tableWidth }">
<div v-if="$slots.headerTop" style="margin: 5px">
<slot name="headerTop"></slot>
</div>
<div
:class="`${prefixCls}__toolbar float-left`"
:style="[toolBarWidth + formWidth + 200 < tableWidth ? 'flex: none' : 'margin: 0']"
>
<Divider type="vertical" v-if="false&&$slots.toolbar" class="!ml-2 !mr-4" />
<slot name="toolbar"></slot>
<Divider type="vertical" v-if="false&&$slots.toolbar && showTableSetting" class="!mx-3" />
<TableSetting
:setting="tableSetting"
v-if="showTableSetting"
@columns-change="handleColumnChange"
/>
</div>
<div
class="flex items-center justify-between"
:style="[toolBarWidth + formWidth + 200 < tableWidth ? 'flex:auto' : '']"
>
<slot name="tableTitle" v-if="$slots.tableTitle"></slot>
<slot name="tableTitle" v-if="false&&$slots.tableTitle"></slot>
<TableTitle
:helpMessage="titleHelpMessage"
:title="title"
v-if="!$slots.tableTitle && title"
v-if="false&&!$slots.tableTitle && title"
/>
<div :class="['flex', advanceRight ? 'w-full' : '']">
<BasicForm
@ -36,19 +51,7 @@
</BasicForm>
</div>
</div>
<div
:class="`${prefixCls}__toolbar float-right`"
:style="[toolBarWidth + formWidth + 200 < tableWidth ? 'flex: none' : 'margin: -5px 0 8px']"
>
<Divider type="vertical" v-if="$slots.toolbar" class="!ml-2 !mr-4" />
<slot name="toolbar"></slot>
<Divider type="vertical" v-if="$slots.toolbar && showTableSetting" class="!mx-3" />
<TableSetting
:setting="tableSetting"
v-if="showTableSetting"
@columns-change="handleColumnChange"
/>
</div>
<div v-if="$slots.headerContent">
<slot name="headerContent"></slot>
</div>

View File

@ -42,7 +42,7 @@
const getSetting = computed((): TableSetting => {
return {
redo: true,
redo: false,
size: true,
setting: true,
fullScreen: false,