Merge branch 'refs/heads/abp' into digital-collectibles

Yi.Bbs.Vue3/src/views/EditArticle.vue

@@ -28,19 +28,21 @@
             >
           </el-radio-group>
         </el-form-item>
-
         <el-form-item label="权限：" v-if="radio == 'discuss'">
           <el-radio-group v-model="perRadio">
             <el-radio-button label="Public">公开</el-radio-button>
-            <el-radio-button label="Oneself">仅自己可见</el-radio-button>
-            <el-radio-button label="User">部分用户可见</el-radio-button>
+            <el-radio-button label="Role">所选角色可见</el-radio-button>
           </el-radio-group>
         </el-form-item>
         <el-form-item
-            label="可见用户："
-            v-if="radio == 'discuss' && perRadio == 'User'"
+            label="可见角色："
+            v-if="radio == 'discuss' && perRadio == 'Role'"
         >
-          <UserSelectInfo v-model="editForm.permissionUserIds"/>
+          <el-input-tag
+              v-model="editForm.permissionRoleCodes"
+              placeholder="请输入角色code"
+              aria-label="按下回车，可选择多个"
+          />
         </el-form-item>
 
         <el-form-item
@@ -155,7 +157,6 @@
 </template>
 <script setup>
 import MavonEdit from "@/components/MavonEdit.vue";
-import UserSelectInfo from "@/components/UserSelectInfo.vue";
 import {ref, reactive, onMounted, computed} from "vue";
 import {useRoute, useRouter} from "vue-router";
 import {Plus, Download} from "@element-plus/icons-vue";
@@ -221,8 +222,8 @@ const editForm = reactive({
   introduction: "",
   content: "",
   name: "",
-  permissionUserIds: [],
-  discussLables:[]
+  permissionRoleCodes: [],
+  discussLableIds:[]
 });
 
 //组装主题内容： 需要更新主题信息
@@ -249,18 +250,16 @@ const submit = async (formEl) => {
   if (!formEl) return;
   await formEl.validate(async (valid, fields) => {
     if (valid) {
-      discuss.discussLables=selectLabelList.value.map((item) =>item.id);
-      console.log(discuss,"discuss")
       //dicuss主题处理
       if (radio.value == "discuss") {
+        discuss.discussLableIds=selectLabelList.value.map((item) =>item.id);
         discuss.title = editForm.title;
         discuss.introduction = editForm.introduction;
         discuss.content = editForm.content;
         discuss.plateId = discuss.plateId ?? route.query.plateId;
         discuss.cover = dialogImageUrl.value;
         discuss.permissionType = perRadio.value;
-
-        discuss.permissionUserIds = editForm.permissionUserIds;
+        discuss.permissionRoleCodes = editForm.permissionRoleCodes;
         //主题创建
         if (route.query.operType == "create") {
           const response = await discussAdd(discuss);
@@ -274,7 +273,7 @@ const submit = async (formEl) => {
         }
         //主题更新
         else if (route.query.operType == "update") {
-          discuss.discussLables=selectLabelList.value.map((item) =>item.id);
+          discuss.discussLableIds=selectLabelList.value.map((item) =>item.id);
           await discussUpdate(route.query.discussId, discuss);
 
           ElMessage({
@@ -342,8 +341,9 @@ const loadDiscuss = async () => {
   editForm.content = res.content;
   editForm.title = res.title;
   editForm.introduction = res.introduction;
-  editForm.discussLables=res.discussLables;
-
+  editForm.discussLableIds=res.discussLableIds;
+  editForm.permissionRoleCodes = res.permissionRoleCodes;
+  
   //编辑状态，已选择的就是全部
   labelListData.value=res.lables;
   selectLabelList.value=res.lables;
@@ -351,7 +351,7 @@ const loadDiscuss = async () => {
   discuss.plateId = res.plateId;
   dialogImageUrl.value = res.cover;
   perRadio.value = res.permissionType;
-  editForm.permissionUserIds = res.permissionUserIds;
+
 };
 //加载文章
 const loadArticle = async () => {