@liujitcn/kratos-admin-system 0.0.71 → 0.0.72

package/dist/package/declarations/src/rpc/system/admin/v1/base_redact_output_policy.d.ts

@@ -56,7 +56,7 @@ export interface BaseRedactOutputPolicyForm {
     field_path: string;
     /** 服务名 */
     service_name: string;
-    /** 租户ID，零表示全局策略 */
+    /** 租户ID，默认租户策略为全局策略 */
     tenant_id: number;
     /** 处理模式 */
     mode: BaseRedactOutputPolicyMode;
@@ -100,7 +100,7 @@ export interface BaseRedactOutputPolicy {
     message_ref: string;
     /** 返回字段路径 */
     field_path: string;
-    /** 租户ID */
+    /** 租户ID，默认租户策略为全局策略 */
     tenant_id: number;
     /** 处理模式 */
     mode: BaseRedactOutputPolicyMode;

package/dist/package/declarations/src/rpc/system/admin/v1/base_redact_storage_policy.d.ts

@@ -44,7 +44,7 @@ export interface BaseRedactStoragePolicyForm {
     rule_params: string;
     /** 数据源名称 */
     source_name: string;
-    /** 租户ID，零表示全局策略 */
+    /** 租户ID，默认租户策略为全局策略 */
     tenant_id: number;
     /** 状态 */
     status: Status;
@@ -92,7 +92,7 @@ export interface BaseRedactStoragePolicy {
     rule_params: string;
     /** 数据源名称 */
     source_name: string;
-    /** 租户ID */
+    /** 租户ID，默认租户策略为全局策略 */
     tenant_id: number;
     /** 数据表注释 */
     table_comment: string;

package/dist/package/src/rpc/system/admin/v1/base_redact_output_policy.ts

@@ -74,7 +74,7 @@ export interface BaseRedactOutputPolicyForm {
   field_path: string;
   /** 服务名 */
   service_name: string;
-  /** 租户ID，零表示全局策略 */
+  /** 租户ID，默认租户策略为全局策略 */
   tenant_id: number;
   /** 处理模式 */
   mode: BaseRedactOutputPolicyMode;
@@ -123,7 +123,7 @@ export interface BaseRedactOutputPolicy {
   message_ref: string;
   /** 返回字段路径 */
   field_path: string;
-  /** 租户ID */
+  /** 租户ID，默认租户策略为全局策略 */
   tenant_id: number;
   /** 处理模式 */
   mode: BaseRedactOutputPolicyMode;

package/dist/package/src/rpc/system/admin/v1/base_redact_storage_policy.ts

@@ -61,7 +61,7 @@ export interface BaseRedactStoragePolicyForm {
   rule_params: string;
   /** 数据源名称 */
   source_name: string;
-  /** 租户ID，零表示全局策略 */
+  /** 租户ID，默认租户策略为全局策略 */
   tenant_id: number;
   /** 状态 */
   status: Status;
@@ -114,7 +114,7 @@ export interface BaseRedactStoragePolicy {
   rule_params: string;
   /** 数据源名称 */
   source_name: string;
-  /** 租户ID */
+  /** 租户ID，默认租户策略为全局策略 */
   tenant_id: number;
   /** 数据表注释 */
   table_comment: string;

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

@@ -220,12 +220,12 @@ const statusOptions = computed<ProFormOption[]>(() => [{ label: t("common.status
 const serviceOptions = computed<ProFormOption[]>(() => {
   const services = new Map<string, string>();
   for (const item of apiCatalog.value) {
-    if (!isGetApi(item) || !matchesTenantScope(item)) continue;
+    if (!isGetApi(item)) continue;
     if (item.service_name && !services.has(item.service_name)) services.set(item.service_name, serviceLabel(item.service_name));
   }
   return [...services.entries()].sort(([left], [right]) => left.localeCompare(right)).map(([value, label]) => ({ label, value }));
 });
-const interfaceOptions = computed(() => apiCatalog.value.filter(item => item.service_name === form.service_name && isGetApi(item) && matchesTenantScope(item)));
+const interfaceOptions = computed(() => apiCatalog.value.filter(item => item.service_name === form.service_name && isGetApi(item)));
 const serviceLabels = computed(() => new Map(apiCatalog.value.map(item => [item.service_name, item.service_desc || item.service_name])));
 const operationLabels = computed(() => new Map(apiCatalog.value.map(item => [item.operation, item.desc || item.operation])));
 const modeOptions = computed<ProFormOption[]>(() => [
@@ -235,8 +235,7 @@ const modeOptions = computed<ProFormOption[]>(() => [
 ]);
 const configuredFieldCount = computed(() => form.field_rows.filter(isConfiguredRow).length);
 const fields = computed<ProFormField[]>(() => [
-  // 脱敏策略支持全局配置，租户选择器追加全局选项。
-  tenantFormField({ label: t("common.field.tenant"), disabledOnEdit: true, includeGlobal: true }),
+  tenantFormField({ label: t("common.field.tenant"), disabledOnEdit: true }),
   { prop: "service_name", label: t("system.base.redact_output_policy.field.service_name"), component: "select", options: serviceOptions.value, props: { filterable: true, clearable: true, placeholder: t("system.base.redact_output_policy.placeholder.service"), onChange: handleServiceChange } },
   { prop: "api_id", label: t("system.base.redact_output_policy.field.api"), component: "select", options: interfaceOptions.value.map(api => ({ label: apiLabel(api), value: api.id })), props: { filterable: true, clearable: true, disabled: !form.service_name, placeholder: t("system.base.redact_output_policy.placeholder.api"), onChange: handleApiChange } },
   { prop: "field_rows", label: t("system.base.redact_output_policy.field.response_field"), component: "slot", slotName: "field_rows", colSpan: 24, visible: () => form.api_id !== undefined },
@@ -252,7 +251,7 @@ const rules = computed<FormRules>(() => ({
 const modeEnums = computed<EnumProps[]>(() => modeOptions.value);
 const columns = computed<ColumnProps[]>(() => [
   { type: "selection", width: 55 },
-  ...tenantColumns({ label: t("common.field.tenant"), order: 1, includeGlobal: true }),
+  ...tenantColumns({ label: t("common.field.tenant"), order: 1 }),
   { prop: "service_name", label: t("system.base.redact_output_policy.field.service_name"), minWidth: 220, search: { el: "input" }, render: scope => serviceLabels.value.get(scope.row.service_name) ?? scope.row.service_name },
   { prop: "operation", label: t("system.base.redact_output_policy.field.api"), minWidth: 260, search: { el: "input" }, render: scope => operationLabels.value.get(scope.row.operation) ?? scope.row.operation },
   { prop: "message_ref", label: t("system.base.redact_output_policy.field.message_ref"), minWidth: 220 },
@@ -265,7 +264,7 @@ const columns = computed<ColumnProps[]>(() => [
 const headerActions = computed<HeaderActionProps[]>(() => [{ label: t("common.action.create"), type: "success", icon: CirclePlus, hidden: () => !BUTTONS.value["base:redact-output-policy:create"], onClick: () => openDialog() }, { label: t("common.action.delete"), type: "danger", icon: Delete, hidden: () => !BUTTONS.value["base:redact-output-policy:delete"], disabled: scope => !scope.selectedList.length, onClick: scope => deleteItems(scope.selectedList as BaseRedactOutputPolicy[]) }]);
 
 /** 请求出库脱敏策略分页列表。 */
-async function requestTable(params: PageBaseRedactOutputPolicyRequest) { const data = await defBaseRedactOutputPolicyService.PageBaseRedactOutputPolicy({ ...buildPageRequest(params), tenant_id: toRequestTenantId(params.tenant_id, true) }); return { data: { list: data.base_redact_output_policies ?? [], total: data.total } }; }
+async function requestTable(params: PageBaseRedactOutputPolicyRequest) { const data = await defBaseRedactOutputPolicyService.PageBaseRedactOutputPolicy({ ...buildPageRequest(params), tenant_id: toRequestTenantId(params.tenant_id) }); return { data: { list: data.base_redact_output_policies ?? [], total: data.total } }; }
 /** 加载 API 选项。 */
 async function loadApis() { apiCatalog.value = await requestApis(); }
 /** 请求 GET API 选项，包含全局策略可用的非租户响应接口。 */
@@ -284,8 +283,6 @@ async function requestApis() {
 async function loadRules() { const rules = await requestRules(); ruleCatalog.value = rules.catalog; ruleOptions.value = rules.options; }
 /** 请求脱敏规则选项。 */
 async function requestRules() { const data = await defBaseRedactRuleService.PageBaseRedactRule({ code: "", name: "", rule_type: "", page_num: 1, page_size: 100 }); const catalog = (data.base_redact_rules ?? []).filter(item => item.rule_type !== "ENCRYPT"); return { catalog, options: catalog.map(item => ({ label: `${item.name} (${item.code})`, value: item.id, disabled: item.status !== Status.STATUS_ENABLE })) }; }
-/** 判断接口是否适用于当前租户范围；仅选择全局策略时允许租户响应以外的接口。 */
-function matchesTenantScope(item: BaseApi) { return form.tenant_id === 0 || Boolean(item.tenant_response); }
 /** 服务变更后清空接口和返回字段。 */
 function handleServiceChange(serviceName?: string) { responseFieldsRequestRevision += 1; form.service_name = serviceName ?? ""; form.api_id = undefined; form.operation = ""; form.message_ref = ""; form.field_path = ""; form.field_rows = []; }
 /** API 变更后重新加载返回字段。 */

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

@@ -200,8 +200,7 @@ let columnsRequestRevision = 0;
 const statusOptions = computed<ProFormOption[]>(() => [{ label: t("common.status.enabled"), value: Status.STATUS_ENABLE }, { label: t("common.status.disabled"), value: Status.STATUS_DISABLE }]);
 const configuredFieldCount = computed(() => form.column_rows.filter(row => Boolean(row.rule_id)).length);
 const fields = computed<ProFormField[]>(() => [
-  // 脱敏策略支持全局配置，租户选择器追加全局选项。
-  tenantFormField({ label: t("common.field.tenant"), disabledOnEdit: true, includeGlobal: true }),
+  tenantFormField({ label: t("common.field.tenant"), disabledOnEdit: true }),
   { prop: "source_name", label: t("system.base.redact_storage_policy.field.source_name"), component: "select", props: { filterable: true, disabled: Boolean(form.id), onChange: handleSourceChange }, options: sourceOptions.value },
   { prop: "table_name", label: t("system.base.redact_storage_policy.field.table_name"), component: "select", props: { filterable: true, disabled: Boolean(form.id) || !form.source_name, onChange: handleTableChange }, options: tableOptions.value },
   { prop: "column_rows", label: t("system.base.redact_storage_policy.field.column_name"), component: "slot", slotName: "column_rows", colSpan: 24, visible: () => Boolean(form.table_name) },
@@ -221,7 +220,7 @@ const rules = computed<FormRules>(() => ({
 }));
 const columns = computed<ColumnProps[]>(() => [
   { type: "selection", width: 55 },
-  ...tenantColumns({ label: t("common.field.tenant"), order: 1, includeGlobal: true }),
+  ...tenantColumns({ label: t("common.field.tenant"), order: 1 }),
   { prop: "source_name", label: t("system.base.redact_storage_policy.field.source_name"), minWidth: 130, search: { el: "input" } },
   { prop: "table_name", label: t("system.base.redact_storage_policy.field.table_name"), minWidth: 180, search: { el: "input" }, render: scope => tableLabel(scope.row as BaseRedactStoragePolicy) },
   { prop: "column_name", label: t("system.base.redact_storage_policy.field.column_name"), minWidth: 150, search: { el: "input" } },
@@ -232,7 +231,7 @@ const columns = computed<ColumnProps[]>(() => [
 const headerActions = computed<HeaderActionProps[]>(() => [{ label: t("common.action.create"), type: "success", icon: CirclePlus, hidden: () => !BUTTONS.value["base:redact-storage-policy:create"], onClick: () => openDialog() }, { label: t("common.action.delete"), type: "danger", icon: Delete, hidden: () => !BUTTONS.value["base:redact-storage-policy:delete"], disabled: scope => !scope.selectedList.length, onClick: scope => deleteItems(scope.selectedList as BaseRedactStoragePolicy[]) }]);
 
 /** 请求入库脱敏策略分页列表。 */
-async function requestTable(params: PageBaseRedactStoragePolicyRequest) { const data = await defBaseRedactStoragePolicyService.PageBaseRedactStoragePolicy({ ...buildPageRequest(params), tenant_id: toRequestTenantId(params.tenant_id, true) }); return { data: { list: data.base_redact_storage_policies ?? [], total: data.total } }; }
+async function requestTable(params: PageBaseRedactStoragePolicyRequest) { const data = await defBaseRedactStoragePolicyService.PageBaseRedactStoragePolicy({ ...buildPageRequest(params), tenant_id: toRequestTenantId(params.tenant_id) }); return { data: { list: data.base_redact_storage_policies ?? [], total: data.total } }; }
 /** 加载脱敏规则选项。 */
 async function loadRules() { const rules = await requestRules(); ruleCatalog.value = rules.catalog; ruleOptions.value = rules.options; }
 /** 请求脱敏规则选项。 */

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@liujitcn/kratos-admin-system",
   "private": false,
-  "version": "0.0.71",
+  "version": "0.0.72",
   "type": "module",
   "description": "kratos-admin system management module",
   "license": "MIT",
@@ -16,7 +16,7 @@
     "sortablejs": "^1.15.2",
     "swagger-ui-dist": "^5.32.15",
     "vue-element-plus-x": "^2.0.3",
-    "@liujitcn/kratos-admin-core": "0.0.71"
+    "@liujitcn/kratos-admin-core": "0.0.72"
   },
   "peerDependencies": {
     "@element-plus/icons-vue": "^2.3.1",