@liujitcn/kratos-admin-system 0.0.65 → 0.0.67

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

@@ -144,6 +144,7 @@ import { Status } from "@liujitcn/kratos-admin-system/rpc/common/v1/enum";
 import { BaseConfigType } from "@liujitcn/kratos-admin-system/rpc/system/admin/v1/base_config";
 import { buildPageRequest, normalizeSelectedIds } from "@liujitcn/kratos-admin-core/table";
 import { t } from "@liujitcn/kratos-admin-core";
+import { encryptSecret } from "@liujitcn/kratos-admin-core/security";
 import DynamicI18nEditor from "@liujitcn/kratos-admin-system/components/i18n/DynamicI18nEditor.vue";
 import DynamicI18nCell from "@liujitcn/kratos-admin-system/components/i18n/DynamicI18nCell.vue";
 import {
@@ -153,11 +154,13 @@ import {
 } from "@liujitcn/kratos-admin-system/components/i18n/dynamicI18n";
 
 /** 系统配置编辑表单状态，新增时枚举字段保持为空，避免把未知值 0 显示为下拉文本。 */
-type BaseConfigFormState = Omit<BaseConfigForm, "site" | "type"> & {
+type BaseConfigFormState = Omit<BaseConfigForm, "site" | "type" | "value"> & {
   /** 配置位置。 */
   site?: BaseConfigSite;
   /** 配置类型。 */
   type?: BaseConfigType;
+  /** 配置值编辑缓冲，提交时统一加密为 SecretCrypto。 */
+  value: string;
 };
 
 defineOptions({
@@ -337,13 +340,6 @@ const rules = computed(() => ({
       trigger: "blur"
     }
   ],
-  value: [
-    {
-      required: true,
-      message: t("common.validation.required_input", { field: t("system.base.config.field.value") }),
-      trigger: "blur"
-    }
-  ],
   status: [
     {
       required: true,
@@ -661,6 +657,8 @@ async function handleOpenDialog(configId?: number) {
     commit: ({ data }) => {
       if (data) {
         Object.assign(formData, data);
+        // 契约中 value 为 SecretCrypto，编辑缓冲取解密后的明文或脱敏文本。
+        formData.value = data.value?.text ?? "";
         if (formData.type === BaseConfigType.BASE_CONFIG_TYPE_FORM) loadFormValue(formData.value);
       }
       activeTab.value = configId && formData.type === BaseConfigType.BASE_CONFIG_TYPE_FORM ? "form" : "basic";
@@ -774,6 +772,8 @@ async function handleSubmit() {
   saving.value = true;
   try {
     const submitData = JSON.parse(JSON.stringify(formData)) as BaseConfigForm;
+    // 配置值统一密文提交，留空表示保留现有值。
+    submitData.value = formData.value.trim() !== "" ? await encryptSecret(formData.value) : undefined;
     submitData.name_i18ns = serializeDynamicI18ns(
       nameI18nValues.value,
       "base_config.name",
@@ -786,7 +786,7 @@ async function handleSubmit() {
             valueI18nValues.value,
             "base_config.value",
             submitData.id,
-            submitData.value
+            formData.value
           )
         : [];
 

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

@@ -74,7 +74,7 @@ import type { ColumnProps, HeaderActionProps, ProTableInstance } from "@liujitcn
 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 { PASSWORD_CRYPTO_SCENE, encryptPassword } from "@liujitcn/kratos-admin-core/security";
+import { encryptPassword } from "@liujitcn/kratos-admin-core/security";
 import { useTenantScope } from "@liujitcn/kratos-admin-core/tenant";
 import { t } from "@liujitcn/kratos-admin-core";
 import { defBaseLoginPolicyService } from "@liujitcn/kratos-admin-system/api/system/admin/v1/base_login_policy";
@@ -490,7 +490,7 @@ async function handleSubmit() {
     tenant_id: formData.tenant_id ?? 0,
     user_id: formData.user_id ?? 0,
     initial_password: formData.initial_password
-      ? await encryptPassword(formData.initial_password, PASSWORD_CRYPTO_SCENE.PASSWORD_CRYPTO_SCENE_CONFIGURE_PASSWORD_POLICY)
+      ? await encryptPassword(formData.initial_password, )
       : undefined
   };
   if (formData.id) await defBaseLoginPolicyService.UpdateBaseLoginPolicy({ base_login_policy: baseLoginPolicy });

package/dist/package/src/views/base/message-provider/index.vue

@@ -27,6 +27,7 @@ import { useAuthButtons } from "@liujitcn/kratos-admin-core/auth";
 import { buildPageRequest, normalizeSelectedIds } from "@liujitcn/kratos-admin-core/table";
 import { useTenantScope } from "@liujitcn/kratos-admin-core/tenant";
 import { t } from "@liujitcn/kratos-admin-core";
+import { encodeSecretFields } from "@liujitcn/kratos-admin-core/security";
 import { defBaseMessageProviderService } from "@liujitcn/kratos-admin-system/api/system/admin/v1/base_message_provider";
 import type {
   BaseMessageProvider,
@@ -68,8 +69,8 @@ const formFields = computed<ProFormField[]>(() => [
   { prop: "name", label: t("system.base.message_provider.field.name"), component: "input", props: { maxlength: 50 } },
   { prop: "description", label: t("system.base.message_provider.field.description"), component: "input", colSpan: 24, props: { maxlength: 255 } },
   { prop: "icon", label: t("system.base.message_provider.field.icon"), component: "input", props: { maxlength: 100 } },
-  { prop: "client_id", label: t("system.base.message_provider.field.client_id"), component: "input", props: { maxlength: 255 } },
-  { prop: "client_secret", label: t("system.base.message_provider.field.client_secret"), component: "input", props: { type: "password", showPassword: true, maxlength: 1024, placeholder: dialog.editing ? t("system.base.message_provider.placeholder.keep_secret") : "" } },
+  { prop: "client_id", label: t("system.base.message_provider.field.client_id"), component: "input", props: { maxlength: 255, autocomplete: "off" } },
+  { prop: "client_secret", label: t("system.base.message_provider.field.client_secret"), component: "input", secret: { resource: "base_message_provider", field: "client_secret" }, props: { type: "password", showPassword: true, maxlength: 1024, autocomplete: "new-password", placeholder: dialog.editing ? t("system.base.message_provider.placeholder.keep_secret") : "" } },
   { prop: "config_items", label: t("system.base.message_provider.field.config"), component: "kv-list", props: { keyInputProps: { maxlength: 128 } } },
   { prop: "sort", label: t("common.field.sort"), component: "input-number", props: { min: 0, precision: 0 } },
   { prop: "status", label: t("common.field.status"), component: "radio-group", options: statusOptions.value }
@@ -99,7 +100,7 @@ const headerActions = computed<HeaderActionProps[]>(() => [
 ]);
 
 function defaultForm(): FormState {
-  return { id: 0, provider: "", name: "", description: "", icon: "", client_id: "", client_secret: "", secret_configured: false, config: {}, config_items: [], sort: 0, status: Status.STATUS_DISABLE };
+  return { id: 0, provider: "", name: "", description: "", icon: "", client_id: "", client_secret: undefined, secret_configured: false, config: {}, config_items: [], sort: 0, status: Status.STATUS_DISABLE };
 }
 
 async function requestTable(params: Record<string, unknown>) {
@@ -121,8 +122,9 @@ async function handleSubmit() {
   const payload = JSON.parse(JSON.stringify(formData)) as BaseMessageProviderForm & { config_items?: ConfigItem[] };
   delete payload.config_items;
   payload.config = config;
-  if (payload.id) await defBaseMessageProviderService.UpdateBaseMessageProvider({ base_message_provider: payload });
-  else await defBaseMessageProviderService.CreateBaseMessageProvider({ base_message_provider: payload });
+  const form = await encodeSecretFields(formFields.value, payload) as BaseMessageProviderForm;
+  if (form.id) await defBaseMessageProviderService.UpdateBaseMessageProvider({ base_message_provider: form });
+  else await defBaseMessageProviderService.CreateBaseMessageProvider({ base_message_provider: form });
   ElMessage.success(t("common.message.operation_success"));
   dialog.visible = false;
   await proTable.value?.getTableList();

package/dist/package/src/views/base/oauth-provider/index.vue

@@ -39,6 +39,7 @@ import { useAuthButtons } from "@liujitcn/kratos-admin-core/auth";
 import { buildPageRequest, normalizeSelectedIds } from "@liujitcn/kratos-admin-core/table";
 import { useTenantScope } from "@liujitcn/kratos-admin-core/tenant";
 import { t } from "@liujitcn/kratos-admin-core";
+import { encodeSecretFields } from "@liujitcn/kratos-admin-core/security";
 import { defBaseOauthProviderService } from "@liujitcn/kratos-admin-system/api/system/admin/v1/base_oauth_provider";
 import { loadEnabledBaseLanguages } from "@liujitcn/kratos-admin-system/api/system/admin/v1/base_language";
 import type {
@@ -102,8 +103,8 @@ const formFields = computed<ProFormField[]>(() => [
   { prop: "name", suffixSlotName: "nameI18ns", label: t("system.base.oauth_provider.field.name"), component: "input", colSpan: 12, props: { maxlength: 50, placeholder: t("system.base.oauth_provider.placeholder.name") } },
   { prop: "description", suffixSlotName: "descriptionI18ns", label: t("system.base.oauth_provider.field.description"), component: "input", colSpan: 24, props: { maxlength: 255, placeholder: t("system.base.oauth_provider.placeholder.description") } },
   { prop: "icon", label: t("system.base.oauth_provider.field.icon"), component: "input", colSpan: 12, props: { maxlength: 255, placeholder: t("system.base.oauth_provider.placeholder.icon") } },
-  { prop: "client_id", label: t("system.base.oauth_provider.field.client_id"), component: "input", colSpan: 12, props: { maxlength: 255, placeholder: t("system.base.oauth_provider.placeholder.client_id") } },
-  { prop: "client_secret", label: t("system.base.oauth_provider.field.client_secret"), component: "input", colSpan: 12, props: { type: "password", showPassword: true, maxlength: 512, placeholder: dialog.editing ? t("system.base.oauth_provider.placeholder.keep_secret") : t("system.base.oauth_provider.placeholder.client_secret") } },
+  { prop: "client_id", label: t("system.base.oauth_provider.field.client_id"), component: "input", colSpan: 12, props: { maxlength: 255, autocomplete: "off", placeholder: t("system.base.oauth_provider.placeholder.client_id") } },
+  { prop: "client_secret", label: t("system.base.oauth_provider.field.client_secret"), component: "input", colSpan: 12, secret: { resource: "base_oauth_provider", field: "client_secret" }, props: { type: "password", showPassword: true, maxlength: 512, autocomplete: "new-password", placeholder: dialog.editing ? t("system.base.oauth_provider.placeholder.keep_secret") : t("system.base.oauth_provider.placeholder.client_secret") } },
   { prop: "redirect_uri", label: t("system.base.oauth_provider.field.redirect_uri"), component: "input", colSpan: 12, props: { maxlength: 512, placeholder: t("system.base.oauth_provider.placeholder.redirect_uri") } },
   { prop: "scopes", label: t("system.base.oauth_provider.field.scopes"), component: "dynamic-list", colSpan: 12, props: { inputProps: { maxlength: 128, placeholder: t("system.base.oauth_provider.placeholder.scopes") } } },
   { prop: "config_items", label: t("system.base.oauth_provider.field.config"), component: "kv-list", colSpan: 12, props: { keyInputProps: { maxlength: 128 } } },
@@ -152,7 +153,7 @@ const headerActions = computed<HeaderActionProps[]>(() => [
 
 /** 创建默认 OAuth 登录方式表单。 */
 function defaultForm(): OauthProviderFormState {
-  return { id: 0, provider: "", name: "", description: "", icon: "", client_id: "", client_secret: "", secret_configured: false, redirect_uri: "", scopes: [], config: {}, config_items: [], sort: 0, status: Status.STATUS_DISABLE, name_i18ns: [], description_i18ns: [] };
+  return { id: 0, provider: "", name: "", description: "", icon: "", client_id: "", client_secret: undefined, secret_configured: false, redirect_uri: "", scopes: [], config: {}, config_items: [], sort: 0, status: Status.STATUS_DISABLE, name_i18ns: [], description_i18ns: [] };
 }
 
 /** 请求 OAuth 登录方式表格数据。 */
@@ -185,11 +186,13 @@ async function handleSubmit() {
   const payload = JSON.parse(JSON.stringify(formData)) as BaseOauthProviderForm & { config_items?: OauthProviderConfigItem[] };
   delete payload.config_items;
   payload.config = config;
+  const source = await encodeSecretFields(formFields.value, payload);
   payload.scopes = [...new Set(formData.scopes.map(value => value.trim()).filter(Boolean))];
-  payload.name_i18ns = serializeDynamicI18ns(nameI18nValues.value, "base_oauth_provider.name", payload.id, payload.name);
-  payload.description_i18ns = serializeDynamicI18ns(descriptionI18nValues.value, "base_oauth_provider.description", payload.id, payload.description);
-  if (payload.id) await defBaseOauthProviderService.UpdateBaseOauthProvider({ base_oauth_provider: payload });
-  else await defBaseOauthProviderService.CreateBaseOauthProvider({ base_oauth_provider: payload });
+  source.name_i18ns = serializeDynamicI18ns(nameI18nValues.value, "base_oauth_provider.name", source.id, source.name);
+  source.description_i18ns = serializeDynamicI18ns(descriptionI18nValues.value, "base_oauth_provider.description", source.id, source.name);
+  const form = source as BaseOauthProviderForm;
+  if (form.id) await defBaseOauthProviderService.UpdateBaseOauthProvider({ base_oauth_provider: form });
+  else await defBaseOauthProviderService.CreateBaseOauthProvider({ base_oauth_provider: form });
   ElMessage.success(t("common.message.operation_success"));
   dialog.visible = false;
   await proTable.value?.getTableList();

package/dist/package/src/views/base/tenant-project-grant/index.vue

@@ -150,9 +150,12 @@ const columns = computed<ColumnProps[]>(() => [
     showOverflowTooltip: true,
     render: scope => {
       const row = scope.row as BaseTenantProjectGrant;
-      return row.project_id.length === 1 && row.project_id[0] === 0
+      // proto3 JSON 会省略空数组字段，project_id / project_names 可能为 undefined。
+      const projectIds = row.project_id ?? [];
+      const projectNames = row.project_names ?? [];
+      return projectIds.length === 1 && projectIds[0] === 0
         ? t("system.base.tenant_project_grant.all_projects")
-        : row.project_names.join(", ") || row.project_id.join(", ") || t("common.value.none");
+        : projectNames.join(", ") || projectIds.join(", ") || t("common.value.none");
     }
   },
   {
@@ -213,12 +216,14 @@ async function handleOpenDialog(row?: BaseTenantProjectGrant) {
     await formDialogRef.value?.open({
       load: async () => {
         await loadTenantOptions(true);
+        // proto3 JSON 会省略空数组字段，行数据里的 project_id 可能为 undefined。
+        const rowProjectIds = row?.project_id ?? [];
         const nextForm = {
           tenant_id: row?.tenant_id ?? (isDefaultTenant.value ? undefined : Number(tenantOptions.value[0]?.value) || undefined),
           subject_type: row?.subject_type ?? DEFAULT_SUBJECT_TYPE,
           subject_id: row?.subject_id,
-          project_id: row && !(row.project_id.length === 1 && row.project_id[0] === 0) ? [...row.project_id] : [],
-          all: Boolean(row && row.project_id.length === 1 && row.project_id[0] === 0)
+          project_id: row && !(rowProjectIds.length === 1 && rowProjectIds[0] === 0) ? [...rowProjectIds] : [],
+          all: Boolean(row && rowProjectIds.length === 1 && rowProjectIds[0] === 0)
         } satisfies ProjectGrantFormState;
         const [projects, subjects] = await Promise.all([
           requestProjectOptions(nextForm.tenant_id),

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

@@ -85,7 +85,7 @@ import { defBasePostService } from "@liujitcn/kratos-admin-system/api/system/adm
 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";
-import { PASSWORD_CRYPTO_SCENE, encryptPassword } from "@liujitcn/kratos-admin-core/security";
+import { encryptPassword } from "@liujitcn/kratos-admin-core/security";
 import { useTenantScope } from "@liujitcn/kratos-admin-core/tenant";
 import { t } from "@liujitcn/kratos-admin-core";
 
@@ -775,7 +775,7 @@ async function handleConfirmResetPassword() {
   resetPwdFormDialogRef.value?.validate()?.then(async valid => {
     if (!valid) return;
 
-    const pwd = await encryptPassword(resetPwdForm.pwd, PASSWORD_CRYPTO_SCENE.PASSWORD_CRYPTO_SCENE_RESET_BASE_USER_PASSWORD);
+    const pwd = await encryptPassword(resetPwdForm.pwd, );
     defBaseUserService.ResetBaseUserPassword({ id: resetPwdForm.id, pwd }).then(() => {
       ElMessage.success(t("system.base.user.message.reset_password_success", { name: resetPwdTargetName.value }));
       handleCloseResetPasswordDialog();
@@ -796,7 +796,7 @@ const handleSubmit = useDebounceFn(() => {
       pwd:
         submitData.id || !submitData.pwd
           ? undefined
-          : await encryptPassword(submitData.pwd, PASSWORD_CRYPTO_SCENE.PASSWORD_CRYPTO_SCENE_CREATE_BASE_USER)
+          : await encryptPassword(submitData.pwd, )
     } as BaseUserForm;
     const request = submitData.id
       ? defBaseUserService.UpdateBaseUser({ base_user: baseUser })

package/dist/package/src/views/profile/components/security.vue

@@ -192,12 +192,11 @@ import ProForm from "@liujitcn/kratos-admin-core/components/ProForm/index.vue";
 import MfaSetupPanel from "@liujitcn/kratos-admin-core/components/Mfa/MfaSetupPanel.vue";
 import MfaRecoveryCodesDialog from "@liujitcn/kratos-admin-core/components/Mfa/MfaRecoveryCodesDialog.vue";
 import type { ProFormField, ProFormInstance } from "@liujitcn/kratos-admin-core/components/ProForm/interface";
-import type { PasswordCrypto } from "@liujitcn/kratos-admin-core/rpc/common/v1/types";
+import type { SecretCrypto } from "@liujitcn/kratos-admin-core/rpc/common/v1/types";
 import {
   getOauthProviderIcon,
   withOauthProviderDisplay,
   type OauthProviderDisplay,
-  PASSWORD_CRYPTO_SCENE,
   encryptPassword,
   copyText,
   createWebAuthnCredential,
@@ -449,7 +448,7 @@ function openMfaRecovery() {
 }
 
 /** 开始绑定 MFA。 */
-async function beginMfaSetup(password: PasswordCrypto) {
+async function beginMfaSetup(password: SecretCrypto) {
   mfaLoading.value = true;
   try {
     const result = await defMfaService.BeginMfaSetup({ password, setup_ticket: "" });
@@ -494,7 +493,7 @@ async function disableMfa() {
   }
   mfaLoading.value = true;
   try {
-    const password = await encryptPassword(mfaForm.password, PASSWORD_CRYPTO_SCENE.PASSWORD_CRYPTO_SCENE_MFA);
+    const password = await encryptPassword(mfaForm.password);
     if (mfaForm.recoveryCode) {
       await defMfaService.DisableMfa({
         password,
@@ -574,7 +573,7 @@ async function handleMfaAction() {
     return;
   }
   try {
-    const password = await encryptPassword(mfaForm.password, PASSWORD_CRYPTO_SCENE.PASSWORD_CRYPTO_SCENE_MFA);
+    const password = await encryptPassword(mfaForm.password);
     await beginMfaSetup(password);
     mfaForm.password = "";
   } catch (error) {

package/dist/package/src/views/tool/code-gen/config.ts

@@ -74,12 +74,14 @@ const codeGenFormComponentLabelKeys: Record<ProFormComponentType, string> = {
   input: "system.code.gen.component.input",
   password: "system.code.gen.component.password",
   textarea: "system.code.gen.component.textarea",
+  "yaml-editor": "system.code.gen.component.yaml_editor",
   "input-number": "system.code.gen.component.input_number",
   "color-picker": "system.code.gen.component.color_picker",
   segmented: "system.code.gen.component.segmented",
   switch: "system.code.gen.component.switch",
   checkbox: "system.code.gen.component.checkbox",
   select: "system.code.gen.component.select",
+  cascader: "system.code.gen.component.cascader",
   "tenant-select": "system.code.gen.component.select",
   dict: "system.code.gen.component.dict",
   "radio-group": "system.code.gen.component.radio_group",

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@liujitcn/kratos-admin-system",
   "private": false,
-  "version": "0.0.65",
+  "version": "0.0.67",
   "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.65"
+    "@liujitcn/kratos-admin-core": "0.0.67"
   },
   "peerDependencies": {
     "@element-plus/icons-vue": "^2.3.1",