Merge branch 'v2.0' into debug

src/views/system/RoleMenuAuth.vue

@@ -26,6 +26,10 @@ getRoleOpts()
 async function handleSave(){
   let arr=[]
   menuList.value.forEach(item => {
+    // 只要有子级选中则将父级也传上去
+    if(item.CheckList.length>0){
+      arr.push(item.MenuId)
+    }
     arr=[...arr,...item.CheckList]
   });
   const res=await apiSystemCommon.setRoleMenuData({

src/views/system/helpCenter/AddDocment.vue

@@ -125,7 +125,7 @@ async function handleSaveDocument(type, isAuto) {
   if (btnLoading.value) return
   const validRes = await formIns.value.validate()
   if (validRes !== true) return
-  const htmlContent = reportContentEditorIns.html.get(true)
+  const htmlContent = $('.fr-element').html()
   if (!htmlContent) {
     MessagePlugin.warning('文章内容不能为空')
     return
@@ -179,7 +179,7 @@ async function handleSaveDocument(type, isAuto) {
 //预览
 function handlePreviewDoc(){
   if(btnLoading.value) return
-  const htmlContent = reportContentEditorIns.html.get(true)
+  const htmlContent = $('.fr-element').html()
   if (!htmlContent) {
     MessagePlugin.warning('文章内容不能为空')
     return