Merge remote-tracking branch 'yudao/dev' into dev

apps/web-antd/src/views/bpm/model/definition/data.ts

@@ -20,7 +20,13 @@ export function useGridColumns(): VxeTableGridOptions<BpmProcessDefinitionApi.Pr
       field: 'icon',
       title: '流程图标',
       minWidth: 100,
-      slots: { default: 'icon' },
+      cellRender: {
+        name: 'CellImage',
+        props: {
+          width: 24,
+          height: 24,
+        },
+      },
     },
     {
       field: 'startUsers',
@@ -47,7 +53,9 @@ export function useGridColumns(): VxeTableGridOptions<BpmProcessDefinitionApi.Pr
       field: 'version',
       title: '流程版本',
       minWidth: 80,
-      slots: { default: 'version' },
+      cellRender: {
+        name: 'CellTag',
+      },
     },
     {
       field: 'deploymentTime',

apps/web-antd/src/views/bpm/model/definition/index.vue

@@ -6,7 +6,7 @@ import { useRoute, useRouter } from 'vue-router';
 
 import { DocAlert, Page, useVbenModal } from '@vben/common-ui';
 
-import { Button, Image, Tag, Tooltip } from 'ant-design-vue';
+import { Button, Tooltip } from 'ant-design-vue';
 
 import { TableAction, useVbenVxeGrid } from '#/adapter/vxe-table';
 import { getProcessDefinitionPage } from '#/api/bpm/definition';
@@ -93,16 +93,6 @@ onMounted(() => {
       <DocAlert title="工作流手册" url="https://doc.iocoder.cn/bpm/" />
     </template>
     <Grid table-title="流程定义列表">
-      <template #icon="{ row }">
-        <Image
-          v-if="row.icon"
-          :src="row.icon"
-          :width="24"
-          :height="24"
-          class="rounded"
-        />
-        <span v-else> 无图标 </span>
-      </template>
       <template #startUsers="{ row }">
         <template v-if="!row.startUsers?.length">全部可见</template>
         <template v-else-if="row.startUsers.length === 1">
@@ -135,9 +125,6 @@ onMounted(() => {
         </Button>
         <span v-else>暂无表单</span>
       </template>
-      <template #version="{ row }">
-        <Tag>v{{ row.version }}</Tag>
-      </template>
       <template #actions="{ row }">
         <TableAction
           :actions="[

apps/web-antd/src/views/bpm/model/form/modules/form-design.vue

@@ -102,7 +102,7 @@ defineExpose({ validate });
             DICT_TYPE.BPM_MODEL_FORM_TYPE,
             'number',
           )"
-          :key="dict.value as string"
+          :key="dict.value"
           :value="dict.value"
         >
           {{ dict.label }}