Merge remote-tracking branch 'origin/master'

master
wangjunjie 2025-12-20 20:53:13 +08:00
commit 135b96fa6e
1 changed files with 12 additions and 16 deletions

View File

@ -6,10 +6,10 @@ import SnConfigForm from '@/pages/sys/sn-config/SnConfigForm.vue'
import Strings from '@/common/utils/strings.ts'
import { elIcons } from '@/common/element/element.ts'
const snConfigForm = ref<InstanceType<typeof SnConfigForm> | null>(null)
const snConfigFormIns = useTemplateRef<InstanceType<typeof SnConfigForm>>('snConfigForm')
function addHandler() {
snConfigForm.value?.open()
snConfigFormIns.value?.open()
}
function reset() {
@ -45,7 +45,7 @@ function searchHandler() {
}
function modify(record: SnConfigTypes.SnConfigDetail) {
snConfigForm.value?.open(record)
snConfigFormIns.value?.open(record)
}
@ -78,7 +78,6 @@ onMounted(() => {
</ElFormItem>
</ElForm>
<div class="tool-bar">
<ElButton :icon="elIcons.Plus" type="primary" @click="addHandler"></ElButton>
</div>
<ElTable
@ -88,20 +87,18 @@ onMounted(() => {
empty-text="暂无数据"
header-row-class-name="table-header"
row-key="id">
<ElTableColumn label="规则名称" prop="snname" width="140"/>
<ElTableColumn label="规则代码" prop="sncode" width="140"/>
<ElTableColumn label="示例" prop="example" width="140"/>
<ElTableColumn label="规则名称" prop="snname" width="180"/>
<ElTableColumn label="规则代码" prop="sncode" width="170"/>
<ElTableColumn label="示例" prop="example" width="200"/>
<ElTableColumn label="配置信息" prop="configDesc">
<template #default="scope">
<span>
{{ Strings.isBlank(scope.row.configDesc) ? '' : scope.row.configDesc.split('\n') }}
</span>
<span v-if="Strings.isBlank(scope.row.configDesc)"/>
<template v-else>
<div v-for="(item,i) in scope.row.configDesc.split('\n')" :key="scope.row.id+i">{{ item }}</div>
</template>
</template>
</ElTableColumn>
<ElTableColumn label="备注" prop="memo" width="140"/>
<ElTableColumn label="备注" prop="memo" width="140"/>
<ElTableColumn label="" prop=""/>
<ElTableColumn label="备注" prop="memo" width="200"/>
<ElTableColumn label="操作" width="180">
<template #default="scope">
<ElPopconfirm
@ -117,10 +114,9 @@ onMounted(() => {
<ElButton text type="danger">删除</ElButton>
</template>
</ElPopconfirm>
<ElButton text type="primary" @click="modify(scope)"></ElButton>
<ElButton text type="primary" @click="modify(scope.row)"></ElButton>
</template>
</ElTableColumn>
</ElTable>
<ElPagination
v-model:current-page="searchForm.current"