Showing
9 changed files
with
35 additions
and
16 deletions
| @@ -140,10 +140,10 @@ | @@ -140,10 +140,10 @@ | ||
| 140 | 140 | ||
| 141 | <Panel position="top-right"> | 141 | <Panel position="top-right"> |
| 142 | <button | 142 | <button |
| 143 | - class="w-10 h-10 bg-gray-300 flex justify-center items-center rounded-full" | 143 | + class="w-10 h-10 bg-gray-300 flex justify-center items-center rounded-full dark:bg-dark-50" |
| 144 | @click="handleFullScreen" | 144 | @click="handleFullScreen" |
| 145 | > | 145 | > |
| 146 | - <Icon class="!text-2xl" :icon="getFullScreenIcon" /> | 146 | + <Icon class="!text-2xl dark:text-light-50" :icon="getFullScreenIcon" /> |
| 147 | </button> | 147 | </button> |
| 148 | </Panel> | 148 | </Panel> |
| 149 | </VueFlow> | 149 | </VueFlow> |
| @@ -51,6 +51,7 @@ | @@ -51,6 +51,7 @@ | ||
| 51 | v-bind="props" | 51 | v-bind="props" |
| 52 | :path="path[0]" | 52 | :path="path[0]" |
| 53 | :marker-end="getMarkerEnd" | 53 | :marker-end="getMarkerEnd" |
| 54 | + class="dark:stroke-light-500" | ||
| 54 | :label="getLabel" | 55 | :label="getLabel" |
| 55 | :label-x="path[1]" | 56 | :label-x="path[1]" |
| 56 | :label-y="path[2]" | 57 | :label-y="path[2]" |
| @@ -62,16 +62,16 @@ | @@ -62,16 +62,16 @@ | ||
| 62 | </section> | 62 | </section> |
| 63 | </template> | 63 | </template> |
| 64 | <main | 64 | <main |
| 65 | - class="basic-node-hover flex items-center w-44 h-12 rounded border px-4 py-2 border-gray-700" | 65 | + class="basic-node-hover flex items-center w-44 h-12 rounded border px-4 py-2 border-gray-700 dark:text-light-50" |
| 66 | :style="{ backgroundColor: getBackgroundColor }" | 66 | :style="{ backgroundColor: getBackgroundColor }" |
| 67 | > | 67 | > |
| 68 | <div> | 68 | <div> |
| 69 | - <Icon class="text-2xl" :icon="getIcon" /> | 69 | + <Icon class="text-2xl dark:text-light-50" :icon="getIcon" /> |
| 70 | </div> | 70 | </div> |
| 71 | <BasicToolbar v-bind="$props" /> | 71 | <BasicToolbar v-bind="$props" /> |
| 72 | <div class="flex text-xs flex-col ml-2 text-left truncate"> | 72 | <div class="flex text-xs flex-col ml-2 text-left truncate"> |
| 73 | - <span class="text-gray-700 w-full truncate">{{ getLabel }}</span> | ||
| 74 | - <span class="w-full truncate">{{ getName }}</span> | 73 | + <span class="text-gray-700 w-full truncate dark:text-light-50">{{ getLabel }}</span> |
| 74 | + <span class="w-full truncate dark:text-neutral-50">{{ getName }}</span> | ||
| 75 | </div> | 75 | </div> |
| 76 | <Handle v-if="getHasInEnabled" type="source" :position="Position.Left" /> | 76 | <Handle v-if="getHasInEnabled" type="source" :position="Position.Left" /> |
| 77 | <Handle v-if="getHasOutEnabled" type="source" :position="Position.Right" /> | 77 | <Handle v-if="getHasOutEnabled" type="source" :position="Position.Right" /> |
| @@ -24,6 +24,8 @@ | @@ -24,6 +24,8 @@ | ||
| 24 | 24 | ||
| 25 | <style scoped> | 25 | <style scoped> |
| 26 | .rule-designer-collapse-container::after { | 26 | .rule-designer-collapse-container::after { |
| 27 | + @apply dark:bg-dark-500; | ||
| 28 | + | ||
| 27 | position: absolute; | 29 | position: absolute; |
| 28 | content: ''; | 30 | content: ''; |
| 29 | width: 100%; | 31 | width: 100%; |
| @@ -55,7 +55,7 @@ | @@ -55,7 +55,7 @@ | ||
| 55 | > | 55 | > |
| 56 | <template #title> | 56 | <template #title> |
| 57 | <section class="text-dark-900"> | 57 | <section class="text-dark-900"> |
| 58 | - <h1 class="font-bold"> | 58 | + <h1 class="font-bold dark:text-dark-50"> |
| 59 | {{ config?.name }} | 59 | {{ config?.name }} |
| 60 | </h1> | 60 | </h1> |
| 61 | <p class="italic text-gray-600"> | 61 | <p class="italic text-gray-600"> |
| @@ -71,10 +71,10 @@ | @@ -71,10 +71,10 @@ | ||
| 71 | @dragstart="handleDragStart" | 71 | @dragstart="handleDragStart" |
| 72 | > | 72 | > |
| 73 | <div> | 73 | <div> |
| 74 | - <Icon class="text-2xl" :icon="getIcon" /> | 74 | + <Icon class="text-2xl dark:text-light-50" :icon="getIcon" /> |
| 75 | </div> | 75 | </div> |
| 76 | <div class="flex text-xs flex-col ml-2 text-left"> | 76 | <div class="flex text-xs flex-col ml-2 text-left"> |
| 77 | - <span class="text-gray-700 w-full truncate">{{ config?.name }}</span> | 77 | + <span class="text-gray-700 w-full truncate dark:text-light-50">{{ config?.name }}</span> |
| 78 | <!-- <span class="w-full truncate">name</span> --> | 78 | <!-- <span class="w-full truncate">name</span> --> |
| 79 | </div> | 79 | </div> |
| 80 | <div class="w-4 h-4 bg-dark-50 rounded-1 border absolute -left-2 border-light-50"></div> | 80 | <div class="w-4 h-4 bg-dark-50 rounded-1 border absolute -left-2 border-light-50"></div> |
| @@ -26,7 +26,7 @@ | @@ -26,7 +26,7 @@ | ||
| 26 | class="rule-designer-sidebar z-50 shadow shadow-lg shadow-dark-600 transition-all overflow-hidden relative" | 26 | class="rule-designer-sidebar z-50 shadow shadow-lg shadow-dark-600 transition-all overflow-hidden relative" |
| 27 | :style="getSidebarStyle" | 27 | :style="getSidebarStyle" |
| 28 | > | 28 | > |
| 29 | - <section class="bg-sky-900 text-light-50 px-2 h-12 flex items-center"> | 29 | + <section class="bg-sky-900 dark:bg-dark-500 text-light-50 px-2 h-12 flex items-center"> |
| 30 | <Tooltip title="查找节点"> | 30 | <Tooltip title="查找节点"> |
| 31 | <div | 31 | <div |
| 32 | class="w-8 h-8 cursor-pointer flex justify-center items-center rounded-1 hover:bg-opacity-90" | 32 | class="w-8 h-8 cursor-pointer flex justify-center items-center rounded-1 hover:bg-opacity-90" |
| @@ -62,12 +62,20 @@ | @@ -62,12 +62,20 @@ | ||
| 62 | </Tooltip> | 62 | </Tooltip> |
| 63 | </template> | 63 | </template> |
| 64 | 64 | ||
| 65 | -<style scoped> | 65 | +<style scoped lang="less"> |
| 66 | .rule-designer-sidebar::after { | 66 | .rule-designer-sidebar::after { |
| 67 | + @apply dark: bg-dark-500; | ||
| 68 | + | ||
| 67 | content: ''; | 69 | content: ''; |
| 68 | position: absolute; | 70 | position: absolute; |
| 69 | width: 100%; | 71 | width: 100%; |
| 70 | height: 100%; | 72 | height: 100%; |
| 71 | background: #fff; | 73 | background: #fff; |
| 72 | } | 74 | } |
| 75 | + | ||
| 76 | + .rule-designer-sidebar { | ||
| 77 | + :deep(.ant-collapse-header) { | ||
| 78 | + @apply !dark:bg-dark-500; | ||
| 79 | + } | ||
| 80 | + } | ||
| 73 | </style> | 81 | </style> |
| @@ -4,12 +4,12 @@ | @@ -4,12 +4,12 @@ | ||
| 4 | import { TabsPanelEnum, TabsPanelNameEnum } from './config'; | 4 | import { TabsPanelEnum, TabsPanelNameEnum } from './config'; |
| 5 | import { useAwaitPopupWindowBindData } from '../../../hook/useAwaitPopupWindowBindData'; | 5 | import { useAwaitPopupWindowBindData } from '../../../hook/useAwaitPopupWindowBindData'; |
| 6 | import HelpMessage from './HelpMessage.vue'; | 6 | import HelpMessage from './HelpMessage.vue'; |
| 7 | - import EventTotal from './EventTotal.vue'; | ||
| 8 | import { DataActionModeEnum } from '/@/enums/toolEnum'; | 7 | import { DataActionModeEnum } from '/@/enums/toolEnum'; |
| 9 | import { ElementsTypeEnum } from '../../../enum'; | 8 | import { ElementsTypeEnum } from '../../../enum'; |
| 10 | import { useForm, BasicForm } from '/@/components/Form'; | 9 | import { useForm, BasicForm } from '/@/components/Form'; |
| 11 | import { BottomFormSchemas, TopFormSchemas } from '../CreateNodeModal/config'; | 10 | import { BottomFormSchemas, TopFormSchemas } from '../CreateNodeModal/config'; |
| 12 | - import { toRaw, unref } from 'vue-demi'; | 11 | + import { toRaw, unref } from 'vue'; |
| 12 | + import { BasicEvents } from '../BasicEvents'; | ||
| 13 | 13 | ||
| 14 | const [topFormRegister, topFormActionType] = useForm({ | 14 | const [topFormRegister, topFormActionType] = useForm({ |
| 15 | schemas: TopFormSchemas, | 15 | schemas: TopFormSchemas, |
| @@ -111,7 +111,7 @@ | @@ -111,7 +111,7 @@ | ||
| 111 | </Spin> | 111 | </Spin> |
| 112 | </Tabs.TabPane> | 112 | </Tabs.TabPane> |
| 113 | <Tabs.TabPane :tab="TabsPanelNameEnum[TabsPanelEnum.EVENT]" :key="TabsPanelEnum.EVENT"> | 113 | <Tabs.TabPane :tab="TabsPanelNameEnum[TabsPanelEnum.EVENT]" :key="TabsPanelEnum.EVENT"> |
| 114 | - <EventTotal /> | 114 | + <BasicEvents /> |
| 115 | </Tabs.TabPane> | 115 | </Tabs.TabPane> |
| 116 | <Tabs.TabPane :tab="TabsPanelNameEnum[TabsPanelEnum.HELP]" :key="TabsPanelEnum.HELP"> | 116 | <Tabs.TabPane :tab="TabsPanelNameEnum[TabsPanelEnum.HELP]" :key="TabsPanelEnum.HELP"> |
| 117 | <HelpMessage :nodeData="nodeData" /> | 117 | <HelpMessage :nodeData="nodeData" /> |
| @@ -12,9 +12,15 @@ | @@ -12,9 +12,15 @@ | ||
| 12 | } | 12 | } |
| 13 | 13 | ||
| 14 | .vue-flow__background.vue-flow__container { | 14 | .vue-flow__background.vue-flow__container { |
| 15 | + @apply dark:bg-dark-500; | ||
| 16 | + | ||
| 15 | background-color: #e9e9e9; | 17 | background-color: #e9e9e9; |
| 16 | } | 18 | } |
| 17 | 19 | ||
| 20 | +.vue-flow__background.vue-flow__container path { | ||
| 21 | + @apply !dark:stroke-gray-600; | ||
| 22 | +} | ||
| 23 | + | ||
| 18 | .vue-flow__edge-path { | 24 | .vue-flow__edge-path { |
| 19 | stroke-width: 4; | 25 | stroke-width: 4; |
| 20 | stroke: gray; | 26 | stroke: gray; |