@liujitcn/kratos-admin-system 0.0.49 → 0.0.51

package/dist/package/src/views/base/post/index.vue

@@ -24,7 +24,7 @@
 </template>
 
 <script setup lang="ts">
-import { computed, reactive, ref } from "vue";
+import { computed, onMounted, reactive, ref } from "vue";
 import { ElMessage, ElMessageBox } from "element-plus";
 import { CirclePlus, Delete, EditPen } from "@element-plus/icons-vue";
 import type { ColumnProps, HeaderActionProps, ProTableInstance } from "@liujitcn/kratos-admin-core/components/ProTable/interface";
@@ -34,12 +34,9 @@ import type { ProFormField, ProFormOption } from "@liujitcn/kratos-admin-core/co
 import { useAuthButtons } from "@liujitcn/kratos-admin-core/auth";
 import { defBasePostService } from "@liujitcn/kratos-admin-system/api/system/admin/v1/base_post";
 import type { BasePost, BasePostForm, PageBasePostRequest } from "@liujitcn/kratos-admin-system/rpc/system/admin/v1/base_post";
-import { defBaseTenantService } from "@liujitcn/kratos-admin-system/api/system/admin/v1/base_tenant";
-import type { SelectOptionResponse_Option } from "@liujitcn/kratos-admin-system/rpc/common/v1/common";
 import { Status } from "@liujitcn/kratos-admin-system/rpc/common/v1/enum";
 import { buildPageRequest, normalizeSelectedIds } from "@liujitcn/kratos-admin-core/table";
