角色

src/layout/setting.vue

@@ -30,12 +30,12 @@
           $t("sys.personalizedConfig")
         }}</span></a-divider
       >
-      <a-form-item :label="$t('sys.skin')" :help="$t('sys.skinHelp')">
+      <!-- <a-form-item :label="$t('sys.skin')" :help="$t('sys.skinHelp')">
         {{ currentSkin }}
         <a-button type="primary" size="mini" class="ml-2" @click="skin.open()">
           {{ $t("sys.changeSkin") }}
         </a-button>
-      </a-form-item>
+      </a-form-item> -->
       <a-form-item :label="$t('sys.layouts')" :help="$t('sys.layoutsHelp')">
         <a-select v-model="form.layout" @change="handleLayout">
           <a-option value="classic">{{ $t("sys.layout.classic") }}</a-option>
@@ -51,12 +51,12 @@
       <a-form-item :label="$t('sys.round')" :help="$t('sys.roundHelp')">
         <a-switch v-model="form.roundOpen" @change="handleRound" />
       </a-form-item>
-      <a-form-item :label="$t('sys.ws')" :help="$t('sys.wsHelp')">
+      <!-- <a-form-item :label="$t('sys.ws')" :help="$t('sys.wsHelp')">
         <a-switch v-model="form.ws" @change="handleWs" />
-      </a-form-item>
-      <a-form-item :label="$t('sys.i18n')" :help="$t('sys.i18nHelp')">
+      </a-form-item> -->
+      <!-- <a-form-item :label="$t('sys.i18n')" :help="$t('sys.i18nHelp')">
         <a-switch v-model="form.i18n" @change="handleI18n" />
-      </a-form-item>
+      </a-form-item> -->
       <a-form-item
         :label="$t('sys.language')"
         :help="$t('sys.languageHelp')"
@@ -91,7 +91,7 @@
       >
         <a-switch v-model="form.mode" @change="handleSettingMode" />
       </a-form-item>
-      <a-form-item :label="$t('sys.water')" :help="$t('sys.waterHelp')">
+      <!-- <a-form-item :label="$t('sys.water')" :help="$t('sys.waterHelp')">
         <a-switch v-model="form.waterMark" @change="handleSettingWater" />
       </a-form-item>
       <a-form-item :label="$t('sys.waterContent')" v-if="form.waterMark">
@@ -99,7 +99,7 @@
           v-model="form.waterContent"
           @blur="handleSettingWaterContent"
         />
-      </a-form-item>
+      </a-form-item> -->
       <a-form-item :label="$t('sys.tag')" :help="$t('sys.tagHelp')">
         <a-switch v-model="form.tag" @change="handleSettingTag" />
       </a-form-item>

src/views/system/role/edit.vue

@@ -73,7 +73,7 @@ let title = computed(() => {
 // 表单初始值
 const initialFormData = {
   id: "",
-  parent_id: 0,
+  parent_id: "",
   level: "",
   name: "",
   code: "",
@@ -87,7 +87,7 @@ const formData = reactive({ ...initialFormData });
 
 // 验证规则
 const rules = {
-  // parent_id: [{ required: true, message: '上级角色不能为空' }],
+  // parent_id: [{ required: true, message: "上级角色不能为空" }],
   name: [{ required: true, message: "角色名称不能为空" }],
   code: [{ required: true, message: "角色标识不能为空" }],
 };
@@ -113,7 +113,7 @@ const initPage = async () => {
 // 设置数据
 const setFormData = async (data) => {
   for (const key in formData) {
-    if (data[key] != null && data[key] != undefined) {
+    if (data[key] != null && data[key] != undefined && data[key] != 0) {
       formData[key] = data[key];
     }
   }
@@ -124,7 +124,7 @@ const submit = async (done) => {
   const validate = await formRef.value?.validate();
   if (!validate) {
     loading.value = true;
-    let data = { ...formData };
+    let data = { ...formData, parent_id: formData.parent_id || 0 };
     let result = {};
     if (mode.value === "add") {
       // 添加数据