Skip to content

Commit 24b36bf

Browse files
wangdan-fit2cloudwangdan-fit2cloud
committed
fix: Fix form node drag-and-drop issues and some style errors
1 parent d53b4dc commit 24b36bf

File tree

30 files changed

+146
-134
lines changed

30 files changed

+146
-134
lines changed

‎ui/src/components/app-icon/icons/knowledge.ts‎

Lines changed: 0 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -127,25 +127,4 @@ export default {
127127
])
128128
},
129129
},
130-
'app-add-circle-outlined': {
131-
iconReader: () => {
132-
return h('i', [
133-
h(
134-
'svg',
135-
{
136-
style: { height: '100%', width: '100%' },
137-
viewBox: '0 0 1024 1024',
138-
version: '1.1',
139-
xmlns: 'http://www.w3.org/2000/svg',
140-
},
141-
[
142-
h('path', {
143-
d: 'M469.333333 469.333333V320a21.333333 21.333333 0 0 1 21.333334-21.333333h42.666666a21.333333 21.333333 0 0 1 21.333334 21.333333V469.333333h149.333333a21.333333 21.333333 0 0 1 21.333333 21.333334v42.666666a21.333333 21.333333 0 0 1-21.333333 21.333334H554.666667v149.333333a21.333333 21.333333 0 0 1-21.333334 21.333333h-42.666666a21.333333 21.333333 0 0 1-21.333334-21.333333V554.666667H320a21.333333 21.333333 0 0 1-21.333333-21.333334v-42.666666a21.333333 21.333333 0 0 1 21.333333-21.333334H469.333333z m42.666667 426.666667a384 384 0 1 0 0-768 384 384 0 0 0 0 768z m0 85.333333C252.8 981.333333 42.666667 771.2 42.666667 512S252.8 42.666667 512 42.666667s469.333333 210.133333 469.333333 469.333333-210.133333 469.333333-469.333333 469.333333z',
144-
fill: 'currentColor',
145-
}),
146-
],
147-
),
148-
])
149-
},
150-
},
151130
}

‎ui/src/components/app-icon/index.ts‎

Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -453,6 +453,48 @@ export const iconMap: any = {
453453
])
454454
},
455455
},
456+
'app-add-outlined': {
457+
iconReader: () => {
458+
return h('i', [
459+
h(
460+
'svg',
461+
{
462+
style: { height: '100%', width: '100%' },
463+
viewBox: '0 0 1024 1024',
464+
version: '1.1',
465+
xmlns: 'http://www.w3.org/2000/svg',
466+
},
467+
[
468+
h('path', {
469+
d: 'M469.333333 469.333333V112.682667c0-9.514667 0.981333-12.970667 2.858667-16.426667a19.370667 19.370667 0 0 1 8.064-8.106667c3.456-1.834667 6.912-2.816 16.426667-2.816h30.634666c9.514667 0 12.970667 0.981333 16.426667 2.858667a19.370667 19.370667 0 0 1 8.106667 8.064c1.834667 3.456 2.816 6.912 2.816 16.426667V469.333333h356.650666c9.514667 0 12.970667 0.981333 16.426667 2.858667a19.370667 19.370667 0 0 1 8.106667 8.064c1.834667 3.456 2.816 6.912 2.816 16.426667v30.634666c0 9.514667-0.981333 12.970667-2.858667 16.426667a19.370667 19.370667 0 0 1-8.064 8.106667c-3.456 1.834667-6.912 2.816-16.426667 2.816H554.666667v356.650666c0 9.514667-0.981333 12.970667-2.858667 16.426667a19.370667 19.370667 0 0 1-8.064 8.106667c-3.456 1.834667-6.912 2.816-16.426667 2.816h-30.634666c-9.514667 0-12.970667-0.981333-16.426667-2.858667a19.370667 19.370667 0 0 1-8.106667-8.064c-1.834667-3.456-2.816-6.912-2.816-16.426667V554.666667H112.682667c-9.514667 0-12.970667-0.981333-16.426667-2.858667a19.370667 19.370667 0 0 1-8.106667-8.064C86.357333 540.288 85.333333 536.832 85.333333 527.36v-30.634667c0-9.514667 0.981333-12.970667 2.858667-16.426666a19.370667 19.370667 0 0 1 8.064-8.106667c3.456-1.834667 6.912-2.816 16.426667-2.816H469.333333z',
470+
fill: 'currentColor',
471+
}),
472+
],
473+
),
474+
])
475+
},
476+
},
477+
'app-add-circle-outlined': {
478+
iconReader: () => {
479+
return h('i', [
480+
h(
481+
'svg',
482+
{
483+
style: { height: '100%', width: '100%' },
484+
viewBox: '0 0 1024 1024',
485+
version: '1.1',
486+
xmlns: 'http://www.w3.org/2000/svg',
487+
},
488+
[
489+
h('path', {
490+
d: 'M469.333333 469.333333V320a21.333333 21.333333 0 0 1 21.333334-21.333333h42.666666a21.333333 21.333333 0 0 1 21.333334 21.333333V469.333333h149.333333a21.333333 21.333333 0 0 1 21.333333 21.333334v42.666666a21.333333 21.333333 0 0 1-21.333333 21.333334H554.666667v149.333333a21.333333 21.333333 0 0 1-21.333334 21.333333h-42.666666a21.333333 21.333333 0 0 1-21.333334-21.333333V554.666667H320a21.333333 21.333333 0 0 1-21.333333-21.333334v-42.666666a21.333333 21.333333 0 0 1 21.333333-21.333334H469.333333z m42.666667 426.666667a384 384 0 1 0 0-768 384 384 0 0 0 0 768z m0 85.333333C252.8 981.333333 42.666667 771.2 42.666667 512S252.8 42.666667 512 42.666667s469.333333 210.133333 469.333333 469.333333-210.133333 469.333333-469.333333 469.333333z',
491+
fill: 'currentColor',
492+
}),
493+
],
494+
),
495+
])
496+
},
497+
},
456498
// 动态加载的图标
457499
...dynamicIcons,
458500
}

