oneos-v5/frontend
1
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
jason
2025-06-21 22:08:32 +08:00
parent ae95eb3367 2690ea82a6
commit 6138a610ee
105 changed files with 8363 additions and 781 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
apps/web-antd/src/views/bpm/model/form/index.vue
View File

@@ -400,7 +400,7 @@ onBeforeUnmount(() => {
<div class="mx-auto">
<!-- 头部导航栏 -->
<div
class="absolute inset-x-0 top-0 z-10 flex h-12 items-center border-b bg-white px-5"
class="bg-card absolute inset-x-0 top-0 z-10 flex h-12 items-center border-b px-5"
>
<!-- 左侧标题 -->
<div class="flex w-48 items-center overflow-hidden">

15
apps/web-antd/src/views/bpm/model/form/modules/basic-info.vue
View File

@@ -25,7 +25,7 @@ import {
import { DeptSelectModal, UserSelectModal } from '#/components/select-modal';
import { ImageUpload } from '#/components/upload';
import { DICT_TYPE, getBoolDictOptions, getIntDictOptions } from '#/utils';
import { DICT_TYPE, getDictOptions } from '#/utils';
const props = defineProps({
categoryList: {
@@ -295,7 +295,7 @@ defineExpose({ validate });
<Radio.Group v-model:value="modelData.type">
<!-- TODO BPMN 流程类型需要整合，暂时禁用 -->
<Radio
v-for="dict in getIntDictOptions(DICT_TYPE.BPM_MODEL_TYPE)"
v-for="dict in getDictOptions(DICT_TYPE.BPM_MODEL_TYPE, 'number')"
:key="dict.value"
:value="dict.value"
:disabled="dict.value === 10"
@@ -307,10 +307,11 @@ defineExpose({ validate });
<Form.Item label="是否可见" name="visible" class="mb-5">
<Radio.Group v-model:value="modelData.visible">
<Radio
v-for="(dict, index) in getBoolDictOptions(
v-for="dict in getDictOptions(
DICT_TYPE.INFRA_BOOLEAN_STRING,
'boolean',
)"
:key="index"
:key="dict.label"
:value="dict.value"
>
{{ dict.label }}
@@ -334,7 +335,7 @@ defineExpose({ validate });
<div
v-for="user in selectedStartUsers"
:key="user.id"
class="relative flex h-9 items-center rounded-full bg-gray-100 pr-2 hover:bg-gray-200"
class="relative flex h-9 items-center rounded-full pr-2 hover:bg-gray-200"
>
<Avatar
class="m-1"
@@ -370,7 +371,7 @@ defineExpose({ validate });
<div
v-for="dept in selectedStartDepts"
:key="dept.id"
class="relative flex h-9 items-center rounded-full bg-gray-100 pr-2 shadow-sm hover:bg-gray-200"
class="relative flex h-9 items-center rounded-full pr-2 shadow-sm hover:bg-gray-200"
>
<IconifyIcon icon="lucide:building" class="size-6 px-1" />
{{ dept.name }}
@@ -397,7 +398,7 @@ defineExpose({ validate });
<div
v-for="user in selectedManagerUsers"
:key="user.id"
class="relative flex h-9 items-center rounded-full bg-gray-100 pr-2 hover:bg-gray-200"
class="hover:bg-primary-500 relative flex h-9 items-center rounded-full pr-2"
>
<Avatar
class="m-1"