@liujitcn/kratos-admin-system 0.0.29 → 0.0.32

package/dist/package/src/views/base/policy-evaluation-log/index.vue

@@ -0,0 +1,93 @@
+<template>
+  <LogTable ref="page" :config="config" />
+</template>
+
+<script setup lang="ts">
+import { computed, ref } from "vue";
+import type { ColumnProps } from "@liujitcn/kratos-admin-core/components/ProTable/interface";
+import { t } from "@liujitcn/kratos-admin-core";
+import { buildPageRequest } from "@liujitcn/kratos-admin-core/table";
+import LogTable, { type LogTableConfig } from "@liujitcn/kratos-admin-system/components/LogTable.vue";
+import {
+  createLogEnumOptions,
+  formatLogCount,
+  formatLogDuration,
+  logDateSearch,
+  logDetailColumn,
+  logEnumLabel,
+  requestLogTrace
+} from "@liujitcn/kratos-admin-system/components/log";
+import { defBasePolicyEvaluationLogService } from "@liujitcn/kratos-admin-system/api/system/admin/v1/base_policy_evaluation_log";
+import { BasePolicyDecision, BasePolicyEvaluationType } from "@liujitcn/kratos-admin-system/rpc/system/admin/v1/base_policy_evaluation_log";
+import type { BasePolicyEvaluationLog, PageBasePolicyEvaluationLogRequest } from "@liujitcn/kratos-admin-system/rpc/system/admin/v1/base_policy_evaluation_log";
+
+defineOptions({ name: "BasePolicyEvaluationLog", inheritAttrs: false });
+
+const page = ref<InstanceType<typeof LogTable>>();
+const decisionOptions = computed(() => createLogEnumOptions([
+  [BasePolicyDecision.BASE_POLICY_DECISION_UNSPECIFIED, t("system.base.log.policy_decision.unspecified")],
+  [BasePolicyDecision.BASE_POLICY_DECISION_ALLOW, t("system.base.log.policy_decision.allow")],
+  [BasePolicyDecision.BASE_POLICY_DECISION_DENY, t("system.base.log.policy_decision.deny")],
+  [BasePolicyDecision.BASE_POLICY_DECISION_ERROR, t("system.base.log.policy_decision.error")]
+]));
+const evaluationTypeOptions = computed(() => createLogEnumOptions([
+  [BasePolicyEvaluationType.BASE_POLICY_EVALUATION_TYPE_UNSPECIFIED, t("system.base.log.evaluation_type.unspecified")],
+  [BasePolicyEvaluationType.BASE_POLICY_EVALUATION_TYPE_IS_AUTHORIZED, t("system.base.log.evaluation_type.is_authorized")],
+  [BasePolicyEvaluationType.BASE_POLICY_EVALUATION_TYPE_FILTER_PAIRS, t("system.base.log.evaluation_type.filter_pairs")],
+  [BasePolicyEvaluationType.BASE_POLICY_EVALUATION_TYPE_FILTER_PROJECTS, t("system.base.log.evaluation_type.filter_projects")]
+]));
+const columns = computed<ColumnProps[]>(() => [
+  { prop: "resource", label: t("system.base.log.field.resource"), minWidth: 320, search: { el: "input" } },
+  { prop: "action", label: t("system.base.log.field.action"), minWidth: 100 },
+  { prop: "engine", label: t("system.base.log.field.engine"), minWidth: 100 },
+  { prop: "evaluation_type", label: t("system.base.log.field.evaluation_type"), minWidth: 160, search: { el: "select", enum: evaluationTypeOptions.value }, render: scope => logEnumLabel(evaluationTypeOptions.value, (scope.row as BasePolicyEvaluationLog).evaluation_type) },
+  { prop: "decision", label: t("system.base.log.field.decision"), minWidth: 110, search: { el: "select", enum: decisionOptions.value }, render: scope => logEnumLabel(decisionOptions.value, (scope.row as BasePolicyEvaluationLog).decision) },
+  { prop: "duration_ms", label: t("system.base.log.field.duration_ms"), minWidth: 110 },
+  { prop: "occurred_at", label: t("system.base.log.field.occurred_at"), minWidth: 190, search: logDateSearch(t) },
+  logDetailColumn(t("common.action.view"), id => page.value?.handleOpenDialog(id))
+]);
+
+const config = computed<LogTableConfig>(() => ({
+  columns: columns.value,
+  detailTitle: t("system.base.log.policy.title.detail"),
+  closeText: t("common.action.close"),
+  trace: requestLogTrace,
+  detailFields: [
+    { key: "id", label: t("system.base.log.field.id") },
+    { key: "tenant_id", label: t("system.base.log.field.tenant_id") },
+    { key: "tenant_code", label: t("system.base.log.field.tenant_code") },
+    { key: "user_id", label: t("system.base.log.field.user_id") },
+    { key: "user_name", label: t("system.base.log.field.user_name") },
+    { key: "role_id", label: t("system.base.log.field.role_id") },
+    { key: "role_code", label: t("system.base.log.field.role_code") },
+    { key: "engine", label: t("system.base.log.field.engine") },
+    { key: "evaluation_type", label: t("system.base.log.field.evaluation_type"), enum: evaluationTypeOptions.value },
+    { key: "resource", label: t("system.base.log.field.resource"), span: 2 },
+    { key: "action", label: t("system.base.log.field.action") },
+    { key: "project", label: t("system.base.log.field.project") },
+    { key: "decision", label: t("system.base.log.field.decision"), enum: decisionOptions.value },
+    { key: "reason_code", label: t("system.base.log.field.reason_code") },
+    { key: "reason", label: t("system.base.log.field.reason"), span: 2 },
+    { key: "duration_ms", label: t("system.base.log.field.duration_ms"), format: value => formatLogDuration(value, t) },
+    { key: "candidate_count", label: t("system.base.log.field.candidate_count"), format: value => formatLogCount(value, t) },
+    { key: "matched_count", label: t("system.base.log.field.matched_count"), format: value => formatLogCount(value, t) },
+    { key: "input_hash", label: t("system.base.log.field.input_hash") },
+    { key: "client_ip", label: t("system.base.log.field.client_ip") },
+    { key: "request_id", label: t("system.base.log.field.request_id") },
+    { key: "trace_id", label: t("system.base.log.field.trace_id") },
+    { key: "occurred_at", label: t("system.base.log.field.occurred_at") },
+    { key: "created_at", label: t("system.base.log.field.created_at") }
+  ],
+  request: requestTable,
+  get: getDetail
+}));
+
+async function requestTable(params: Record<string, unknown>) {
+  const response = await defBasePolicyEvaluationLogService.PageBasePolicyEvaluationLog(buildPageRequest(params as unknown as PageBasePolicyEvaluationLogRequest));
+  return { list: response.base_policy_evaluation_logs as unknown as Record<string, unknown>[], total: response.total };
+}
+
+async function getDetail(id: string) {
+  return (await defBasePolicyEvaluationLogService.GetBasePolicyEvaluationLog({ id })) as unknown as Record<string, unknown>;
+}
+</script>

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

