@liujitcn/kratos-admin-system 0.0.38 → 0.0.40

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

@@ -12,8 +12,13 @@
     <FormDialog
       v-model="dialog.visible"
       ref="formDialogRef"
+      class="system-config-dialog"
       :title="t(dialog.titleKey, { resource: t('system.base.config.resource') })"
-      width="1200px"
+      width="min(1440px, calc(100vw - 32px))"
+      top="4vh"
+      :col-span="12"
+      :gutter="24"
+      :confirm-loading="saving"
       :model="formData"
       :fields="formFields"
       :rules="rules"
@@ -56,6 +61,25 @@
           inline-prompt
         />
       </template>
+      <template #formValue>
+        <div class="config-form-value">
+          <template v-if="formDefinition">
+            <p>
+              <el-icon><component :is="formDefinition.icon" /></el-icon> {{ t(formDefinition.descriptionKey) }}
+            </p>
+            <ProForm
+              :key="formDefinition.key"
+              ref="valueFormRef"
+              :model="formValue"
+              :fields="localizedFormFields"
+              :col-span="12"
+              :gutter="24"
+              label-width="180px"
+            />
+          </template>
+          <el-alert v-else :title="t('system.base.config.message.form_unavailable')" type="warning" :closable="false" />
+        </div>
+      </template>
       <template #nameI18ns>
         <DynamicI18nEditor v-model="nameI18nValues" :source="formData.name" :maxlength="100" />
       </template>
@@ -67,12 +91,14 @@
 </template>
 
 <script setup lang="ts">
-import { computed, h, reactive, ref } from "vue";
+import { computed, h, reactive, ref, watch } from "vue";
 import { useDebounceFn } from "@vueuse/core";
 import type { ColumnProps, HeaderActionProps, ProTableInstance } from "@liujitcn/kratos-admin-core/components/ProTable/interface";
 import ProTable from "@liujitcn/kratos-admin-core/components/ProTable";
+import ProForm from "@liujitcn/kratos-admin-core/components/ProForm/index.vue";
+import { runtimeConfigDefinitions, type RuntimeConfigModel } from "@liujitcn/kratos-admin-system/config";
 import FormDialog from "@liujitcn/kratos-admin-core/components/Dialog/FormDialog.vue";
-import type { ProFormField, ProFormOption } from "@liujitcn/kratos-admin-core/components/ProForm/interface";
+import type { ProFormField, ProFormOption, ProFormInstance } from "@liujitcn/kratos-admin-core/components/ProForm/interface";
 import DictLabel from "@liujitcn/kratos-admin-core/components/Dict/DictLabel.vue";
 import RichTextPreview from "@liujitcn/kratos-admin-core/components/RichTextPreview/index.vue";
 import UploadImg from "@liujitcn/kratos-admin-core/components/Upload/Img.vue";