‎ui/src/components/app-table/index.vue‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
</div>
2525
<div v-else @click="quickCreateHandle" class="w-full">
2626
<el-button type="primary" link class="quich-button">
27-
<el-icon><Plus /></el-icon>
27+
<AppIcon iconName="app-add-outlined"></AppIcon>
2828
<span class="ml-4">{{ quickCreatePlaceholder }}</span>
2929
</el-button>
3030
</div>

‎ui/src/components/dynamics-form/constructor/items/MultiSelectConstructor.vue‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -57,9 +57,7 @@
5757
<div class="flex-between">
5858
{{ $t('dynamicsForm.Select.label') }}
5959
<el-button link type="primary" @click.stop="addOption()">
60-
<el-icon class="mr-4">
61-
<Plus />
62-
</el-icon>
60+
<AppIcon iconName="app-add-outlined" class="mr-4"></AppIcon>
6361
{{ $t('common.add') }}
6462
</el-button>
6563
</div>

‎ui/src/components/dynamics-form/constructor/items/RadioCardConstructor.vue‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -56,9 +56,7 @@
5656
<div class="flex-between">
5757
{{ $t('dynamicsForm.Select.label') }}
5858
<el-button link type="primary" @click.stop="addOption()">
59-
<el-icon class="mr-4">
60-
<Plus />
61-
</el-icon>
59+
<AppIcon iconName="app-add-outlined" class="mr-4"></AppIcon>
6260
{{ $t('common.add') }}
6361
</el-button>
6462
</div>

‎ui/src/components/dynamics-form/constructor/items/RadioRowConstructor.vue‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -56,9 +56,7 @@
5656
<div class="flex-between">
5757
{{ $t('dynamicsForm.Select.label') }}
5858
<el-button link type="primary" @click.stop="addOption()">
59-
<el-icon class="mr-4">
60-
<Plus />
61-
</el-icon>
59+
<AppIcon iconName="app-add-outlined" class="mr-4"></AppIcon>
6260
{{ $t('common.add') }}
6361
</el-button>
6462
</div>

‎ui/src/components/dynamics-form/constructor/items/SingleSelectConstructor.vue‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -55,9 +55,7 @@
5555
<div class="flex-between">
5656
{{ $t('dynamicsForm.Select.label') }}
5757
<el-button link type="primary" @click.stop="addOption()">
58-
<el-icon class="mr-4">
59-
<Plus />
60-
</el-icon>
58+
<AppIcon iconName="app-add-outlined" class="mr-4"></AppIcon>
6159
{{ $t('common.add') }}
6260
</el-button>
6361
</div>

‎ui/src/components/model-select/index.vue‎

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -53,12 +53,8 @@
5353
<template #footer v-if="showFooter">
5454
<slot name="footer">
5555
<div class="w-full text-left cursor" @click="openCreateModel(undefined, props.modelType)">
56-
<el-button type="primary" link
57-
v-if="permissionPrecise.create()"
58-
>
59-
<el-icon class="mr-4">
60-
<Plus />
61-
</el-icon>
56+
<el-button type="primary" link v-if="permissionPrecise.create()">
57+
<AppIcon iconName="app-add-outlined" class="mr-4"></AppIcon>
6258
{{ $t('views.application.operation.addModel') }}
6359
</el-button>
6460
</div>

‎ui/src/styles/element-plus.scss‎

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -304,3 +304,20 @@
304304
.el-pagination .el-select {
305305
width: 105px;
306306
}
307+
308+
// el-checkbox
309+
.el-checkbox {
310+
--el-checkbox-font-weight: 400;
311+
--el-checkbox-text-color: var(--el-text-color-primary);
312+
}
313+
.el-checkbox__input.is-checked + .el-checkbox__label {
314+
color: var(--el-text-color-primary);
315+
}
316+
317+
// el-radio
318+
.el-radio {
319+
--el-radio-font-weight: 400;
320+
}
321+
.el-radio__input.is-checked + .el-radio__label {
322+
color: var(--el-text-color-primary);
323+
}

‎ui/src/views/application/ApplicationSetting.vue‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -175,9 +175,7 @@
175175
{{ $t('common.paramSetting') }}
176176
</el-button>
177177
<el-button type="primary" link @click="openKnowledgeDialog">
178-
<el-icon class="mr-4">
179-
<Plus />
180-
</el-icon>
178+
<AppIcon iconName="app-add-outlined" class="mr-4"></AppIcon>
181179
{{ $t('common.add') }}
182180
</el-button>
183181
</div>

0 commit comments

Comments
 (0)