OMC/fe.ems.vue3
1
0
Fork 0
Code Issues Releases 3 Activity

fix: 拓扑编辑框透明度1

Browse Source
This commit is contained in:
TsMask
2024-01-25 16:29:05 +08:00
parent 12f65a5a82
commit a85579f730
2 changed files with 13 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/views/monitor/topologyBuild/components/GraphEditModal.vue
View File

@@ -238,7 +238,7 @@ function fnModalCancel() {
</a-form-item> </a-form-item>
<!-- 圆形尺寸 --> <!-- 圆形尺寸 -->
<a-row :gutter="16" v-if="comboState.form.type.startsWith('circle') "> <a-row :gutter="16" v-if="comboState.form.type.startsWith('circle')">
<a-col :lg="12" :md="12" :xs="24"> <a-col :lg="12" :md="12" :xs="24">
<a-form-item <a-form-item
:label="t('views.monitor.topologyBuild.comboFormSize')" :label="t('views.monitor.topologyBuild.comboFormSize')"
@@ -267,7 +267,7 @@ function fnModalCancel() {
</a-row> </a-row>
<!-- 矩形尺寸 --> <!-- 矩形尺寸 -->
<a-row :gutter="16" v-if="comboState.form.type.startsWith('rect') "> <a-row :gutter="16" v-if="comboState.form.type.startsWith('rect')">
<a-col :lg="12" :md="12" :xs="24"> <a-col :lg="12" :md="12" :xs="24">
<a-form-item <a-form-item
:label="t('views.monitor.topologyBuild.comboFormSize')" :label="t('views.monitor.topologyBuild.comboFormSize')"
@@ -326,10 +326,10 @@ function fnModalCancel() {
<a-input-number <a-input-number
v-model:value="comboState.form.style.fillOpacity" v-model:value="comboState.form.style.fillOpacity"
style="width: 100%" style="width: 100%"
:min="0.1" :min="0"
:max="1" :max="1"
:step="0.1" :step="0.1"
placeholder="<=100" placeholder="<=1"
></a-input-number> ></a-input-number>
</a-form-item> </a-form-item>
</a-col> </a-col>
@@ -849,7 +849,10 @@ function fnModalCancel() {
</a-row> </a-row>
<!-- 剪裁圆形 --> <!-- 剪裁圆形 -->
<a-row :gutter="16" v-if="nodeState.form.clipCfg.type.startsWith('circle') "> <a-row
:gutter="16"
v-if="nodeState.form.clipCfg.type.startsWith('circle')"
>
<a-col :lg="12" :md="12" :xs="24"> <a-col :lg="12" :md="12" :xs="24">
<a-form-item <a-form-item
:label="t('views.monitor.topologyBuild.nodeFormClipTypeCircle')" :label="t('views.monitor.topologyBuild.nodeFormClipTypeCircle')"
@@ -867,7 +870,10 @@ function fnModalCancel() {
</a-row> </a-row>
<!-- 剪裁矩形 --> <!-- 剪裁矩形 -->
<a-row :gutter="16" v-if="nodeState.form.clipCfg.type.startsWith('rect')"> <a-row
:gutter="16"
v-if="nodeState.form.clipCfg.type.startsWith('rect')"
>
<a-col :lg="12" :md="12" :xs="24"> <a-col :lg="12" :md="12" :xs="24">
<a-form-item <a-form-item
:label=" :label="
@@ -976,7 +982,7 @@ function fnModalCancel() {
<template <template
v-if=" v-if="
nodeState.form.icon && nodeState.form.icon &&
!nodeState.form.type.startsWith('rect') && !nodeState.form.type.startsWith('rect') &&
!nodeState.form.type.startsWith('image') !nodeState.form.type.startsWith('image')
" "
> >

1
src/views/monitor/topologyBuild/hooks/registerNode.ts
View File

@@ -182,7 +182,6 @@ export function nodeRectAnimateState() {
if (value) { if (value) {
if (Array.isArray(backArr) && backArr.length === 3) return; if (Array.isArray(backArr) && backArr.length === 3) return;
console.log(value, '==', keyShape.cfg.animating);
const size = Array.isArray(model?.size) ? model?.size : [40, 40]; const size = Array.isArray(model?.size) ? model?.size : [40, 40];
const { fill, lineWidth, stroke, radius } = model.style; const { fill, lineWidth, stroke, radius } = model.style;
const fillColor = fill || stroke; const fillColor = fill || stroke;