fix(ansible): 修复 Jinja2 模板转义问题并优化前端表格样式 (a9040e8c) · Commits · csst-cicd / csst-pipeline-portal

docker-celery-3.0.5/ansible/deploy.yml

+4 −4

Original line number	Diff line number	Diff line
		@@ -169,8 +169,8 @@
		svc="$1"
		cid=$({{ docker_compose_cmd }} $COMPOSE_FILES --env-file deploy_configs/airflow.env --profile master ps -q "$svc" 2>/dev/null \|\| true)
		if [ -n "$cid" ]; then
		img_ref=$(docker inspect "$cid" --format '{{.Config.Image}}')
		img_id=$(docker inspect "$cid" --format '{{.Image}}')
		img_ref=$(docker inspect "$cid" --format '{% raw %}{{.Config.Image}}{% endraw %}')
		img_id=$(docker inspect "$cid" --format '{% raw %}{{.Image}}{% endraw %}')
		docker image inspect "$img_ref" >/dev/null 2>&1 \|\| docker image tag "$img_id" "$img_ref"
		fi
		}
		@@ -272,8 +272,8 @@
		svc="$1"
		cid=$({{ docker_compose_cmd }} $COMPOSE_FILES --env-file deploy_configs/airflow.env --profile worker ps -q "$svc" 2>/dev/null \|\| true)
		if [ -n "$cid" ]; then
		img_ref=$(docker inspect "$cid" --format '{{.Config.Image}}')
		img_id=$(docker inspect "$cid" --format '{{.Image}}')
		img_ref=$(docker inspect "$cid" --format '{% raw %}{{.Config.Image}}{% endraw %}')
		img_id=$(docker inspect "$cid" --format '{% raw %}{{.Image}}{% endraw %}')
		docker image inspect "$img_ref" >/dev/null 2>&1 \|\| docker image tag "$img_id" "$img_ref"
		fi
		}

docker-celery-3.0.5/ansible/update.yml

+4 −4

Original line number	Diff line number	Diff line
		@@ -150,8 +150,8 @@
		svc="$1"
		cid=$({{ docker_compose_cmd }} $COMPOSE_FILES --env-file deploy_configs/airflow.env --profile master ps -q "$svc" 2>/dev/null \|\| true)
		if [ -n "$cid" ]; then
		img_ref=$(docker inspect "$cid" --format '{{.Config.Image}}')
		img_id=$(docker inspect "$cid" --format '{{.Image}}')
		img_ref=$(docker inspect "$cid" --format '{% raw %}{{.Config.Image}}{% endraw %}')
		img_id=$(docker inspect "$cid" --format '{% raw %}{{.Image}}{% endraw %}')
		docker image inspect "$img_ref" >/dev/null 2>&1 \|\| docker image tag "$img_id" "$img_ref"
		fi
		}
		@@ -269,8 +269,8 @@
		svc="$1"
		cid=$({{ docker_compose_cmd }} $COMPOSE_FILES --env-file deploy_configs/airflow.env --profile worker ps -q "$svc" 2>/dev/null \|\| true)
		if [ -n "$cid" ]; then
		img_ref=$(docker inspect "$cid" --format '{{.Config.Image}}')
		img_id=$(docker inspect "$cid" --format '{{.Image}}')
		img_ref=$(docker inspect "$cid" --format '{% raw %}{{.Config.Image}}{% endraw %}')
		img_id=$(docker inspect "$cid" --format '{% raw %}{{.Image}}{% endraw %}')
		docker image inspect "$img_ref" >/dev/null 2>&1 \|\| docker image tag "$img_id" "$img_ref"
		fi
		}

docker-celery-3.0.5/frontend_vue/src/components/CCDSView.vue

+39 −9

Original line number	Diff line number	Diff line
		@@ -22,17 +22,17 @@
		:height="leftTableHeight"
		size="small"
		stripe
		class="teamcity-table"
		class="teamcity-table ccds-left-table"
		:header-cell-style="{ background: '#FAFAFA', color: '#1F2937', fontWeight: '600' }"
		:fit="false"
		table-layout="auto"
		:fit="true"
		table-layout="fixed"
		highlight-current-row
		@row-click="onPmapClick"
		@row-mouse-enter="onLeftRowEnter"
		@row-mouse-leave="onLeftRowLeave"
		:row-class-name="leftRowClassName"
		>
		<el-table-column prop="date" label="date" :min-width="140" sortable :sort-method="(a: any, b: any) => compareRows(a, b, 'date')">
		<el-table-column prop="date" label="date" :min-width="120" sortable :sort-method="(a: any, b: any) => compareRows(a, b, 'date')">
		<template #header>
		<div class="flex flex-col gap-2">
		<div class="h-[28px]" @mousedown.stop @click.stop>
		@@ -46,7 +46,7 @@
		</template>
		</el-table-column>

		<el-table-column prop="pmap" label="pmap" :min-width="220" sortable :sort-method="(a: any, b: any) => compareRows(a, b, 'pmap')">
		<el-table-column prop="pmap" label="pmap" :min-width="180" sortable :sort-method="(a: any, b: any) => compareRows(a, b, 'pmap')">
		<template #header>
		<div class="flex flex-col gap-2">
		<div class="h-[28px]" @mousedown.stop @click.stop>
		@@ -56,14 +56,13 @@
		</div>
		</template>
		<template #default="scope">
		<div class="flex items-center gap-2 min-w-0">
		<div class="flex items-center gap-1 min-w-0">
		<span class="font-mono text-xs text-[#374151] block whitespace-nowrap truncate" :title="scope.row.pmap">{{ scope.row.pmap }}</span>
		<el-tag v-if="scope.row.is_default" size="small" type="success" effect="plain" class="ml-1">default</el-tag>
		</div>
		</template>
		</el-table-column>

		<el-table-column prop="comment" label="comment" :min-width="240" sortable :sort-method="(a: any, b: any) => compareRows(a, b, 'comment')">
		<el-table-column prop="comment" label="comment" :min-width="160" sortable :sort-method="(a: any, b: any) => compareRows(a, b, 'comment')">
		<template #header>
		<div class="flex flex-col gap-2">
		<div class="h-[28px]" @mousedown.stop @click.stop>
		@@ -73,7 +72,16 @@
		</div>
		</template>
		<template #default="scope">
		<span class="text-xs text-[#374151] block whitespace-nowrap truncate" :title="scope.row.comment">{{ scope.row.comment }}</span>
		<div class="min-w-0">
		<el-tag
		size="small"
		effect="plain"
		:type="commentTagType(scope.row.comment)"
		class="font-mono ccds-comment-tag"
		>
		{{ scope.row.comment \|\| '-' }}
		</el-tag>
		</div>
		</template>
		</el-table-column>
		</el-table>
		@@ -208,6 +216,15 @@ type PmapInfo = {
		is_default?: boolean
		}

		const commentTagType = (comment: string) => {
		const v = String(comment \|\| '').trim().toLowerCase()
		if (v === 'edit') return 'warning'
		if (v === 'archived') return 'info'
		if (v === 'operational') return 'success'
		if (v === 'default') return 'success'
		return 'info'
		}

		const pmaps = ref<PmapInfo[]>([])
		const selectedPmap = ref('')
		const hoveredPmap = ref('')
		@@ -465,3 +482,16 @@ onUnmounted(() => {
		onResizeUp()
		})
		</script>

		<style>
		.ccds-left-table .el-table__cell {
		padding: 6px 10px;
		}
		.ccds-comment-tag {
		max-width: 100%;
		overflow: hidden;
		text-overflow: ellipsis;
		display: inline-block;
		vertical-align: middle;
		}
		</style>