@@ -88,13 +114,17 @@ import type {
 import type { BaseI18n } from "@liujitcn/kratos-admin-system/rpc/system/admin/v1/base_i18n";
 import { BaseConfigSite } from "@liujitcn/kratos-admin-system/rpc/base/v1/config";
 import { Status } from "@liujitcn/kratos-admin-system/rpc/common/v1/enum";
-import { BaseConfigHiddenStatus, BaseConfigType } from "@liujitcn/kratos-admin-system/rpc/system/admin/v1/base_config";
+import { BaseConfigType } from "@liujitcn/kratos-admin-system/rpc/system/admin/v1/base_config";
 import { I18nTargetType } from "@liujitcn/kratos-admin-system/rpc/system/admin/v1/base_i18n";
 import { buildPageRequest, normalizeSelectedIds } from "@liujitcn/kratos-admin-core/table";
 import { t } from "@liujitcn/kratos-admin-core";
 import DynamicI18nEditor from "@liujitcn/kratos-admin-system/components/DynamicI18nEditor.vue";
 import DynamicI18nCell from "@liujitcn/kratos-admin-system/components/DynamicI18nCell.vue";
-import { getEditableLanguageOptions, type DynamicI18nValue } from "@liujitcn/kratos-admin-system/components/dynamicI18n";
+import {
+  getEditableLanguageOptions,
+  serializeDynamicI18ns,
+  type DynamicI18nValue
+} from "@liujitcn/kratos-admin-system/components/dynamicI18n";
 
 /** 系统配置编辑表单状态，新增时枚举字段保持为空，避免把未知值 0 显示为下拉文本。 */
 type BaseConfigFormState = Omit<BaseConfigForm, "site" | "type"> & {
@@ -113,6 +143,37 @@ const { BUTTONS } = useAuthButtons();
 const proTable = ref<ProTableInstance>();
 const formDialogRef = ref<InstanceType<typeof FormDialog>>();
 
+const saving = ref(false);
+const valueFormRef = ref<ProFormInstance>();
+const formValue = ref<RuntimeConfigModel>({});
+const formDefinition = computed(() => runtimeConfigDefinitions.find(item => item.key === formData.key));
+const localizedFormFields = computed<ProFormField[]>(() =>
+  (formDefinition.value?.fields ?? []).map(field => ({
+    prop: field.prop,
+    label: t(field.labelKey),
+    component: field.component,
+    props: field.props,
+    itemProps: field.itemProps,
+    options: field.options,
+    visible: field.visible,
+    labelTooltip: field.labelTooltipKey ? t(field.labelTooltipKey) : undefined,
+    rules: field.rules?.map(rule => ({
+      ...rule,
+      message: t(
+        rule.messageKey,
+        rule.messageArgs
+          ? Object.fromEntries(
+              Object.entries(rule.messageArgs).map(([key, value]) => [
+                key,
+                typeof value === "object" ? t(value.key) : typeof value === "boolean" ? String(value) : value
+              ])
+            )
+          : undefined
+      )
+    }))
+  }))
+);
+
 const dialog = reactive({
   titleKey: "common.action.create_resource",
   visible: false
@@ -131,8 +192,6 @@ const formData = reactive<BaseConfigFormState>({
   key: "",
   /** 配置value */
   value: "",
-  /** 隐藏状态。 */
-  hidden_status: BaseConfigHiddenStatus.BASE_CONFIG_HIDDEN_STATUS_VISIBLE,
   /** 状态 */
   status: Status.STATUS_ENABLE,
   /** 配置名称非主语言翻译。 */
@@ -141,6 +200,16 @@ const formData = reactive<BaseConfigFormState>({
   value_i18ns: []
 });
 
+/** 切换表单类型或编码时加载对应默认内容。 */
+watch(
+  () => [formData.type, formData.key],
+  () => {
+    loadFormValue();
+    if (formData.type === BaseConfigType.BASE_CONFIG_TYPE_FORM) formData.site = BaseConfigSite.BASE_CONFIG_SITE_SYSTEM;
+  },
+  { flush: "sync" }
+);
+
 /** 将配置值翻译记录转换为编辑器值，缺少记录时保留可编辑的空行。 */
 function normalizeConfigI18ns(targetType: I18nTargetType): DynamicI18nValue[] {
   const records = targetType === I18nTargetType.I18N_TARGET_TYPE_BASE_CONFIG_NAME ? formData.name_i18ns : formData.value_i18ns;
@@ -258,6 +327,7 @@ const dictValueCode = computed(() => BASE_CONFIG_DICT_CODE_MAP[formData.key] ??
 const formFields = computed<ProFormField[]>(() => [
   {
     prop: "name",
+    suffixSlotName: "nameI18ns",
     label: t("system.base.config.field.name"),
     component: "input",
     props: {
@@ -269,12 +339,13 @@ const formFields = computed<ProFormField[]>(() => [
     prop: "site",
     label: t("system.base.config.field.site"),
     component: "dict",
-    props: { code: "base_config_site", disabled: formData.id > 0 }
+    props: { code: "base_config_site", disabled: formData.id > 0 || formData.type === BaseConfigType.BASE_CONFIG_TYPE_FORM }
   },
   {
     prop: "key",
     label: t("system.base.config.field.key"),
-    component: "input",
+    component: formData.type === BaseConfigType.BASE_CONFIG_TYPE_FORM ? "select" : "input",
+    options: runtimeConfigDefinitions.map(item => ({ label: `${t(item.titleKey)}（${item.key}）`, value: item.key })),
     props: {
       placeholder: t("common.validation.required_input", { field: t("system.base.config.field.key") }),
       disabled: formData.id > 0
@@ -286,11 +357,20 @@ const formFields = computed<ProFormField[]>(() => [
     component: "dict",
     props: { code: "base_config_type", disabled: formData.id > 0 }
   },
+  {
+    prop: "formValue",
+    label: t("system.base.config.field.value"),
+    component: "slot",
+    slotName: "formValue",
+    visible: model => model.type === BaseConfigType.BASE_CONFIG_TYPE_FORM,
+    colSpan: 24
+  },
   {
     prop: "value",
     label: t("system.base.config.field.value"),
     component: "slot",
     slotName: "textValue",
+    suffixSlotName: "valueI18ns",
     visible: model => model.type == BaseConfigType.BASE_CONFIG_TYPE_TEXT
   },
   {
@@ -305,6 +385,7 @@ const formFields = computed<ProFormField[]>(() => [
     label: t("system.base.config.field.value"),
     component: "slot",
     slotName: "richTextValue",
+    suffixSlotName: "valueI18ns",
     visible: model => model.type == BaseConfigType.BASE_CONFIG_TYPE_RICH_TEXT,
     colSpan: 24
   },
@@ -323,22 +404,12 @@ const formFields = computed<ProFormField[]>(() => [
     visible: model => model.type == BaseConfigType.BASE_CONFIG_TYPE_BOOLEAN
   },
   {
-    prop: "i18ns",
-    label: t("system.base.i18n.field.name_i18ns"),
-    component: "slot",
-    slotName: "nameI18ns",
-    colSpan: 24
-  },
-  {
-    prop: "i18ns",
-    label: t("system.base.i18n.field.value_i18ns"),
-    component: "slot",
-    slotName: "valueI18ns",
-    visible: model =>
-      model.type == BaseConfigType.BASE_CONFIG_TYPE_TEXT || model.type == BaseConfigType.BASE_CONFIG_TYPE_RICH_TEXT,
-    colSpan: 24
-  },
-  { prop: "status", label: t("common.field.status"), component: "radio-group", options: statusOptions.value }
+    prop: "status",
+    label: t("common.field.status"),
+    component: "radio-group",
+    options: statusOptions.value,
+    props: { disabled: formData.type === BaseConfigType.BASE_CONFIG_TYPE_FORM }
+  }
 ]);
 
 /** 系统配置表格列配置。 */
@@ -384,7 +455,8 @@ const columns = computed<ColumnProps[]>(() => [
       inactiveValue: Status.STATUS_DISABLE,
       activeText: t("common.status.enabled"),
       inactiveText: t("common.status.disabled"),
-      disabled: () => !BUTTONS.value["base:config:status"],
+      disabled: scope =>
+        !BUTTONS.value["base:config:status"] || (scope.row as BaseConfig).type === BaseConfigType.BASE_CONFIG_TYPE_FORM,
       beforeChange: scope => handleBeforeSetStatus(scope.row as BaseConfig)
     }
   },
@@ -411,7 +483,8 @@ const columns = computed<ColumnProps[]>(() => [
         type: "danger",
         link: true,
         icon: Delete,
-        hidden: () => !BUTTONS.value["base:config:delete"],
+        hidden: scope =>
+          !BUTTONS.value["base:config:delete"] || (scope.row as BaseConfig).type === BaseConfigType.BASE_CONFIG_TYPE_FORM,
         onClick: scope => handleDelete(scope.row as BaseConfig)
       }
     ]
@@ -433,6 +506,7 @@ function renderConfigNameCell(row: BaseConfig) {
  * 将配置键渲染为可悬停查看配置值的单元格。
  */
 function renderConfigKeyCell(row: BaseConfig) {
+  if (row.type === BaseConfigType.BASE_CONFIG_TYPE_FORM) return h("span", row.key);
   return h(
     ElTooltip,
     {
@@ -537,10 +611,23 @@ async function handleOpenDialog(configId?: number) {
   await loadEnabledBaseLanguages();
   resetForm();
   dialog.titleKey = configId ? "common.action.edit_resource" : "common.action.create_resource";
+  if (configId) {
+    Object.assign(formData, await defBaseConfigService.GetBaseConfig({ id: configId }));
+    if (formData.type === BaseConfigType.BASE_CONFIG_TYPE_FORM) {
+      loadFormValue(formData.value);
+    }
+  }
   dialog.visible = true;
-  if (!configId) return;
+}
 
-  Object.assign(formData, await defBaseConfigService.GetBaseConfig({ id: configId }));
+/** 按注册定义创建独立模型，并用已保存的配置值覆盖默认值。 */
+function loadFormValue(value?: string) {
+  const definition = formDefinition.value;
+  formValue.value =
+    formData.type === BaseConfigType.BASE_CONFIG_TYPE_FORM && definition
+      ? Object.assign(definition.createModel(), value ? JSON.parse(value) : {})
+      : {};
+  valueFormRef.value?.clearValidate();
 }
 
 /**
@@ -563,36 +650,62 @@ function resetForm() {
   formData.type = undefined;
   formData.key = "";
   formData.value = "";
-  formData.hidden_status = BaseConfigHiddenStatus.BASE_CONFIG_HIDDEN_STATUS_VISIBLE;
   formData.name_i18ns = [];
   formData.value_i18ns = [];
+  formValue.value = {};
+  valueFormRef.value?.clearValidate();
   formData.status = Status.STATUS_ENABLE;
 }
 
 /**
  * 提交系统配置表单。
  */
-function handleSubmit() {
-  if (formData.type === BaseConfigType.BASE_CONFIG_TYPE_BOOLEAN) {
+async function handleSubmit() {
+  if (formData.type === BaseConfigType.BASE_CONFIG_TYPE_FORM) {
+    if (!formDefinition.value) {
+      ElMessage.warning(t("system.base.config.message.form_unavailable"));
+      return;
+    }
+    if ((await valueFormRef.value?.validate()) !== true) return;
+    formData.value = JSON.stringify(formValue.value);
+  } else if (formData.type === BaseConfigType.BASE_CONFIG_TYPE_BOOLEAN) {
     formData.value = formData.value === "true" ? "true" : "false";
   }
-  formDialogRef.value?.validate()?.then(valid => {
-    if (!valid) return;
-
+  if ((await formDialogRef.value?.validate()) !== true) return;
+  saving.value = true;
+  try {
     const submitData = JSON.parse(JSON.stringify(formData)) as BaseConfigForm;
-    const request = submitData.id
-      ? defBaseConfigService.UpdateBaseConfig({ base_config: submitData })
-      : defBaseConfigService.CreateBaseConfig({ base_config: submitData });
-    request.then(() => {
-      ElMessage.success(
-        t(submitData.id ? "common.message.update_success" : "common.message.create_success", {
-          resource: t("system.base.config.resource")
-        })
-      );
-      handleCloseDialog();
-      refreshTable();
-    });
-  });
+    submitData.name_i18ns = serializeDynamicI18ns(
+      nameI18nValues.value,
+      I18nTargetType.I18N_TARGET_TYPE_BASE_CONFIG_NAME,
+      submitData.id,
+      submitData.name
+    );
+    submitData.value_i18ns =
+      submitData.type === BaseConfigType.BASE_CONFIG_TYPE_TEXT || submitData.type === BaseConfigType.BASE_CONFIG_TYPE_RICH_TEXT
+        ? serializeDynamicI18ns(
+            valueI18nValues.value,
+            I18nTargetType.I18N_TARGET_TYPE_BASE_CONFIG_VALUE,
+            submitData.id,
+            submitData.value
+          )
+        : [];
+
+    if (submitData.id) {
+      await defBaseConfigService.UpdateBaseConfig({ base_config: submitData });
+    } else {
+      await defBaseConfigService.CreateBaseConfig({ base_config: submitData });
+    }
+    ElMessage.success(
+      t(submitData.id ? "common.message.update_success" : "common.message.create_success", {
+        resource: t("system.base.config.resource")
+      })
+    );
+    handleCloseDialog();
+    refreshTable();
+  } finally {
+    saving.value = false;
+  }
 }
 
 /**
@@ -679,6 +792,15 @@ function handleDelete(selected?: number | string | Array<number | string> | Base
 </script>
 
 <style scoped lang="scss">
+.config-form-value {
+  width: 100%;
+  min-width: 0;
+  > p {
+    margin: 0 0 16px;
+    color: var(--el-text-color-secondary);
+  }
+}
+
 .config-key-cell {
   cursor: pointer;
   border-bottom: 1px dashed var(--el-color-info);
@@ -723,4 +845,17 @@ function handleDelete(selected?: number | string | Array<number | string> | Base
   max-width: 100%;
   height: auto;
 }
+@media (max-width: 767px) {
+  :global(.system-config-dialog .el-col) {
+    flex: 0 0 100%;
+    max-width: 100%;
+  }
+  :global(.system-config-dialog .el-form-item) {
+    flex-direction: column;
+  }
+  :global(.system-config-dialog .el-form-item__label) {
+    justify-content: flex-start;
+    width: auto !important;
+  }
+}
 </style>

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

@@ -21,11 +21,7 @@
       @close="handleCloseDialog"
     >
       <template #i18ns>
-        <DynamicI18nEditor
-          v-model="i18nValues"
-          :source="formData.name"
-          :maxlength="50"
-        />
+        <DynamicI18nEditor v-model="i18nValues" :source="formData.name" :maxlength="50" />
       </template>
     </FormDialog>
   </div>
@@ -124,6 +120,7 @@ const statusOptions = computed<ProFormOption[]>(() => [
 const formFields = computed<ProFormField[]>(() => [
   {
     prop: "name",
+    suffixSlotName: "i18ns",
     label: t("system.base.dict.field.name"),
     component: "input",
     props: { placeholder: t("system.base.dict.placeholder.name") }
@@ -134,7 +131,6 @@ const formFields = computed<ProFormField[]>(() => [
     component: "input",
     props: { placeholder: t("system.base.dict.placeholder.code") }
   },
-  { prop: "i18ns", label: t("system.base.i18n.field.i18ns"), component: "slot", slotName: "i18ns" },
   { prop: "status", label: t("common.field.status"), component: "radio-group", options: statusOptions.value }
 ]);
 
@@ -261,7 +257,7 @@ async function handleOpenDialog(dictId?: number) {
 
   const data = await defBaseDictService.GetBaseDict({ id: dictId });
   Object.assign(formData, data);
-	i18nValues.value = normalizeDynamicI18ns(data.i18ns as DynamicI18nRecord[]);
+  i18nValues.value = normalizeDynamicI18ns(data.i18ns as DynamicI18nRecord[]);
 }
 
 /**
@@ -283,7 +279,7 @@ function resetForm() {
   formData.name = "";
   formData.i18ns = [];
   formData.status = Status.STATUS_ENABLE;
-	i18nValues.value = normalizeDynamicI18ns(undefined);
+  i18nValues.value = normalizeDynamicI18ns(undefined);
 }
 
 /**
@@ -297,7 +293,8 @@ function handleSubmit() {
     submitData.i18ns = serializeDynamicI18ns(
       i18nValues.value,
       I18nTargetType.I18N_TARGET_TYPE_BASE_DICT_NAME,
-      submitData.id
+      submitData.id,
+      submitData.name
     );
     const request = submitData.id
       ? defBaseDictService.UpdateBaseDict({ base_dict: submitData })

package/dist/package/src/views/base/dict/item.vue

@@ -36,11 +36,7 @@
         </div>
       </template>
       <template #i18ns>
-        <DynamicI18nEditor
-          v-model="i18nValues"
-          :source="formData.label"
-          :maxlength="100"
-        />
+        <DynamicI18nEditor v-model="i18nValues" :source="formData.label" :maxlength="100" />
       </template>
     </FormDialog>
   </div>
@@ -147,6 +143,7 @@ const statusOptions = computed<ProFormOption[]>(() => [
 const formFields = computed<ProFormField[]>(() => [
   {
     prop: "label",
+    suffixSlotName: "i18ns",
     label: t("system.base.dict.item.field.label"),
     component: "input",
     props: { placeholder: t("system.base.dict.item.placeholder.label") }
@@ -157,13 +154,6 @@ const formFields = computed<ProFormField[]>(() => [
     component: "input",
     props: { placeholder: t("system.base.dict.item.placeholder.value") }
   },
-  {
-    prop: "i18ns",
-    label: t("system.base.i18n.field.i18ns"),
-    component: "slot",
-    slotName: "i18ns",
-    colSpan: 24
-  },
   {
     prop: "sort",
     label: t("common.field.sort"),
@@ -330,7 +320,7 @@ async function handleOpenDialog(dictItemId?: number) {
 
   const data = await defBaseDictItemService.GetBaseDictItem({ id: dictItemId });
   Object.assign(formData, data);
-	i18nValues.value = normalizeDynamicI18ns(data.i18ns as DynamicI18nRecord[]);
+  i18nValues.value = normalizeDynamicI18ns(data.i18ns as DynamicI18nRecord[]);
 }
 
 /**
@@ -355,7 +345,7 @@ function resetForm() {
   formData.tag_type = "";
   formData.sort = 1;
   formData.status = Status.STATUS_ENABLE;
-	i18nValues.value = normalizeDynamicI18ns(undefined);
+  i18nValues.value = normalizeDynamicI18ns(undefined);
 }
 
 /**
@@ -370,7 +360,8 @@ function handleSubmit() {
     submitData.i18ns = serializeDynamicI18ns(
       i18nValues.value,
       I18nTargetType.I18N_TARGET_TYPE_BASE_DICT_ITEM_LABEL,
-      submitData.id
+      submitData.id,
+      submitData.label
     );
     const request = submitData.id
       ? defBaseDictItemService.UpdateBaseDictItem({ base_dict_item: submitData })

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

@@ -15,11 +15,7 @@
       @close="handleCloseDialog"
     >
       <template #i18ns>
-        <DynamicI18nEditor
-          v-model="i18nValues"
-          :source="formData.name"
-          :maxlength="50"
-        />
+        <DynamicI18nEditor v-model="i18nValues" :source="formData.name" :maxlength="50" />
       </template>
     </FormDialog>
   </div>
@@ -215,7 +211,11 @@ function renderOperationCell(scope: RenderScope<BaseJob>) {
     );
   }
 
-  if (row.status === Status.STATUS_ENABLE && (row.entry_id === undefined || row.entry_id === 0) && BUTTONS.value["base:job:start"]) {
+  if (
+    row.status === Status.STATUS_ENABLE &&
+    (row.entry_id === undefined || row.entry_id === 0) &&
+    BUTTONS.value["base:job:start"]
+  ) {
     actionNodes.push(
       h(
         ElButton,
@@ -249,7 +249,11 @@ function renderOperationCell(scope: RenderScope<BaseJob>) {
     );
   }
 
-  if (row.status === Status.STATUS_ENABLE && (row.entry_id === undefined || row.entry_id === 0) && BUTTONS.value["base:job:exec"]) {
+  if (
+    row.status === Status.STATUS_ENABLE &&
+    (row.entry_id === undefined || row.entry_id === 0) &&
+    BUTTONS.value["base:job:exec"]
+  ) {
     actionNodes.push(
       h(
         ElButton,
@@ -298,17 +302,11 @@ function renderOperationCell(scope: RenderScope<BaseJob>) {
 const formFields = computed<ProFormField[]>(() => [
   {
     prop: "name",
+    suffixSlotName: "i18ns",
     label: t("system.base.job.field.name"),
     component: "input",
     props: { placeholder: t("system.base.job.placeholder.name") }
   },
-  {
-    prop: "i18ns",
-    label: t("system.base.i18n.field.i18ns"),
-    component: "slot",
-    slotName: "i18ns",
-    colSpan: 24
-  },
   {
     prop: "invoke_target",
     label: t("system.base.job.field.invoke_target"),
@@ -427,7 +425,7 @@ async function handleOpenDialog(jobId?: number) {
 
   const data = await defBaseJobService.GetBaseJob({ id: jobId });
   Object.assign(formData, data);
-	i18nValues.value = normalizeDynamicI18ns(data.i18ns as DynamicI18nRecord[]);
+  i18nValues.value = normalizeDynamicI18ns(data.i18ns as DynamicI18nRecord[]);
 }
 
 /**
@@ -451,7 +449,7 @@ function resetForm() {
   formData.cron_expression = "";
   formData.status = Status.STATUS_ENABLE;
   formData.i18ns = [];
-	i18nValues.value = normalizeDynamicI18ns(undefined);
+  i18nValues.value = normalizeDynamicI18ns(undefined);
 }
 
 /**
@@ -465,7 +463,8 @@ function handleSubmit() {
     submitData.i18ns = serializeDynamicI18ns(
       i18nValues.value,
       I18nTargetType.I18N_TARGET_TYPE_BASE_JOB_NAME,
-      submitData.id
+      submitData.id,
+      submitData.name
     );
     const request = submitData.id
       ? defBaseJobService.UpdateBaseJob({ base_job: submitData })

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

@@ -136,6 +136,12 @@ const formFields = computed<ProFormField[]>(() => [
     component: "input-number",
     props: { min: 1, max: 1440, precision: 0 }
   },
+  {
+    prop: "allow_concurrent_login",
+    label: t("system.base.login_policy.field.allow_concurrent_login"),
+    component: "switch",
+    props: { activeText: t("common.status.enabled"), inactiveText: t("common.status.disabled") }
+  },
   {
     prop: "password_min_length",
     label: t("system.base.login_policy.field.password_min_length"),
@@ -160,6 +166,12 @@ const formFields = computed<ProFormField[]>(() => [
     component: "input-number",
     props: { min: 0, max: 3650, precision: 0 }
   },
+  {
+    prop: "mfa_remember_days",
+    label: t("system.base.login_policy.field.mfa_remember_days"),
+    component: "input-number",
+    props: { min: 0, max: 90, precision: 0 }
+  },
   {
     prop: "initial_password",
     label: t("system.base.login_policy.field.initial_password"),
@@ -182,6 +194,7 @@ const formRules = computed(() => ({
     { required: true, message: t("system.base.login_policy.validation.password_min_complexity_classes"), trigger: "change" }
   ],
   password_max_age_days: [{ required: true, message: t("system.base.login_policy.validation.password_max_age_days"), trigger: "change" }]
+  ,mfa_remember_days: [{ required: true, message: t("system.base.login_policy.validation.mfa_remember_days"), trigger: "change" }]
 }));
 
 const columns = computed<ColumnProps[]>(() => [
@@ -207,6 +220,18 @@ const columns = computed<ColumnProps[]>(() => [
   },
   { prop: "max_failed_attempts", label: t("system.base.login_policy.field.max_failed_attempts"), width: 110, align: "right" },
   { prop: "lock_duration_minutes", label: t("system.base.login_policy.field.lock_duration_minutes"), width: 110, align: "right" },
+  {
+    prop: "allow_concurrent_login",
+    label: t("system.base.login_policy.field.allow_concurrent_login"),
+    width: 130,
+    cellType: "status",
+    statusProps: {
+      activeValue: true,
+      inactiveValue: false,
+      activeText: t("common.status.enabled"),
+      inactiveText: t("common.status.disabled")
+    }
+  },
   { prop: "password_min_length", label: t("system.base.login_policy.field.password_min_length"), width: 110, align: "right" },
   { prop: "password_history_count", label: t("system.base.login_policy.field.password_history_count"), width: 110, align: "right" },
   {
@@ -216,6 +241,7 @@ const columns = computed<ColumnProps[]>(() => [
     align: "right"
   },
   { prop: "password_max_age_days", label: t("system.base.login_policy.field.password_max_age_days"), width: 110, align: "right" },
+  { prop: "mfa_remember_days", label: t("system.base.login_policy.field.mfa_remember_days"), width: 130, align: "right" },
   {
     prop: "status",
     label: t("common.field.status"),
@@ -312,10 +338,12 @@ function defaultForm(): BaseLoginPolicyFormState {
     user_id: 0,
     max_failed_attempts: 5,
     lock_duration_minutes: 15,
+    allow_concurrent_login: false,
     password_min_length: 8,
     password_history_count: 3,
     password_min_complexity_classes: 3,
     password_max_age_days: 90,
+    mfa_remember_days: 0,
     initial_password: "",
     status: Status.STATUS_ENABLE,
     rules: []