@@ -12,7 +12,7 @@
     <FormDialog
       v-model="dialog.visible"
       ref="formDialogRef"
-      :title="t(dialog.titleKey, { resource: t('system.base.post.resource') })"
+      :title="t(dialog.titleKey, { resource: t('common.field.post') })"
       width="560px"
       :model="formData"
       :fields="formFields"
@@ -32,9 +32,9 @@ import ProTable from "@liujitcn/kratos-admin-core/components/ProTable";
 import FormDialog from "@liujitcn/kratos-admin-core/components/Dialog/FormDialog.vue";
 import type { ProFormField, ProFormOption } from "@liujitcn/kratos-admin-core/components/ProForm/interface";
 import { useAuthButtons } from "@liujitcn/kratos-admin-core/auth";
-import { defBasePostService } from "@liujitcn/kratos-admin-system/api/system/base_post";
+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/base_tenant";
+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";
@@ -142,7 +142,7 @@ const formFields = computed<ProFormField[]>(() => [
     label: t("common.field.tenant"),
     component: "select",
     props: {
-      placeholder: t("common.validation.required_select", { field: t("common.field.tenant") }),
+      placeholder: t("common.placeholder.select"),
       filterable: true,
       disabled: Boolean(formData.id)
     },
@@ -319,7 +319,7 @@ function handleSubmit() {
     request.then(() => {
       ElMessage.success(
         t(submitData.id ? "common.message.update_success" : "common.message.create_success", {
-          resource: t("system.base.post.resource")
+          resource: t("common.field.post")
         })
       );
       handleCloseDialog();
@@ -336,7 +336,7 @@ async function handleBeforeSetStatus(row: BasePost) {
     await ElMessageBox.confirm(
       t("common.dialog.status_change", {
         action: text,
-        resource: t("system.base.post.resource"),
+        resource: t("common.field.post"),
         field: t("system.base.post.field.name"),
         value: row.name || row.code || `ID:${row.id}`
       }),
@@ -372,10 +372,10 @@ function handleDelete(selected?: number | string | Array<number | string> | Base
   }
   const confirmMessage =
     postList.length === 1
-      ? `${t("common.dialog.delete_single", { resource: t("system.base.post.resource") })}\n${t("common.dialog.resource_field", { field: t("system.base.post.field.name"), value: postList[0].name || postList[0].code || `ID:${postList[0].id}` })}`
+      ? `${t("common.dialog.delete_single", { resource: t("common.field.post") })}\n${t("common.dialog.resource_field", { field: t("system.base.post.field.name"), value: postList[0].name || postList[0].code || `ID:${postList[0].id}` })}`
       : postList.length > 1
-        ? t("common.dialog.delete_batch", { count: postList.length, unit: "", resource: t("system.base.post.resource") })
-        : t("common.dialog.delete_selected", { resource: t("system.base.post.resource") });
+        ? t("common.dialog.delete_batch", { count: postList.length, unit: "", resource: t("common.field.post") })
+        : t("common.dialog.delete_selected", { resource: t("common.field.post") });
   ElMessageBox.confirm(confirmMessage, t("common.title.warning"), {
     confirmButtonText: t("common.action.confirm"),
     cancelButtonText: t("common.action.cancel"),
@@ -383,10 +383,10 @@ function handleDelete(selected?: number | string | Array<number | string> | Base
   }).then(
     () =>
       defBasePostService.DeleteBasePost({ id: postIds }).then(() => {
-        ElMessage.success(t("common.message.delete_success", { resource: t("system.base.post.resource") }));
+        ElMessage.success(t("common.message.delete_success", { resource: t("common.field.post") }));
         refreshTable();
       }),
-    () => ElMessage.info(t("common.dialog.cancel_delete", { resource: t("system.base.post.resource") }))
+    () => ElMessage.info(t("common.dialog.cancel_delete", { resource: t("common.field.post") }))
   );
 }
 </script>

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

@@ -0,0 +1,59 @@
+<template>
+  <div class="table-box page-box">
+    <ProTable ref="table" row-key="id" :columns="columns" :header-actions="headerActions" :request-api="requestTable" />
+    <FormDialog v-model="dialog.visible" ref="dialogRef" :title="t(dialog.titleKey)" width="620px" :model="form" :fields="fields" :rules="rules" @confirm="submit" @close="resetForm" />
+  </div>
+</template>
+
+<script setup lang="ts">
+import { computed, reactive, ref } from "vue";
+import { ElMessage, ElMessageBox } from "element-plus";
+import { 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, ProFormOption } from "@liujitcn/kratos-admin-core/components/ProForm/interface";
+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 { defBaseRedactFieldService } from "@liujitcn/kratos-admin-system/api/system/base_redact_field";
+import { defBaseRedactRuleService } from "@liujitcn/kratos-admin-system/api/system/base_redact_rule";
+import type { BaseRedactField, BaseRedactFieldForm, PageBaseRedactFieldRequest } from "@liujitcn/kratos-admin-system/rpc/system/admin/v1/base_redact_field";
+import { BaseRedactSearchMode, BaseRedactStorageMode } from "@liujitcn/kratos-admin-system/rpc/system/admin/v1/base_redact_field";
+import { Status } from "@liujitcn/kratos-admin-system/rpc/common/v1/enum";
+
+defineOptions({ name: "BaseRedactField", inheritAttrs: false });
+const { BUTTONS } = useAuthButtons();
+const table = ref<ProTableInstance>();
+const dialogRef = ref<InstanceType<typeof FormDialog>>();
+const ruleOptions = ref<ProFormOption[]>([]);
+const dialog = reactive({ visible: false, titleKey: "common.action.edit_resource" });
+const form = reactive<BaseRedactFieldForm>({ id: 0, message_ref: "", field_path: "", field_kind: "string", sensitivity_type: "", source: "PROTO", entity_ref: "", table_name: "", column_name: "", record_key_field: "", storage_mode: BaseRedactStorageMode.BASE_REDACT_STORAGE_MODE_UNSPECIFIED, storage_rule_id: 0, search_mode: BaseRedactSearchMode.BASE_REDACT_SEARCH_MODE_UNSPECIFIED, status: Status.STATUS_ENABLE, remark: "" });
+const statusOptions = computed<ProFormOption[]>(() => [{ label: t("common.status.enabled"), value: Status.STATUS_ENABLE }, { label: t("common.status.disabled"), value: Status.STATUS_DISABLE }]);
+const storageSupported = computed(() => form.message_ref === "system.admin.v1.BaseUser" && form.field_path === "phone");
+const storageModeOptions = computed<ProFormOption[]>(() => { const options: ProFormOption[] = [{ label: t("system.base.redact_policy.storage_mode.unspecified"), value: BaseRedactStorageMode.BASE_REDACT_STORAGE_MODE_UNSPECIFIED }]; if (storageSupported.value) options.push({ label: t("system.base.redact_policy.storage_mode.plain"), value: BaseRedactStorageMode.BASE_REDACT_STORAGE_MODE_PLAIN }, { label: t("system.base.redact_policy.storage_mode.mask"), value: BaseRedactStorageMode.BASE_REDACT_STORAGE_MODE_MASK }); return options; });
+const searchModeOptions = computed<ProFormOption[]>(() => { const options: ProFormOption[] = [{ label: t("system.base.redact_policy.search_mode.unspecified"), value: BaseRedactSearchMode.BASE_REDACT_SEARCH_MODE_UNSPECIFIED }]; if (storageSupported.value) options.push({ label: t("system.base.redact_policy.search_mode.none"), value: BaseRedactSearchMode.BASE_REDACT_SEARCH_MODE_NONE }, { label: t("system.base.redact_policy.search_mode.digest"), value: BaseRedactSearchMode.BASE_REDACT_SEARCH_MODE_DIGEST }); return options; });
+const fields = computed<ProFormField[]>(() => [{ prop: "message_ref", label: t("system.base.redact_policy.field.message_ref"), component: "input", props: { disabled: true } }, { prop: "field_path", label: t("system.base.redact_policy.field.field_path"), component: "input", props: { disabled: true } }, { prop: "field_kind", label: t("system.base.redact_policy.field.field_kind"), component: "input", props: { disabled: true } }, { prop: "sensitivity_type", label: t("system.base.redact_policy.field.sensitivity_type"), component: "input" }, { prop: "entity_ref", label: t("system.base.redact_policy.field.entity_ref"), component: "input" }, { prop: "table_name", label: t("system.base.redact_policy.field.table_name"), component: "input" }, { prop: "column_name", label: t("system.base.redact_policy.field.column_name"), component: "input" }, { prop: "record_key_field", label: t("system.base.redact_policy.field.record_key_field"), component: "input" }, { prop: "storage_mode", label: t("system.base.redact_policy.field.storage_mode"), component: "select", options: storageModeOptions.value }, { prop: "storage_rule_id", label: t("system.base.redact_policy.field.storage_rule"), component: "select", props: { filterable: true, clearable: true }, options: ruleOptions.value, visible: () => form.storage_mode === BaseRedactStorageMode.BASE_REDACT_STORAGE_MODE_MASK }, { prop: "search_mode", label: t("system.base.redact_policy.field.search_mode"), component: "select", options: searchModeOptions.value }, { 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(() => ({ message_ref: [{ required: true, message: t("system.base.redact_policy.validation.message_ref"), trigger: "blur" }], field_path: [{ required: true, message: t("system.base.redact_policy.validation.field_path"), trigger: "blur" }] }));
+const columns = computed<ColumnProps[]>(() => [{ type: "selection", width: 55 }, { prop: "message_ref", label: t("system.base.redact_policy.field.message_ref"), minWidth: 220, search: { el: "input" } }, { prop: "field_path", label: t("system.base.redact_policy.field.field_path"), minWidth: 140, search: { el: "input" } }, { prop: "field_kind", label: t("system.base.redact_policy.field.field_kind"), width: 110 }, { prop: "sensitivity_type", label: t("system.base.redact_policy.field.sensitivity_type"), width: 140 }, { prop: "source", label: t("system.base.redact_policy.field.source"), width: 110, search: { el: "select", enum: [{ label: "PROTO", value: "PROTO" }, { label: "DATABASE", value: "DATABASE" }] } }, { prop: "storage_mode", label: t("system.base.redact_policy.field.storage_mode"), width: 120, enum: storageModeOptions.value, isFilterEnum: true }, { prop: "search_mode", label: t("system.base.redact_policy.field.search_mode"), width: 120, enum: searchModeOptions.value, isFilterEnum: true }, { prop: "status", label: t("common.field.status"), width: 100, cellType: "status", statusProps: { activeValue: Status.STATUS_ENABLE, inactiveValue: Status.STATUS_DISABLE, activeText: t("common.status.enabled"), inactiveText: t("common.status.disabled"), disabled: () => !BUTTONS.value["base:redact-field:status"], beforeChange: scope => changeStatus(scope.row as BaseRedactField) } }, { prop: "operation", label: t("common.field.operation"), width: 140, fixed: "right", cellType: "actions", actions: [{ label: t("common.action.edit"), type: "primary", link: true, icon: EditPen, hidden: () => !BUTTONS.value["base:redact-field:update"], onClick: scope => openDialog((scope.row as BaseRedactField).id) }, { label: t("common.action.delete"), type: "danger", link: true, icon: Delete, hidden: () => !BUTTONS.value["base:redact-field:delete"], onClick: scope => deleteItems(scope.row as BaseRedactField) }] }]);
+const headerActions = computed<HeaderActionProps[]>(() => [{ label: t("common.action.delete"), type: "danger", icon: Delete, hidden: () => !BUTTONS.value["base:redact-field:delete"], disabled: scope => !scope.selectedList.length, onClick: scope => deleteItems(scope.selectedList as BaseRedactField[]) }]);
+
+/** 请求字段分页列表。 */
+async function requestTable(params: PageBaseRedactFieldRequest) { const data = await defBaseRedactFieldService.PageBaseRedactField(buildPageRequest(params)); return { data: { list: data.base_redact_fields ?? [], total: data.total } }; }
+/** 加载存储脱敏规则选项。 */
+async function loadRuleOptions() { const result = await defBaseRedactRuleService.OptionBaseRedactRule({ keyword: "" }); ruleOptions.value = result.list ?? []; }
+/** 打开字段编辑弹窗。 */
+async function openDialog(id: number) { resetForm(); await loadRuleOptions(); dialog.titleKey = "common.action.edit_resource"; dialog.visible = true; Object.assign(form, await defBaseRedactFieldService.GetBaseRedactField({ id })); }
+/** 重置字段表单。 */
+function resetForm() { dialog.visible = false; dialogRef.value?.resetFields(); Object.assign(form, { id: 0, message_ref: "", field_path: "", field_kind: "string", sensitivity_type: "", source: "PROTO", entity_ref: "", table_name: "", column_name: "", record_key_field: "", storage_mode: BaseRedactStorageMode.BASE_REDACT_STORAGE_MODE_UNSPECIFIED, storage_rule_id: 0, search_mode: BaseRedactSearchMode.BASE_REDACT_SEARCH_MODE_UNSPECIFIED, status: Status.STATUS_ENABLE, remark: "" }); }
+/** 提交字段表单。 */
+function submit() { dialogRef.value?.validate()?.then(async valid => { if (!valid) return; const payload = JSON.parse(JSON.stringify(form)) as BaseRedactFieldForm; if (payload.storage_mode !== BaseRedactStorageMode.BASE_REDACT_STORAGE_MODE_MASK) payload.storage_rule_id = 0; await defBaseRedactFieldService.UpdateBaseRedactField({ base_redact_field: payload }); ElMessage.success(t("common.message.update_success", { resource: t("system.base.redact_policy.tabs.field") })); resetForm(); table.value?.getTableList(); }); }
+/** 切换字段状态。 */
+async function changeStatus(row: BaseRedactField) { 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_policy.tabs.field"), field: t("system.base.redact_policy.field.message_ref"), value: row.message_ref })); await defBaseRedactFieldService.SetBaseRedactFieldStatus({ id: row.id, status: next }); table.value?.getTableList(); return true; } catch { return false; } }
+/** 删除字段目录。 */
+function deleteItems(selected?: BaseRedactField | BaseRedactField[] | number | string | Array<number | string>) { const items = Array.isArray(selected) ? selected.filter((item): item is BaseRedactField => 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_policy.tabs.field") }), t("common.title.warning"), { type: "warning" }).then(async () => { await defBaseRedactFieldService.DeleteBaseRedactField({ id: ids.join(",") }); ElMessage.success(t("common.message.delete_success", { resource: t("system.base.redact_policy.tabs.field") })); table.value?.getTableList(); }); }
+</script>
+
+<style scoped lang="scss">
+.page-box { padding: 20px; }
+</style>

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

@@ -0,0 +1,92 @@
+<template>
+  <div class="table-box page-box">
+    <ProTable ref="table" row-key="id" :columns="columns" :header-actions="headerActions" :request-api="requestTable" />
+    <FormDialog v-model="dialog.visible" ref="dialogRef" :title="t(dialog.titleKey)" width="560px" :model="form" :fields="fields" :rules="rules" @confirm="submit" @close="resetForm" />
+  </div>
+</template>
+
+<script setup lang="ts">
+import { computed, reactive, ref, watch } from "vue";
+import { ElMessage, ElMessageBox } from "element-plus";
+import { CirclePlus, Delete, EditPen } from "@element-plus/icons-vue";
+import type { ColumnProps, EnumProps, 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, ProFormOption } from "@liujitcn/kratos-admin-core/components/ProForm/interface";
+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 { defBaseApiService } from "@liujitcn/kratos-admin-system/api/system/admin/v1/base_api";
+import { defBaseRedactFieldService } from "@liujitcn/kratos-admin-system/api/system/base_redact_field";
+import { defBaseRedactPolicyService } from "@liujitcn/kratos-admin-system/api/system/base_redact_policy";
+import { defBaseRedactRuleService } from "@liujitcn/kratos-admin-system/api/system/base_redact_rule";
+import type { BaseApi } from "@liujitcn/kratos-admin-system/rpc/system/admin/v1/base_api";
+import type { BaseRedactPolicy, BaseRedactPolicyForm, PageBaseRedactPolicyRequest } from "@liujitcn/kratos-admin-system/rpc/system/admin/v1/base_redact_policy";
+import { BaseRedactPolicyMode } from "@liujitcn/kratos-admin-system/rpc/system/admin/v1/base_redact_policy";
+import { BaseRedactDirection } from "@liujitcn/kratos-admin-system/rpc/system/admin/v1/base_redact_common";
+import { Status } from "@liujitcn/kratos-admin-system/rpc/common/v1/enum";
+
+defineOptions({ name: "BaseRedactPolicy", inheritAttrs: false });
+const { BUTTONS } = useAuthButtons();
+const table = ref<ProTableInstance>();
+const dialogRef = ref<InstanceType<typeof FormDialog>>();
+const apiOptions = ref<ProFormOption[]>([]);
+const fieldOptions = ref<ProFormOption[]>([]);
+const ruleOptions = ref<ProFormOption[]>([]);
+const dialog = reactive({ visible: false, titleKey: "common.action.create_resource" });
+const statusOptions = computed<ProFormOption[]>(() => [{ label: t("common.status.enabled"), value: Status.STATUS_ENABLE }, { label: t("common.status.disabled"), value: Status.STATUS_DISABLE }]);
+const directionOptions = computed<ProFormOption[]>(() => [{ label: t("system.base.redact_policy.direction.response"), value: BaseRedactDirection.BASE_REDACT_DIRECTION_RESPONSE }]);
+const modeOptions = computed<ProFormOption[]>(() => [{ label: t("system.base.redact_policy.mode.rule"), value: BaseRedactPolicyMode.BASE_REDACT_POLICY_MODE_RULE }, { label: t("system.base.redact_policy.mode.hide"), value: BaseRedactPolicyMode.BASE_REDACT_POLICY_MODE_HIDE }, { label: t("system.base.redact_policy.mode.full"), value: BaseRedactPolicyMode.BASE_REDACT_POLICY_MODE_FULL }]);
+const form = reactive<BaseRedactPolicyForm>({ id: 0, field_id: 0, rule_id: 0, scene_code: "*", operation: "", direction: BaseRedactDirection.BASE_REDACT_DIRECTION_RESPONSE, mode: BaseRedactPolicyMode.BASE_REDACT_POLICY_MODE_RULE, priority: 0, status: Status.STATUS_ENABLE, version: 1, remark: "" });
+const fields = computed<ProFormField[]>(() => [
+  { prop: "operation", label: t("system.base.redact_policy.field.operation"), component: "select", props: { filterable: true }, options: apiOptions.value },
+  { prop: "direction", label: t("system.base.redact_policy.field.direction"), component: "select", options: directionOptions.value },
+  { prop: "field_id", label: t("system.base.redact_policy.field.field"), component: "select", props: { filterable: true }, options: fieldOptions.value },
+  { prop: "rule_id", label: t("system.base.redact_policy.field.rule"), component: "select", props: { filterable: true, clearable: true }, options: ruleOptions.value, visible: () => form.mode === BaseRedactPolicyMode.BASE_REDACT_POLICY_MODE_RULE },
+  { prop: "scene_code", label: t("system.base.redact_policy.field.scene_code"), component: "input", props: { disabled: true } },
+  { prop: "mode", label: t("system.base.redact_policy.field.mode"), component: "select", options: modeOptions.value },
+  { prop: "priority", label: t("system.base.redact_policy.field.priority"), component: "input-number", props: { min: 0, precision: 0, style: { width: "100%" } } },
+  { prop: "version", label: t("system.base.redact_policy.field.version"), component: "input-number", props: { min: 1, precision: 0, style: { width: "100%" } } },
+  { 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(() => ({ operation: [{ required: true, message: t("system.base.redact_policy.validation.operation"), trigger: "change" }], direction: [{ required: true, message: t("system.base.redact_policy.validation.direction"), trigger: "change" }], field_id: [{ required: true, message: t("system.base.redact_policy.validation.field"), trigger: "change" }], scene_code: [{ required: true, message: t("system.base.redact_policy.validation.scene"), trigger: "blur" }] }));
+const modeEnums = computed<EnumProps[]>(() => modeOptions.value);
+const columns = computed<ColumnProps[]>(() => [
+  { type: "selection", width: 55 },
+  { prop: "operation", label: t("system.base.redact_policy.field.operation"), minWidth: 300, search: { el: "input" } },
+  { prop: "direction", label: t("system.base.redact_policy.field.direction"), width: 110, enum: directionOptions.value, isFilterEnum: true, search: { el: "select", enum: directionOptions.value } },
+  { prop: "message_ref", label: t("system.base.redact_policy.field.message_ref"), minWidth: 220, search: { el: "input" } },
+  { prop: "field_path", label: t("system.base.redact_policy.field.field_path"), minWidth: 130, search: { el: "input" } },
+  { prop: "scene_code", label: t("system.base.redact_policy.field.scene_code"), width: 110, search: { el: "input" } },
+  { prop: "mode", label: t("system.base.redact_policy.field.mode"), width: 110, enum: modeEnums.value, isFilterEnum: true, search: { el: "select", enum: modeEnums.value } },
+  { prop: "rule_code", label: t("system.base.redact_policy.field.rule"), width: 150 },
+  { prop: "version", label: t("system.base.redact_policy.field.version"), width: 80 },
+  { prop: "status", label: t("common.field.status"), width: 100, cellType: "status", statusProps: { activeValue: Status.STATUS_ENABLE, inactiveValue: Status.STATUS_DISABLE, activeText: t("common.status.enabled"), inactiveText: t("common.status.disabled"), disabled: () => !BUTTONS.value["base:redact-policy:status"], beforeChange: scope => changeStatus(scope.row as BaseRedactPolicy) } },
+  { prop: "actions", label: t("common.field.operation"), width: 140, fixed: "right", cellType: "actions", actions: [{ label: t("common.action.edit"), type: "primary", link: true, icon: EditPen, hidden: () => !BUTTONS.value["base:redact-policy:update"], onClick: scope => openDialog((scope.row as BaseRedactPolicy).id) }, { label: t("common.action.delete"), type: "danger", link: true, icon: Delete, hidden: () => !BUTTONS.value["base:redact-policy:delete"], onClick: scope => deleteItems(scope.row as BaseRedactPolicy) }] }
+]);
+const headerActions = computed<HeaderActionProps[]>(() => [{ label: t("common.action.create"), type: "success", icon: CirclePlus, hidden: () => !BUTTONS.value["base:redact-policy:create"], onClick: () => openDialog() }, { label: t("common.action.delete"), type: "danger", icon: Delete, hidden: () => !BUTTONS.value["base:redact-policy:delete"], disabled: scope => !scope.selectedList.length, onClick: scope => deleteItems(scope.selectedList as BaseRedactPolicy[]) }]);
+
+/** 请求策略分页列表。 */
+async function requestTable(params: PageBaseRedactPolicyRequest) { const data = await defBaseRedactPolicyService.PageBaseRedactPolicy(buildPageRequest(params)); return { data: { list: data.base_redact_policies ?? [], total: data.total } }; }
+/** 加载接口和规则选项。 */
+async function loadOptions() { const [apisResult, rulesResult] = await Promise.all([defBaseApiService.OptionBaseApi({ include_public: true }), defBaseRedactRuleService.OptionBaseRedactRule({ keyword: "" })]); apiOptions.value = (apisResult.base_apis ?? []).map((item: BaseApi) => ({ label: `${item.service_name} / ${item.operation} (${item.method} ${item.path})`, value: item.operation })); ruleOptions.value = rulesResult.list ?? []; await loadFieldOptions(); }
+/** 按当前接口和方向加载可选字段。 */
+async function loadFieldOptions() { if (!form.operation) { fieldOptions.value = []; form.field_id = 0; return; } const result = await defBaseRedactFieldService.OptionBaseRedactField({ keyword: "", operation: form.operation, direction: form.direction }); fieldOptions.value = result.list ?? []; if (!fieldOptions.value.some(item => item.value === form.field_id)) form.field_id = 0; }
+/** 打开策略编辑弹窗。 */
+async function openDialog(id?: number) { resetForm(); await loadOptions(); dialog.titleKey = id ? "common.action.edit_resource" : "common.action.create_resource"; dialog.visible = true; if (id) Object.assign(form, await defBaseRedactPolicyService.GetBaseRedactPolicy({ id })); }
+/** 重置策略表单。 */
+function resetForm() { dialog.visible = false; dialogRef.value?.resetFields(); Object.assign(form, { id: 0, field_id: 0, rule_id: 0, scene_code: "*", operation: "", direction: BaseRedactDirection.BASE_REDACT_DIRECTION_RESPONSE, mode: BaseRedactPolicyMode.BASE_REDACT_POLICY_MODE_RULE, priority: 0, status: Status.STATUS_ENABLE, version: 1, remark: "" }); }
+/** 提交策略表单。 */
+function submit() { dialogRef.value?.validate()?.then(async valid => { if (!valid) return; const payload = JSON.parse(JSON.stringify(form)) as BaseRedactPolicyForm; if (payload.mode !== BaseRedactPolicyMode.BASE_REDACT_POLICY_MODE_RULE) payload.rule_id = 0; if (payload.id) await defBaseRedactPolicyService.UpdateBaseRedactPolicy({ base_redact_policy: payload }); else await defBaseRedactPolicyService.CreateBaseRedactPolicy({ base_redact_policy: payload }); ElMessage.success(t(payload.id ? "common.message.update_success" : "common.message.create_success", { resource: t("system.base.redact_policy.title") })); resetForm(); table.value?.getTableList(); }); }
+/** 切换策略状态。 */
+async function changeStatus(row: BaseRedactPolicy) { 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_policy.title"), field: t("system.base.redact_policy.field.message_ref"), value: row.message_ref })); await defBaseRedactPolicyService.SetBaseRedactPolicyStatus({ id: row.id, status: next }); table.value?.getTableList(); return true; } catch { return false; } }
+/** 删除策略绑定。 */
+function deleteItems(selected?: BaseRedactPolicy | BaseRedactPolicy[] | number | string | Array<number | string>) { const items = Array.isArray(selected) ? selected.filter((item): item is BaseRedactPolicy => 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_policy.title") }), t("common.title.warning"), { type: "warning" }).then(async () => { await defBaseRedactPolicyService.DeleteBaseRedactPolicy({ id: ids.join(",") }); ElMessage.success(t("common.message.delete_success", { resource: t("system.base.redact_policy.title") })); table.value?.getTableList(); }); }
+
+watch([() => form.operation, () => form.direction], () => { void loadFieldOptions(); });
+</script>
+
+<style scoped lang="scss">
+.page-box { padding: 20px; }
+</style>

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

@@ -0,0 +1,51 @@
+<template>
+  <div class="table-box page-box">
+    <ProTable ref="table" row-key="id" :columns="columns" :header-actions="headerActions" :request-api="requestTable" />
+    <FormDialog v-model="dialog.visible" ref="dialogRef" :title="t(dialog.titleKey)" width="620px" :model="form" :fields="fields" :rules="rules" @confirm="submit" @close="resetForm" />
+  </div>
+</template>
+
+<script setup lang="ts">
+import { computed, 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";
+import ProTable from "@liujitcn/kratos-admin-core/components/ProTable";
+import FormDialog from "@liujitcn/kratos-admin-core/components/Dialog/FormDialog.vue";
+import type { ProFormField, ProFormOption } from "@liujitcn/kratos-admin-core/components/ProForm/interface";
+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 { defBaseRedactRuleService } from "@liujitcn/kratos-admin-system/api/system/base_redact_rule";
+import type { BaseRedactRule, BaseRedactRuleForm, PageBaseRedactRuleRequest } from "@liujitcn/kratos-admin-system/rpc/system/admin/v1/base_redact_rule";
+import { Status } from "@liujitcn/kratos-admin-system/rpc/common/v1/enum";
+
+defineOptions({ name: "BaseRedactRule", inheritAttrs: false });
+const { BUTTONS } = useAuthButtons();
+const table = ref<ProTableInstance>();
+const dialogRef = ref<InstanceType<typeof FormDialog>>();
+const dialog = reactive({ visible: false, titleKey: "common.action.create_resource" });
+const form = reactive<BaseRedactRuleForm>({ id: 0, code: "", name: "", rule_type: "MASK", rule: '{"mask":{"keep_first":3,"keep_last":4,"mask_char":"*"}}', status: Status.STATUS_ENABLE, version: 1, remark: "" });
+const statusOptions = computed<ProFormOption[]>(() => [{ label: t("common.status.enabled"), value: Status.STATUS_ENABLE }, { label: t("common.status.disabled"), value: Status.STATUS_DISABLE }]);
+const fields = computed<ProFormField[]>(() => [{ prop: "code", label: t("system.base.redact_policy.field.code"), component: "input" }, { prop: "name", label: t("system.base.redact_policy.field.name"), component: "input" }, { prop: "rule_type", label: t("system.base.redact_policy.field.rule_type"), component: "input" }, { prop: "rule", label: t("system.base.redact_policy.field.rule"), component: "textarea", props: { rows: 8 } }, { prop: "version", label: t("system.base.redact_policy.field.version"), component: "input-number", props: { min: 1, precision: 0, style: { width: "100%" } } }, { 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(() => ({ code: [{ required: true, message: t("system.base.redact_policy.validation.code"), trigger: "blur" }], name: [{ required: true, message: t("system.base.redact_policy.validation.name"), trigger: "blur" }], rule_type: [{ required: true, message: t("system.base.redact_policy.validation.rule_type"), trigger: "blur" }], rule: [{ required: true, message: t("system.base.redact_policy.validation.rule"), trigger: "blur" }] }));
+const columns = computed<ColumnProps[]>(() => [{ type: "selection", width: 55 }, { prop: "code", label: t("system.base.redact_policy.field.code"), minWidth: 160, search: { el: "input" } }, { prop: "name", label: t("system.base.redact_policy.field.name"), minWidth: 160, search: { el: "input" } }, { prop: "rule_type", label: t("system.base.redact_policy.field.rule_type"), width: 120, search: { el: "input" } }, { prop: "rule", label: t("system.base.redact_policy.field.rule"), minWidth: 240, showOverflowTooltip: true }, { prop: "version", label: t("system.base.redact_policy.field.version"), width: 80 }, { prop: "status", label: t("common.field.status"), width: 100, cellType: "status", statusProps: { activeValue: Status.STATUS_ENABLE, inactiveValue: Status.STATUS_DISABLE, activeText: t("common.status.enabled"), inactiveText: t("common.status.disabled"), disabled: () => !BUTTONS.value["base:redact-rule:status"], beforeChange: scope => changeStatus(scope.row as BaseRedactRule) } }, { prop: "operation", label: t("common.field.operation"), width: 140, fixed: "right", 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) }, { 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) { resetForm(); dialog.titleKey = id ? "common.action.edit_resource" : "common.action.create_resource"; dialog.visible = true; if (id) Object.assign(form, await defBaseRedactRuleService.GetBaseRedactRule({ id })); }
+/** 重置规则表单。 */
+function resetForm() { dialog.visible = false; dialogRef.value?.resetFields(); Object.assign(form, { id: 0, code: "", name: "", rule_type: "MASK", rule: '{"mask":{"keep_first":3,"keep_last":4,"mask_char":"*"}}', status: Status.STATUS_ENABLE, version: 1, remark: "" }); }
+/** 提交规则表单。 */
+function submit() { dialogRef.value?.validate()?.then(async valid => { if (!valid) return; const payload = JSON.parse(JSON.stringify(form)) as BaseRedactRuleForm; if (payload.id) await defBaseRedactRuleService.UpdateBaseRedactRule({ base_redact_rule: payload }); else await defBaseRedactRuleService.CreateBaseRedactRule({ base_redact_rule: payload }); ElMessage.success(t(payload.id ? "common.message.update_success" : "common.message.create_success", { resource: t("system.base.redact_policy.tabs.rule") })); resetForm(); table.value?.getTableList(); }); }
+/** 切换规则状态。 */
+async function changeStatus(row: BaseRedactRule) { 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_policy.tabs.rule"), field: t("system.base.redact_policy.field.code"), value: row.code })); await defBaseRedactRuleService.SetBaseRedactRuleStatus({ id: row.id, status: next }); table.value?.getTableList(); return true; } catch { return false; } }
+/** 删除规则模板。 */
+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_policy.tabs.rule") }), 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_policy.tabs.rule") })); table.value?.getTableList(); }); }
+</script>
+
+<style scoped lang="scss">
+.page-box { padding: 20px; }
+</style>

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

@@ -93,10 +93,10 @@ import ProTable from "@liujitcn/kratos-admin-core/components/ProTable";
 import FormDialog from "@liujitcn/kratos-admin-core/components/Dialog/FormDialog.vue";
 import type { ProFormField, ProFormOption } from "@liujitcn/kratos-admin-core/components/ProForm/interface";
 import { useAuthButtons } from "@liujitcn/kratos-admin-core/auth";
-import { defBaseRoleService } from "@liujitcn/kratos-admin-system/api/system/base_role";
+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/base_menu";
-import { defBaseTenantService } from "@liujitcn/kratos-admin-system/api/system/base_tenant";
+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 { Status } from "@liujitcn/kratos-admin-system/rpc/common/v1/enum";
 import { buildPageRequest, normalizeSelectedIds } from "@liujitcn/kratos-admin-core/table";
@@ -163,7 +163,7 @@ const rules = computed(() => ({
   tenant_id: [
     {
       required: true,
-      message: t("common.validation.required_select", { field: t("system.base.role.field.tenant") }),
+      message: t("common.validation.required_select", { field: t("common.field.tenant") }),
       trigger: "change"
     }
   ],
@@ -245,10 +245,10 @@ const isDefaultTenant = computed(() => userStore.userInfo.tenant_code === DEFAUL
 const formFields = computed<ProFormField[]>(() => [
   {
     prop: "tenant_id",
-    label: t("system.base.role.field.tenant"),
+    label: t("common.field.tenant"),
     component: "select",
     props: {
-      placeholder: t("system.base.role.placeholder.tenant"),
+      placeholder: t("common.placeholder.select"),
       filterable: true,
       disabled: Boolean(formData.id),
       onChange: handleFormTenantChange
@@ -306,7 +306,7 @@ const columns = computed<ColumnProps[]>(() => [
     ? ([
         {
           prop: "tenant_id",
-          label: t("system.base.role.field.tenant_short"),
+          label: t("common.field.tenant"),
           minWidth: 140,
           showOverflowTooltip: true,
           search: { el: "select", key: "tenant_id", props: { filterable: true }, order: 1 },
@@ -686,7 +686,7 @@ function handelParentChildLinkedChange(val: CheckboxValueType) {
   padding: 14px;
   background: linear-gradient(180deg, #f8fafc 0%, #f3f6fb 100%);
   border: 1px solid #e4eaf3;
-  border-radius: 12px;
+  border-radius: var(--admin-page-radius);
 }
 .perm-search {
   width: 100%;
@@ -706,7 +706,7 @@ function handelParentChildLinkedChange(val: CheckboxValueType) {
   padding: 6px 10px;
   background: rgb(255 255 255 / 94%);
   border: 1px solid #e4eaf3;
-  border-radius: 10px;
+  border-radius: var(--admin-page-radius);
 }
 .perm-toolbar__group--linkage {
   margin-left: auto;