-import { DEFAULT_TENANT_CODE, requestTenantOptions } from "@liujitcn/kratos-admin-core/tenant";
-import { useUserStore } from "@liujitcn/kratos-admin-core/stores/runtime";
+import { useTenantScope } from "@liujitcn/kratos-admin-core/tenant";
 import { t } from "@liujitcn/kratos-admin-core";
 
 defineOptions({
@@ -54,7 +51,6 @@ type BasePostFormState = Omit<BasePostForm, "tenant_id"> & {
 };
 
 const { BUTTONS } = useAuthButtons();
-const userStore = useUserStore();
 const proTable = ref<ProTableInstance>();
 const formDialogRef = ref<InstanceType<typeof FormDialog>>();
 
@@ -62,7 +58,6 @@ const dialog = reactive({
   titleKey: "common.action.create_resource",
   visible: false
 });
-const tenantOptions = ref<SelectOptionResponse_Option[]>([]);
 const statusOptions = computed<ProFormOption[]>(() => [
   { label: t("common.status.enabled"), value: Status.STATUS_ENABLE },
   { label: t("common.status.disabled"), value: Status.STATUS_DISABLE }
@@ -132,23 +127,14 @@ const rules = computed(() => ({
   ]
 }));
 
-/** 当前登录账号是否默认租户。 */
-const isDefaultTenant = computed(() => userStore.userInfo.tenant_code === DEFAULT_TENANT_CODE);
+const { isDefaultTenant, tenantColumns, tenantFormField, toRequestTenantId, loadTenantOptions } = useTenantScope();
+onMounted(() => {
+  if (isDefaultTenant.value) void loadTenantOptions();
+});
 
 /** 岗位表单字段配置。 */
 const formFields = computed<ProFormField[]>(() => [
-  {
-    prop: "tenant_id",
-    label: t("common.field.tenant"),
-    component: "select",
-    props: {
-      placeholder: t("common.placeholder.select"),
-      filterable: true,
-      disabled: Boolean(formData.id)
-    },
-    visible: () => isDefaultTenant.value,
-    options: tenantOptions.value
-  },
+  tenantFormField({ label: t("common.field.tenant"), disabledOnEdit: true }),
   {
     prop: "name",
     label: t("system.base.post.field.name"),
@@ -179,19 +165,7 @@ const formFields = computed<ProFormField[]>(() => [
 /** 岗位表格列配置。 */
 const columns = computed<ColumnProps[]>(() => [
   { type: "selection", width: 55 },
-  ...(isDefaultTenant.value
-    ? ([
-        {
-          prop: "tenant_id",
-          label: t("common.field.tenant"),
-          minWidth: 140,
-          align: "left",
-          showOverflowTooltip: true,
-          search: { el: "select", key: "tenant_id", props: { filterable: true }, order: 1 },
-          enum: requestTenantOptions
-        }
-      ] satisfies ColumnProps[])
-    : []),
+  ...tenantColumns({ label: t("common.field.tenant"), order: 1 }),
   { prop: "name", label: t("system.base.post.field.name"), minWidth: 140, search: { el: "input" } },
   { prop: "code", label: t("system.base.post.field.code"), minWidth: 140, search: { el: "input" } },
   { prop: "sort", label: t("common.field.sort"), minWidth: 90, align: "right" },
@@ -262,7 +236,7 @@ const headerActions = computed<HeaderActionProps[]>(() => [
 async function requestBasePostTable(params: PageBasePostRequest) {
   const data = await defBasePostService.PageBasePost({
     ...buildPageRequest(params),
-    tenant_id: isDefaultTenant.value ? params.tenant_id : undefined
+    tenant_id: toRequestTenantId(params.tenant_id)
   });
   return { data: { list: data.base_posts ?? [], total: data.total } };
 }
@@ -272,13 +246,6 @@ function refreshTable() {
   proTable.value?.getTableList();
 }
 
-/** 加载租户选项。 */
-async function loadTenantOptions() {
-  if (!isDefaultTenant.value || tenantOptions.value.length) return;
-  const response = await defBaseTenantService.OptionBaseTenant({ keyword: "" });
-  tenantOptions.value = response.list ?? [];
-}
-
 /** 打开岗位编辑弹窗。 */
 async function handleOpenDialog(id?: number) {
   resetForm();

package/dist/package/src/views/base/redact-output-policy/index.vue

@@ -56,6 +56,7 @@
                   <template v-if="row.rule_type === 'MASK'">
                     <ParameterNumber v-model="row.params.keep_first" :label="t('system.base.redact_rule.parameter.keep_first')" />
                     <ParameterNumber v-model="row.params.keep_last" :label="t('system.base.redact_rule.parameter.keep_last')" />
+                    <ParameterNumber v-model="row.params.min_mask" :label="t('system.base.redact_rule.parameter.min_mask')" />
                     <ParameterText v-model="row.params.mask_char" :label="t('system.base.redact_rule.parameter.mask_char')" />
                   </template>
                   <template v-else-if="row.rule_type === 'EMAIL'">
@@ -119,6 +120,7 @@ import { Status } from "@liujitcn/kratos-admin-system/rpc/common/v1/enum";
 interface RuleParams {
   keep_first?: number;
   keep_last?: number;
+  min_mask?: number;
   mask_char?: string;
   keep_local_first?: number;
   mask_domain?: boolean;
@@ -260,7 +262,7 @@ function handleServiceChange(serviceName?: string) { form.service_name = service
 /** API 变更后重新加载返回字段。 */
 async function handleApiChange(apiId?: number) { const api = interfaceOptions.value.find(item => item.id === apiId); form.service_name = api?.service_name ?? form.service_name; form.operation = api?.operation ?? ""; form.field_rows = []; if (apiId !== undefined) await loadResponseFields(apiId); }
 /** 加载 API 返回字段并初始化表格行。 */
-async function loadResponseFields(apiId: number) { const api = apiCatalog.value.find(item => item.id === apiId); if (!api) return; const doc = await defBaseApiService.GetBaseApiDoc({ id: apiId }); const rows: OutputFieldRow[] = []; for (const response of doc.responses ?? []) { if (response.body) collectFields(response.body, "", "", rows, true); } form.field_rows = [...new Map(rows.map(item => [String(item.value), item])).values()]; }
+async function loadResponseFields(apiId: number) { const api = apiCatalog.value.find(item => item.id === apiId); if (!api) return; const doc = await defBaseRedactOutputPolicyService.GetBaseRedactOutputFieldDoc({ api_id: apiId }); const rows: OutputFieldRow[] = []; for (const response of doc.responses ?? []) { if (response.body) collectFields(response.body, "", "", rows, true); } form.field_rows = [...new Map(rows.map(item => [String(item.value), item])).values()]; }
 /** 递归收集可配置的返回叶子字段。 */
 function collectFields(schema: BaseApiDocSchema, parentRef: string, parentPath: string, result: OutputFieldRow[], root: boolean) { const schemaRef = normalizeRef(schema.ref); const messageRef = schemaRef || parentRef; const startsNewMessage = Boolean(schemaRef && parentRef && schemaRef !== parentRef); const rootContainer = root || (!parentRef && (schema.name === "body" || schema.name === "body[]")); const path = rootContainer || startsNewMessage ? "" : schema.name ? (parentPath ? `${parentPath}.${schema.name}` : schema.name) : parentPath; if (!schema.children?.length) { const fieldName = path.split(".").pop()?.toLowerCase() ?? ""; if (path && !OUTPUT_SYSTEM_FIELD_NAMES.has(fieldName)) result.push(createFieldRow({ label: `${messageRef}.${path}${schema.description ? ` (${schema.description})` : ""}`, value: `${messageRef}\u0000${path}`, message_ref: messageRef, field_path: path, description: schema.description })); return; } for (const child of schema.children) collectFields(child, messageRef, path, result, false); }
 /** 规范化 OpenAPI 引用名称。 */
@@ -274,7 +276,7 @@ async function submit() { const valid = await dialogRef.value?.validate(); if (!
 /** 将表格行转换为出库策略请求。 */
 function buildPayload(row: OutputFieldRow): BaseRedactOutputPolicyForm { syncRowParams(row); return { id: row.id, operation: form.operation, service_name: form.service_name, message_ref: row.message_ref, field_path: row.field_path, mode: row.mode, rule_id: row.mode === BaseRedactOutputPolicyMode.BASE_REDACT_OUTPUT_POLICY_MODE_RULE ? row.rule_id ?? 0 : 0, rule_params: row.mode === BaseRedactOutputPolicyMode.BASE_REDACT_OUTPUT_POLICY_MODE_RULE ? row.rule_params : "{}", status: form.status, remark: form.remark }; }
 /** 将已保存的策略回填到对应字段行。 */
-function applyPolicy(row: OutputFieldRow, data: BaseRedactOutputPolicyForm) { row.id = data.id; row.mode = data.mode || BaseRedactOutputPolicyMode.BASE_REDACT_OUTPUT_POLICY_MODE_FULL; row.rule_id = data.rule_id || undefined; row.rule_params = data.rule_params; if (row.rule_id) { const rule = ruleCatalog.value.find(item => item.id === row.rule_id); row.rule_type = rule?.rule_type ?? ""; row.params = parseParams(row.rule_type, row.rule_params); } }
+function applyPolicy(row: OutputFieldRow, data: BaseRedactOutputPolicyForm) { row.id = data.id; row.mode = data.mode || BaseRedactOutputPolicyMode.BASE_REDACT_OUTPUT_POLICY_MODE_FULL; row.rule_id = data.rule_id || undefined; row.rule_params = data.rule_params; if (row.rule_id) { const rule = ruleCatalog.value.find(item => item.id === row.rule_id); row.rule_type = rule?.rule_type ?? ""; row.params = rule ? parseParams(row.rule_type, row.rule_params, rule.rule) : {}; } }
 /** 处理行模式变更。 */
 function handleModeChange(row: OutputTableRow) { if (row.mode !== BaseRedactOutputPolicyMode.BASE_REDACT_OUTPUT_POLICY_MODE_RULE) { row.rule_id = undefined; row.rule_type = ""; row.params = {}; row.rule_params = "{}"; } }
 /** 处理行规则变更。 */
@@ -285,7 +287,7 @@ function syncRowParams(row: OutputFieldRow) { const rule = ruleCatalog.value.fin
 function isConfiguredRow(row: OutputFieldRow) { return row.mode === BaseRedactOutputPolicyMode.BASE_REDACT_OUTPUT_POLICY_MODE_HIDE || row.mode === BaseRedactOutputPolicyMode.BASE_REDACT_OUTPUT_POLICY_MODE_FULL || (row.mode === BaseRedactOutputPolicyMode.BASE_REDACT_OUTPUT_POLICY_MODE_RULE && Boolean(row.rule_id)); }
 /** 判断字段表格是否至少配置了一行。 */
 function isConfiguredRowList(rows: OutputFieldRow[] | undefined) { return Boolean(rows?.some(isConfiguredRow)); }
-/** 判断字段行是否使用规则模板。 */
+/** 判断字段行是否使用脱敏规则。 */
 function isRuleRow(row: OutputTableRow) { return row.mode === BaseRedactOutputPolicyMode.BASE_REDACT_OUTPUT_POLICY_MODE_RULE && Boolean(row.rule_id); }
 /** 格式化 API 下拉项。 */
 function apiLabel(api: BaseApi) { return api.desc && api.desc !== api.operation ? `${api.desc}（${api.operation}）` : api.operation; }
@@ -293,10 +295,20 @@ function apiLabel(api: BaseApi) { return api.desc && api.desc !== api.operation
 function isGetApi(api: BaseApi) { return api.method.toUpperCase() === "GET"; }
 /** 格式化服务下拉项。 */
 function serviceLabel(serviceName: string) { const service = apiCatalog.value.find(item => item.service_name === serviceName); return service?.service_desc && service.service_desc !== serviceName ? `${service.service_desc}（${serviceName}）` : serviceName; }
-/** 解析规则参数。 */
-function parseParams(ruleType: string, raw: string): RuleParams { try { const value = JSON.parse(raw) as Record<string, RuleParams>; return value[ruleType.toLowerCase()] ?? defaultParams(ruleType); } catch { return defaultParams(ruleType); } }
-/** 返回规则默认参数。 */
-function defaultParams(ruleType: string): RuleParams { switch (ruleType) { case "MASK": return { keep_first: 3, keep_last: 4, mask_char: "*" }; case "EMAIL": return { keep_local_first: 2, mask_domain: false, mask_char: "*" }; case "REGEX": return { pattern: "(?s).+", replacement: "[REDACTED]" }; case "TRUNCATE": return { length: 10, suffix: "..." }; case "HASH": return { algo: "SHA256" }; case "IP": return { keep_octets: 2, mask_char: "x" }; case "URL": return { mask_query: true, mask_char: "*" }; case "FIXED_LENGTH": return { char: "X" }; default: return {}; } }
+/** 解析规则参数，空策略参数时回退到数据库规则参数。 */
+function parseParams(ruleType: string, raw: string, fallbackRaw = ""): RuleParams {
+  const candidates = fallbackRaw && fallbackRaw !== raw ? [raw, fallbackRaw] : [raw];
+  for (const candidate of candidates) {
+    try {
+      const value = JSON.parse(candidate) as Record<string, RuleParams>;
+      const params = value[ruleType.toLowerCase()];
+      if (params && typeof params === "object" && !Array.isArray(params)) return params;
+    } catch {
+      continue;
+    }
+  }
+  return {};
+}
 /** 创建空的出库字段行。 */
 function createFieldRow(option: Pick<OutputFieldRow, "label" | "value" | "message_ref" | "field_path"> & { description?: string }): OutputFieldRow { return { ...option, id: 0, mode: BaseRedactOutputPolicyMode.BASE_REDACT_OUTPUT_POLICY_MODE_FULL, rule_id: undefined, rule_type: "", params: {}, rule_params: "{}" }; }
 /** 创建默认出库表单。 */

package/dist/package/src/views/base/redact-rule/index.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="table-box">
-    <ProTable ref="table" row-key="id" :columns="columns" :request-api="requestTable" />
+    <ProTable ref="table" row-key="id" :columns="columns" :header-actions="headerActions" :request-api="requestTable" />
     <FormDialog
       v-model="dialog.visible"
       ref="dialogRef"
@@ -14,7 +14,7 @@
     >
       <template #rule>
         <div class="rule-editor">
-          <div class="rule-description">{{ t(templateDescriptionKey) }}</div>
+          <div v-if="form.remark" class="rule-description">{{ form.remark }}</div>
           <div v-if="form.rule_type === 'MASK'" class="parameter-grid">
             <div class="parameter-item">
               <span>{{ t("system.base.redact_rule.parameter.keep_first") }}</span>
@@ -24,6 +24,10 @@
               <span>{{ t("system.base.redact_rule.parameter.keep_last") }}</span>
               <el-input-number v-model="form.params.keep_last" :min="0" :precision="0" controls-position="right" />
             </div>
+            <div class="parameter-item">
+              <span>{{ t("system.base.redact_rule.parameter.min_mask") }}</span>
+              <el-input-number v-model="form.params.min_mask" :min="0" :precision="0" controls-position="right" />
+            </div>
             <div class="parameter-item">
               <span>{{ t("system.base.redact_rule.parameter.mask_char") }}</span>
               <el-input v-model="form.params.mask_char" maxlength="8" />
@@ -109,13 +113,14 @@
 <script setup lang="ts">
 import { computed, reactive, ref } from "vue";
 import { ElMessage, ElMessageBox } from "element-plus";
-import { EditPen } from "@element-plus/icons-vue";
-import type { ColumnProps, ProTableInstance } from "@liujitcn/kratos-admin-core/components/ProTable/interface";
+import type { FormRules } from "element-plus";
+import { CirclePlus, Delete, EditPen } from "@element-plus/icons-vue";
+import type { ColumnProps, HeaderActionProps, ProTableInstance } from "@liujitcn/kratos-admin-core/components/ProTable/interface";
 import ProTable from "@liujitcn/kratos-admin-core/components/ProTable";
 import FormDialog from "@liujitcn/kratos-admin-core/components/Dialog/FormDialog.vue";
 import type { ProFormField } from "@liujitcn/kratos-admin-core/components/ProForm/interface";
 import { useAuthButtons } from "@liujitcn/kratos-admin-core/auth";
-import { buildPageRequest } from "@liujitcn/kratos-admin-core/table";
+import { buildPageRequest, normalizeSelectedIds } from "@liujitcn/kratos-admin-core/table";
 import { t } from "@liujitcn/kratos-admin-core";
 import { defBaseRedactRuleService } from "@liujitcn/kratos-admin-system/api/system/admin/v1/base_redact_rule";
 import type { BaseRedactRule, BaseRedactRuleForm, PageBaseRedactRuleRequest } from "@liujitcn/kratos-admin-system/rpc/system/admin/v1/base_redact_rule";
@@ -124,6 +129,7 @@ import { Status } from "@liujitcn/kratos-admin-system/rpc/common/v1/enum";
 interface RuleParams {
   keep_first?: number;
   keep_last?: number;
+  min_mask?: number;
   mask_char?: string;
   keep_local_first?: number;
   mask_domain?: boolean;
@@ -152,18 +158,21 @@ const statusOptions = computed(() => [
   { label: t("common.status.enabled"), value: Status.STATUS_ENABLE },
   { label: t("common.status.disabled"), value: Status.STATUS_DISABLE }
 ]);
-const templateDescriptionKey = computed(() => `system.base.redact_rule.description.${form.code || "unknown"}`);
-
+/** 运行时支持的规则类型选项。 */
+const ruleTypeOptions = ["MASK", "EMAIL", "REGEX", "TRUNCATE", "HASH", "UUID", "IP", "URL", "FIXED_LENGTH"].map(value => ({ label: value, value }));
 const fields = computed<ProFormField[]>(() => [
-  { prop: "code", label: t("system.base.redact_rule.field.code"), component: "input", props: { disabled: true } },
-  { prop: "name", label: t("system.base.redact_rule.field.name"), component: "input", props: { disabled: true } },
-  { prop: "rule_type", label: t("system.base.redact_rule.field.rule_type"), component: "input", props: { disabled: true } },
+  { prop: "code", label: t("system.base.redact_rule.field.code"), component: "input", props: { disabled: Boolean(form.id) } },
+  { prop: "name", label: t("system.base.redact_rule.field.name"), component: "input", props: { disabled: Boolean(form.id) } },
+  { prop: "rule_type", label: t("system.base.redact_rule.field.rule_type"), component: "select", options: ruleTypeOptions, props: { disabled: Boolean(form.id), onChange: handleRuleTypeChange } },
   { prop: "rule", label: t("system.base.redact_rule.field.parameters"), component: "slot", slotName: "rule", colSpan: 24 },
   { prop: "status", label: t("common.field.status"), component: "radio-group", options: statusOptions.value },
   { prop: "remark", label: t("common.field.remark"), component: "textarea" }
 ]);
 
-const rules = computed(() => ({
+const rules = computed<FormRules>(() => ({
+  code: [{ required: true, message: t("system.base.redact_rule.validation.code"), trigger: "blur" }],
+  name: [{ required: true, message: t("system.base.redact_rule.validation.name"), trigger: "blur" }],
+  rule_type: [{ required: true, message: t("system.base.redact_rule.validation.rule_type"), trigger: "change" }],
   rule: [{ required: true, message: t("system.base.redact_rule.validation.parameters"), trigger: "change" }]
 }));
 
@@ -190,36 +199,40 @@ const columns = computed<ColumnProps[]>(() => [
     prop: "actions",
     label: t("common.field.operation"),
     cellType: "actions",
-    actions: [{ label: t("common.action.edit"), type: "primary", link: true, icon: EditPen, hidden: () => !BUTTONS.value["base:redact-rule:update"], onClick: scope => openDialog((scope.row as BaseRedactRule).id) }]
+    actions: [{ label: t("common.action.edit"), type: "primary", link: true, icon: EditPen, hidden: () => !BUTTONS.value["base:redact-rule:update"], onClick: scope => openDialog((scope.row as BaseRedactRule).id) }, { label: t("common.action.delete"), type: "danger", link: true, icon: Delete, hidden: () => !BUTTONS.value["base:redact-rule:delete"], onClick: scope => deleteItems(scope.row as BaseRedactRule) }]
   }
 ]);
+const headerActions = computed<HeaderActionProps[]>(() => [{ label: t("common.action.create"), type: "success", icon: CirclePlus, hidden: () => !BUTTONS.value["base:redact-rule:create"], onClick: () => openDialog() }, { label: t("common.action.delete"), type: "danger", icon: Delete, hidden: () => !BUTTONS.value["base:redact-rule:delete"], disabled: scope => !scope.selectedList.length, onClick: scope => deleteItems(scope.selectedList as BaseRedactRule[]) }]);
 
-/** 请求固定规则模板列表。 */
+/** 请求固定规则列表。 */
 async function requestTable(params: PageBaseRedactRuleRequest) {
   const data = await defBaseRedactRuleService.PageBaseRedactRule(buildPageRequest(params));
   return { data: { list: data.base_redact_rules ?? [], total: data.total } };
 }
 
-/** 打开固定规则模板编辑弹窗。 */
-async function openDialog(id: number) {
+/** 打开新增或编辑弹窗。 */
+async function openDialog(id?: number) {
   resetForm();
-  const data = await defBaseRedactRuleService.GetBaseRedactRule({ id });
-  Object.assign(form, data, { params: parseRuleParams(data.rule_type, data.rule) });
+  if (id !== undefined) {
+    const data = await defBaseRedactRuleService.GetBaseRedactRule({ id });
+    Object.assign(form, data, { params: parseRuleParams(data.rule_type, data.rule) });
+  }
+  dialog.titleKey = id !== undefined ? "common.action.edit_resource" : "common.action.create_resource";
   dialog.visible = true;
 }
 
-/** 重置规则模板编辑表单。 */
+/** 重置规则编辑表单。 */
 function resetForm() {
   dialog.visible = false;
   dialogRef.value?.resetFields();
   Object.assign(form, defaultForm());
 }
 
-/** 提交固定规则模板参数。 */
+/** 提交新增或编辑的规则。 */
 async function submit() {
+  syncRule();
   const valid = await dialogRef.value?.validate();
   if (!valid) return;
-  syncRule();
   const payload: BaseRedactRuleForm = {
     id: form.id,
     code: form.code,
@@ -229,13 +242,17 @@ async function submit() {
     status: form.status,
     remark: form.remark
   };
-  await defBaseRedactRuleService.UpdateBaseRedactRule({ base_redact_rule: payload });
-  ElMessage.success(t("common.message.update_success", { resource: t("system.base.redact_rule.title") }));
+  if (form.id) {
+    await defBaseRedactRuleService.UpdateBaseRedactRule({ base_redact_rule: payload });
+  } else {
+    await defBaseRedactRuleService.CreateBaseRedactRule({ base_redact_rule: payload });
+  }
+  ElMessage.success(t(form.id ? "common.message.update_success" : "common.message.create_success", { resource: t("system.base.redact_rule.title") }));
   resetForm();
   table.value?.getTableList();
 }
 
-/** 切换固定规则模板状态。 */
+/** 切换固定规则状态。 */
 async function changeStatus(row: BaseRedactRule) {
   const next = row.status === Status.STATUS_ENABLE ? Status.STATUS_DISABLE : Status.STATUS_ENABLE;
   try {
@@ -257,46 +274,46 @@ async function changeStatus(row: BaseRedactRule) {
   }
 }
 
+/** 删除未被引用的规则。 */
+function deleteItems(selected?: BaseRedactRule | BaseRedactRule[] | number | string | Array<number | string>) {
+  const items = Array.isArray(selected) ? selected.filter((item): item is BaseRedactRule => typeof item === "object") : selected && typeof selected === "object" ? [selected] : [];
+  const ids = items.length ? items.map(item => item.id) : normalizeSelectedIds(selected as number | string | Array<number | string>);
+  if (!ids.length) {
+    ElMessage.warning(t("common.message.select_delete_item"));
+    return;
+  }
+  ElMessageBox.confirm(t("common.dialog.delete_selected", { resource: t("system.base.redact_rule.title") }), t("common.title.warning"), { type: "warning" }).then(async () => {
+    await defBaseRedactRuleService.DeleteBaseRedactRule({ id: ids.join(",") });
+    ElMessage.success(t("common.message.delete_success", { resource: t("system.base.redact_rule.title") }));
+    table.value?.getTableList();
+  });
+}
+
 /** 将参数表单同步为运行时规则 JSON。 */
 function syncRule() {
-  form.params = { ...defaultRuleParams(form.rule_type), ...form.params };
+  if (!form.rule_type) {
+    form.rule = "";
+    return;
+  }
   form.rule = JSON.stringify({ [form.rule_type.toLowerCase()]: form.params }, null, 2);
 }
 
-/** 解析规则 JSON 中当前类型的参数。 */
+/** 切换规则类型时重置参数。 */
+function handleRuleTypeChange(ruleType?: string) {
+  form.rule_type = ruleType ?? "";
+  form.params = {};
+}
+
+/** 解析数据库规则 JSON 中当前类型的参数。 */
 function parseRuleParams(ruleType: string, rawRule: string): RuleParams {
   try {
     const value = JSON.parse(rawRule) as Record<string, unknown>;
     const params = value[ruleType.toLowerCase()];
     if (params && typeof params === "object" && !Array.isArray(params)) return params as RuleParams;
   } catch {
-    return defaultRuleParams(ruleType);
-  }
-  return defaultRuleParams(ruleType);
-}
-
-/** 返回固定规则模板的默认参数。 */
-function defaultRuleParams(ruleType: string): RuleParams {
-  switch (ruleType) {
-    case "MASK":
-      return { keep_first: 3, keep_last: 4, mask_char: "*" };
-    case "EMAIL":
-      return { keep_local_first: 2, mask_domain: false, mask_char: "*" };
-    case "REGEX":
-      return { pattern: "(?s).+", replacement: "[REDACTED]" };
-    case "TRUNCATE":
-      return { length: 10, suffix: "..." };
-    case "HASH":
-      return { algo: "SHA256" };
-    case "IP":
-      return { keep_octets: 2, mask_char: "x" };
-    case "URL":
-      return { mask_query: true, mask_char: "*" };
-    case "FIXED_LENGTH":
-      return { char: "X" };
-    default:
-      return {};
+    return {};
   }
+  return {};
 }
 
 /** 返回规则参数的紧凑展示文本。 */
@@ -304,9 +321,9 @@ function ruleSummary(row: BaseRedactRule) {
   return JSON.stringify(parseRuleParams(row.rule_type, row.rule));
 }
 
-/** 返回规则模板表单的初始值。 */
+/** 返回规则表单的初始值。 */
 function defaultForm(): RuleFormState {
-  return { id: 0, code: "", name: "", rule_type: "MASK", rule: "", status: Status.STATUS_ENABLE, remark: "", params: defaultRuleParams("MASK") };
+  return { id: 0, code: "", name: "", rule_type: "", rule: "", status: Status.STATUS_ENABLE, remark: "", params: {} };
 }
 </script>
 

package/dist/package/src/views/base/redact-storage-policy/index.vue

@@ -42,6 +42,7 @@
                   <template v-if="row.rule_type === 'MASK'">
                     <ParameterNumber v-model="row.params.keep_first" :label="t('system.base.redact_rule.parameter.keep_first')" />
                     <ParameterNumber v-model="row.params.keep_last" :label="t('system.base.redact_rule.parameter.keep_last')" />
+                    <ParameterNumber v-model="row.params.min_mask" :label="t('system.base.redact_rule.parameter.min_mask')" />
                     <ParameterText v-model="row.params.mask_char" :label="t('system.base.redact_rule.parameter.mask_char')" />
                   </template>
                   <template v-else-if="row.rule_type === 'EMAIL'">
@@ -93,7 +94,6 @@ import { useAuthButtons } from "@liujitcn/kratos-admin-core/auth";
 import { buildPageRequest, normalizeSelectedIds } from "@liujitcn/kratos-admin-core/table";
 import { t } from "@liujitcn/kratos-admin-core";
 import { defBaseTableSourceService } from "@liujitcn/kratos-admin-system/api/system/admin/v1/base_table_source";
-import { defCodeGenColumnService } from "@liujitcn/kratos-admin-system/api/system/admin/v1/code_gen_column";
 import { defCodeGenTableService } from "@liujitcn/kratos-admin-system/api/system/admin/v1/code_gen_table";
 import { defBaseRedactRuleService } from "@liujitcn/kratos-admin-system/api/system/admin/v1/base_redact_rule";
 import { defBaseRedactStoragePolicyService } from "@liujitcn/kratos-admin-system/api/system/admin/v1/base_redact_storage_policy";
@@ -106,6 +106,7 @@ import { Status } from "@liujitcn/kratos-admin-system/rpc/common/v1/enum";
 interface RuleParams {
   keep_first?: number;
   keep_last?: number;
+  min_mask?: number;
   mask_char?: string;
   keep_local_first?: number;
   mask_domain?: boolean;
@@ -227,7 +228,7 @@ async function loadTables(sourceName = form.source_name) { if (!sourceName) { ta
 /** 预加载数据表中文注释，供列表显示。 */
 async function loadTableComments() { await loadSourceOptions(); const comments = new Map<string, string>(); await Promise.all(sourceOptions.value.map(async option => { const sourceName = String(option.value); const data = await defCodeGenTableService.ListCodeGenDatabaseTable({ source_name: sourceName }); for (const item of data.tables ?? []) { if (item.comment) comments.set(`${sourceName}\x00${item.name}`, item.comment); } })); tableCommentMap.value = comments; }
 /** 加载并过滤数据库字段。 */
-async function loadColumns() { if (!form.source_name || !form.table_name) { form.column_rows = []; return; } const data = await defCodeGenColumnService.ListCodeGenDatabaseColumn({ source_name: form.source_name, table_name: form.table_name }); form.column_rows = (data.columns ?? []).filter(item => !item.is_primary && !STORAGE_AUDIT_COLUMN_NAMES.has(item.name.toLowerCase())).map(item => createColumnRow({ label: item.name, value: item.name, name: item.name, comment: item.comment, db_type: item.db_type })); }
+async function loadColumns() { if (!form.source_name || !form.table_name) { form.column_rows = []; return; } const data = await defBaseRedactStoragePolicyService.ListBaseRedactStorageColumn({ source_name: form.source_name, table_name: form.table_name }); form.column_rows = (data.columns ?? []).filter(item => !STORAGE_AUDIT_COLUMN_NAMES.has(item.name.toLowerCase())).map(item => createColumnRow({ label: item.name, value: item.name, name: item.name, comment: item.comment, db_type: item.db_type })); }
 /** 打开新增或编辑弹窗。 */
 async function openDialog(id?: number) { resetForm(); await Promise.all([loadSourceOptions(), loadRules()]); if (id !== undefined) { const data = await defBaseRedactStoragePolicyService.GetBaseRedactStoragePolicy({ id }); Object.assign(form, data); await loadTables(); await loadColumns(); const row = form.column_rows.find(item => item.name === data.column_name); if (row) applyPolicy(row, data); } dialog.titleKey = id !== undefined ? "common.action.edit_resource" : "common.action.create_resource"; dialog.visible = true; }
 /** 重置弹窗表单。 */
@@ -237,17 +238,27 @@ async function submit() { const valid = await dialogRef.value?.validate(); if (!
 /** 将表格行转换为入库策略请求。 */
 function buildPayload(row: StorageColumnRow): BaseRedactStoragePolicyForm { syncRowParams(row); return { id: row.id, source_name: form.source_name, table_name: form.table_name, column_name: row.name, rule_id: row.rule_id ?? 0, rule_params: row.rule_params, status: form.status, remark: form.remark }; }
 /** 将已保存的策略回填到对应字段行。 */
-function applyPolicy(row: StorageColumnRow, data: BaseRedactStoragePolicyForm) { row.id = data.id; row.rule_id = data.rule_id || undefined; row.rule_params = data.rule_params; if (row.rule_id) { const rule = ruleCatalog.value.find(item => item.id === row.rule_id); row.rule_type = rule?.rule_type ?? ""; row.params = parseParams(row.rule_type, row.rule_params); } }
+function applyPolicy(row: StorageColumnRow, data: BaseRedactStoragePolicyForm) { row.id = data.id; row.rule_id = data.rule_id || undefined; row.rule_params = data.rule_params; if (row.rule_id) { const rule = ruleCatalog.value.find(item => item.id === row.rule_id); row.rule_type = rule?.rule_type ?? ""; row.params = rule ? parseParams(row.rule_type, row.rule_params, rule.rule) : {}; } }
 /** 处理行规则变更。 */
 function handleRuleChange(row: StorageTableRow) { const rule = ruleCatalog.value.find(item => item.id === row.rule_id); row.rule_type = rule?.rule_type ?? ""; row.params = rule ? parseParams(rule.rule_type, rule.rule) : {}; row.rule_params = rule ? rule.rule : "{}"; }
 /** 同步单行规则参数。 */
 function syncRowParams(row: StorageColumnRow) { const rule = ruleCatalog.value.find(item => item.id === row.rule_id); if (rule) { row.rule_type = rule.rule_type; row.rule_params = JSON.stringify({ [rule.rule_type.toLowerCase()]: row.params }); } }
 /** 创建空的入库字段行。 */
 function createColumnRow(option: Pick<StorageColumnRow, "label" | "value" | "name" | "comment" | "db_type">): StorageColumnRow { return { ...option, id: 0, rule_id: undefined, rule_type: "", params: {}, rule_params: "{}" }; }
-/** 解析规则参数。 */
-function parseParams(ruleType: string, raw: string): RuleParams { try { const value = JSON.parse(raw) as Record<string, RuleParams>; return value[ruleType.toLowerCase()] ?? defaultParams(ruleType); } catch { return defaultParams(ruleType); } }
-/** 返回规则默认参数。 */
-function defaultParams(ruleType: string): RuleParams { switch (ruleType) { case "MASK": return { keep_first: 3, keep_last: 4, mask_char: "*" }; case "EMAIL": return { keep_local_first: 2, mask_domain: false, mask_char: "*" }; case "REGEX": return { pattern: "(?s).+", replacement: "[REDACTED]" }; case "TRUNCATE": return { length: 10, suffix: "..." }; case "HASH": return { algo: "SHA256" }; case "IP": return { keep_octets: 2, mask_char: "x" }; case "URL": return { mask_query: true, mask_char: "*" }; case "FIXED_LENGTH": return { char: "X" }; default: return {}; } }
+/** 解析规则参数，空策略参数时回退到数据库规则参数。 */
+function parseParams(ruleType: string, raw: string, fallbackRaw = ""): RuleParams {
+  const candidates = fallbackRaw && fallbackRaw !== raw ? [raw, fallbackRaw] : [raw];
+  for (const candidate of candidates) {
+    try {
+      const value = JSON.parse(candidate) as Record<string, RuleParams>;
+      const params = value[ruleType.toLowerCase()];
+      if (params && typeof params === "object" && !Array.isArray(params)) return params;
+    } catch {
+      continue;
+    }
+  }
+  return {};
+}
 /** 修改入库策略状态。 */
 async function changeStatus(row: BaseRedactStoragePolicy) { const next = row.status === Status.STATUS_ENABLE ? Status.STATUS_DISABLE : Status.STATUS_ENABLE; try { await ElMessageBox.confirm(t("common.dialog.status_change", { action: t(next === Status.STATUS_ENABLE ? "common.status.enabled" : "common.status.disabled"), resource: t("system.base.redact_storage_policy.title"), field: t("system.base.redact_storage_policy.field.column_name"), value: row.column_name }), t("common.title.warning"), { type: "warning" }); await defBaseRedactStoragePolicyService.SetBaseRedactStoragePolicyStatus({ id: row.id, status: next }); table.value?.getTableList(); return true; } catch { return false; } }
 /** 删除选中的入库策略。 */

package/dist/package/src/views/base/role/index.vue

@@ -84,7 +84,7 @@
 </template>
 
 <script setup lang="ts">
-import { computed, nextTick, reactive, ref, watch } from "vue";
+import { computed, nextTick, onMounted, reactive, ref, watch } from "vue";
 import { ElMessage, ElMessageBox, ElTree } from "element-plus";
 import type { CheckboxValueType } from "element-plus";
 import { CirclePlus, Delete, EditPen, Position, QuestionFilled, Search, Switch } from "@element-plus/icons-vue";
@@ -96,12 +96,10 @@ import { useAuthButtons } from "@liujitcn/kratos-admin-core/auth";
 import { defBaseRoleService } from "@liujitcn/kratos-admin-system/api/system/admin/v1/base_role";
 import type { BaseRole, BaseRoleForm, PageBaseRoleRequest } from "@liujitcn/kratos-admin-system/rpc/system/admin/v1/base_role";
 import { defBaseMenuService } from "@liujitcn/kratos-admin-system/api/system/admin/v1/base_menu";
-import { defBaseTenantService } from "@liujitcn/kratos-admin-system/api/system/admin/v1/base_tenant";
-import type { SelectOptionResponse_Option, TreeOptionResponse_Option } from "@liujitcn/kratos-admin-system/rpc/common/v1/common";
+import type { TreeOptionResponse_Option } from "@liujitcn/kratos-admin-system/rpc/common/v1/common";
 import { Status } from "@liujitcn/kratos-admin-system/rpc/common/v1/enum";
 import { buildPageRequest, normalizeSelectedIds } from "@liujitcn/kratos-admin-core/table";
-import { useUserStore } from "@liujitcn/kratos-admin-core/stores/runtime";
-import { DEFAULT_TENANT_CODE, requestTenantOptions } from "@liujitcn/kratos-admin-core/tenant";
+import { useTenantScope } from "@liujitcn/kratos-admin-core/tenant";
 import { t } from "@liujitcn/kratos-admin-core";
 
 defineOptions({
@@ -122,7 +120,6 @@ type BaseRoleFormState = Omit<BaseRoleForm, "tenant_id"> & {
 };
 
 const { BUTTONS } = useAuthButtons();
-const userStore = useUserStore();
 const proTable = ref<ProTableInstance>();
 const formDialogRef = ref<InstanceType<typeof FormDialog>>();
 const permTreeRef = ref<InstanceType<typeof ElTree>>();
@@ -133,12 +130,12 @@ const dialog = reactive({
 });
 
 const menuPermOptions = ref<TreeOptionResponse_Option[]>([]);
-const tenantOptions = ref<SelectOptionResponse_Option[]>([]);
 const statusOptions = computed<ProFormOption[]>(() => [
   { label: t("common.status.enabled"), value: Status.STATUS_ENABLE },
   { label: t("common.status.disabled"), value: Status.STATUS_DISABLE }
 ]);
 const protectedRoleCodes = new Set(["admin", "authuser", "user"]);
+const undeletableRoleCodes = new Set(["super", "tenant", "admin", "authuser", "user"]);
 
 const formData = reactive<BaseRoleFormState>({
   /** 角色ID */
@@ -236,26 +233,16 @@ const checkedBaseRole = ref<CheckedBaseRole>({});
 const assignPermDialogVisible = ref(false);
 const permKeywords = ref("");
 const isExpanded = ref(true);
-const parentChildLinked = ref(true);
+const parentChildLinked = ref(false);
 
-/** 当前登录账号是否默认租户。 */
-const isDefaultTenant = computed(() => userStore.userInfo.tenant_code === DEFAULT_TENANT_CODE);
+const { isDefaultTenant, tenantColumns, tenantFormField, toRequestTenantId, loadTenantOptions } = useTenantScope();
+onMounted(() => {
+  if (isDefaultTenant.value) void loadTenantOptions();
+});
 
 /** 角色表单字段配置。 */
 const formFields = computed<ProFormField[]>(() => [
-  {
-    prop: "tenant_id",
-    label: t("common.field.tenant"),
-    component: "select",
-    props: {
-      placeholder: t("common.placeholder.select"),
-      filterable: true,
-      disabled: Boolean(formData.id),
-      onChange: handleFormTenantChange
-    },
-    visible: () => isDefaultTenant.value,
-    options: tenantOptions.value
-  },
+  tenantFormField({ label: t("common.field.tenant"), disabledOnEdit: true, props: { onChange: handleFormTenantChange } }),
   {
     prop: "name",
     label: t("system.base.role.field.name"),
@@ -302,19 +289,7 @@ const formFields = computed<ProFormField[]>(() => [
 /** 角色表格列配置。 */
 const columns = computed<ColumnProps[]>(() => [
   { type: "selection", width: 55, selectable: row => canDeleteRole(row as BaseRole) },
-  ...(isDefaultTenant.value
-    ? ([
-        {
-          prop: "tenant_id",
-          label: t("common.field.tenant"),
-          minWidth: 140,
-          align: "left",
-          showOverflowTooltip: true,
-          search: { el: "select", key: "tenant_id", props: { filterable: true }, order: 1 },
-          enum: requestTenantOptions
-        }
-      ] satisfies ColumnProps[])
-    : []),
+  ...tenantColumns({ label: t("common.field.tenant"), order: 1 }),
   { prop: "name", label: t("system.base.role.field.name"), minWidth: 140, search: { el: "input" } },
   { prop: "code", label: t("system.base.role.field.code"), minWidth: 160, search: { el: "input" } },
   {
@@ -401,7 +376,7 @@ const headerActions = computed<HeaderActionProps[]>(() => [
 async function requestBaseRoleTable(params: PageBaseRoleRequest) {
   const data = await defBaseRoleService.PageBaseRole({
     ...buildPageRequest(params),
-    tenant_id: isDefaultTenant.value ? params.tenant_id : undefined
+    tenant_id: toRequestTenantId(params.tenant_id)
   });
   return { data: { list: data.base_roles ?? [], total: data.total } };
 }
@@ -413,15 +388,6 @@ function refreshTable() {
   proTable.value?.getTableList();
 }
 
-/**
- * 加载租户下拉选项。
- */
-async function loadTenantOptions() {
-  if (!isDefaultTenant.value || tenantOptions.value.length) return;
-  const response = await defBaseTenantService.OptionBaseTenant({ keyword: "" });
-  tenantOptions.value = response.list ?? [];
-}
-
 /**
  * 按目标角色加载可分配的菜单权限树数据。
  */
@@ -516,7 +482,7 @@ function canManageRole(row?: BaseRole) {
   return Boolean(row?.code && !row.is_protected);
 }
 
-/** 判断角色是否禁止切换状态和删除。 */
+/** 判断角色是否禁止切换状态。 */
 function isRoleProtected(code?: string) {
   return Boolean(code && protectedRoleCodes.has(code));
 }
@@ -528,7 +494,7 @@ function canChangeRoleStatus(row?: BaseRole) {
 
 /** 判断当前账号是否允许删除目标角色。 */
 function canDeleteRole(row?: BaseRole) {
-  return canManageRole(row) && !isRoleProtected(row?.code);
+  return canManageRole(row) && !undeletableRoleCodes.has(row?.code ?? "");
 }
 
 /**