Merge branch 'main' of http://18.167.251.121:10003/aidlab/FiDA_Front

src/assets/css/style.css

@@ -70,3 +70,12 @@ body,
 .relative {
   position: relative;
 }
+.el-overlay {
+  --el-color-primary: #ff7a51;
+  --el-color-primary-light-3: #ffa785;
+  --el-color-primary-light-5: #ffc2aa;
+  --el-color-primary-light-7: #ffddcf;
+  --el-color-primary-light-8: #ffe8df;
+  --el-color-primary-light-9: #fff2ec;
+  --el-color-primary-dark-2: #cc6241;
+}

src/assets/css/style.less

@@ -85,4 +85,14 @@ body,
 
 .relative {
 	position: relative;
+}
+
+.el-overlay {
+	--el-color-primary: #ff7a51;              // 主橙红色
+	--el-color-primary-light-3: #ffa785;       // 较浅的橙红（混合20%白）
+	--el-color-primary-light-5: #ffc2aa;       // 更浅的橙红（混合33%白）
+	--el-color-primary-light-7: #ffddcf;       // 浅橙红（混合47%白）
+	--el-color-primary-light-8: #ffe8df;       // 很浅的橙红（混合53%白）
+	--el-color-primary-light-9: #fff2ec;       // 极浅的橙红（混合60%白）
+	--el-color-primary-dark-2: #cc6241;        // 深橙红（加深20%）
 }

src/assets/icons/flowDelete.svg

@@ -0,0 +1,5 @@
+<svg width="13" height="14" viewBox="0 0 13 14" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M5.77778 6.3C5.77778 5.9134 5.45443 5.6 5.05556 5.6C4.65668 5.6 4.33333 5.9134 4.33333 6.3V9.8C4.33333 10.1866 4.65668 10.5 5.05556 10.5C5.45443 10.5 5.77778 10.1866 5.77778 9.8V6.3Z" fill="#FFEAE2"/>
+<path d="M8.66667 6.3C8.66667 5.9134 8.34332 5.6 7.94444 5.6C7.54557 5.6 7.22222 5.9134 7.22222 6.3V9.8C7.22222 10.1866 7.54557 10.5 7.94444 10.5C8.34332 10.5 8.66667 10.1866 8.66667 9.8V6.3Z" fill="#FFEAE2"/>
+<path d="M6.97498 0C8.3006 0 9.45611 0.874433 9.77762 2.1209L9.95278 2.8H11.5453C11.5515 2.79992 11.5578 2.79992 11.564 2.8H12.2778C12.6767 2.8 13 3.1134 13 3.5C13 3.8866 12.6767 4.2 12.2778 4.2H12.2045L11.3977 11.4983C11.2405 12.9211 10.0017 14 8.5253 14H4.4747C2.99834 14 1.75954 12.9211 1.60225 11.4983L0.79547 4.2H0.722222C0.32335 4.2 0 3.8866 0 3.5C0 3.1134 0.32335 2.8 0.722222 2.8H1.43598C1.44223 2.79992 1.44846 2.79992 1.45467 2.8H3.04722L3.22238 2.1209C3.54389 0.874431 4.6994 0 6.02502 0H6.97498ZM9.40399 4.2C9.39353 4.20022 9.3831 4.20022 9.37269 4.2H3.6273C3.6169 4.20022 3.60647 4.20022 3.59601 4.2H2.24818L3.03848 11.3491C3.11712 12.0605 3.73652 12.6 4.4747 12.6H8.5253C9.26348 12.6 9.88288 12.0605 9.96152 11.3491L10.7518 4.2H9.40399ZM4.62369 2.46045L4.53611 2.8H8.46387L8.37629 2.46045C8.21554 1.83722 7.63778 1.4 6.97497 1.4H6.025C5.3622 1.4 4.78444 1.83722 4.62369 2.46045Z" fill="#FFEAE2"/>
+</svg>

src/components/Canvas/FlowCanvas/components/nodes/cards/index.vue

@@ -9,8 +9,8 @@
 				size-unit="px"
 			/>
 			<span>{{ currentComponent?.title }}</span>
-			<div class="delete-icon" @click="onDeleteClick" @mousedown.stop>
-				<SvgIcon name="c-delete" size="14" size-unit="px" />
+			<div class="delete-icon" @click="onDeleteClick">
+				<SvgIcon name="flowDelete" size="16" size-unit="px" color="#fff" />
 			</div>
 		</div>
 		<div class="body" @mousedown.stop>
@@ -35,10 +35,13 @@
 	import ColorPalette from './color-palette.vue'
 	import To3View from './to-3view.vue'
 	import To3DModel from './to-3d-model.vue'
+	import { ElMessageBox } from 'element-plus'
+	import { useI18n } from 'vue-i18n'
 
 	// import ToVideo from './to-video.vue'
 	// import AddPrint from './add-print.vue'
 	// import ToCAD from './to-cad.vue'
+	const { t: $t } = useI18n()
 	const components = [
 		{
 			tier: NODE_DATATIER.CARDS_SELECT,
@@ -129,8 +132,18 @@
 		}
 	}
 	//删除功能卡片
-	const onDeleteClick = () => {
-		stateManager.deleteNode(attrs.node.id)
+	const onDeleteClick = ()=>{
+		ElMessageBox.confirm(
+			$t('flowCanvas.deleteCardConfirm'),
+			'',
+			{
+				confirmButtonText: $t('flowCanvas.confirm'),
+				cancelButtonText: $t('flowCanvas.cancel'),
+			}
+		).then(() => {
+			stateManager.deleteNode(attrs.node.id)
+		}).catch(() => {
+		})
 	}
 	onMounted(() => {
 		for (const key in props.data) {

src/lang/en.ts

@@ -177,5 +177,10 @@ export default {
 		restore: 'Restore',
 		delete: 'Delete',
 		edit: 'Edit'
+	},
+	flowCanvas: {
+		deleteCardConfirm: 'Are you sure you want to delete this function card?',
+		confirm: 'Confirm',
+		cancel: 'Cancel',
 	}
 }

src/lang/zh-cn.ts

@@ -172,5 +172,10 @@ export default {
 		restore: '恢复',
 		delete: '删除',
 		edit: '编辑'
+	},
+	flowCanvas: {
+		deleteCardConfirm: '确定要删除该功能卡片吗？',
+		confirm: '确认',
+		cancel: '取消',
 	}
 }