Merge branch 'dev' of http://git.sinoecare.com/sinoecare/digital_village_v2/dvcp_v2_webapp into dev

core/apps/AppMenuManager/list.vue

@@ -62,6 +62,9 @@
           </el-form-item>
         </template>
         <template v-if="form.type==1">
+          <el-form-item label="路由名" prop="route">
+            <span v-text="form.route||'提交保存后会自动生成'"/>
+          </el-form-item>
           <el-form-item label="菜单应用" prop="component">
             <el-input v-model="form.component" placeholder="请输入" clearable/>
           </el-form-item>

examples/App.vue

@@ -11,7 +11,7 @@
       <main-content class="fill"/>
     </el-row>
     <div v-if="dialog" class="sign-box">
-      <ai-sign style="margin: auto" :instance="$axios" :action="{login}"
+      <ai-sign style="margin: auto" :instance="$request" :action="{login}"
                visible @login="getToken" :showScanLogin="false"/>
     </div>
     <el-button type="info" v-if="!showTools" class="fixedBtn" @click="showTools=true">显示工具栏</el-button>
@@ -54,7 +54,7 @@ export default {
 
     },
     handleLogin() {
-      this.$axios.delete("/auth/token/logout").finally(() => {
+      this.$request.delete("/auth/token/logout").finally(() => {
         this.dialog = true
       })
     },

examples/main.js

@@ -17,10 +17,8 @@ Vue.use(vcUI);
 Vue.use(dvui)
 //富文本编辑器配置
 Vue.config.productionTip = false;
-Vue.prototype.$axios = axios;
-Vue.prototype.$request = axios
-Vue.prototype.formatContent = (val) => val.replace(/(\r\n)|(\n)/g, '<br>');
 Object.keys(utils).map((e) => (Vue.prototype[e] = utils[e]));
+Vue.prototype.$request = axios
 new Vue({
   router,
   store,

examples/views/apps/appEntry.vue

@@ -1,6 +1,6 @@
 <template>
   <section class="appEntry">
-    <component v-if="app" :is="app" :instance="$axios" :dict="$dict" :permissions="$permissions"/>
+    <component v-if="app" :is="app" :instance="$request" :dict="$dict" :permissions="$permissions"/>
     <ai-empty v-else>无法找到应用文件</ai-empty>
   </section>
 </template>

packages/work/AppConference/detail.vue

@@ -95,10 +95,10 @@
               <template #left>
                 <el-select v-model="search.joinStatus" placeholder="确认状态" size="small" clearable class="vc-input-160" @change="searchMeetinguser">
                   <el-option
-                    v-for="(item,k) in confirmStatus"
-                    :key="k"
-                    :label="item.label"
-                    :value="k">
+                      v-for="(item,k) in confirmStatus"
+                      :key="k"
+                      :label="item.label"
+                      :value="k">
                   </el-option>
                 </el-select>
               </template>
@@ -109,10 +109,10 @@
               </template>
             </ai-search-bar>
             <ai-table
-              :tableData="info.attendees"
-              :colConfigs="colConfigs"
-              style="margin-top: 12px;"
-              :isShowPagination="false">
+                :tableData="info.attendees"
+                :colConfigs="colConfigs"
+                style="margin-top: 12px;"
+                :isShowPagination="false">
               <el-table-column slot="meetingUserName"
                                label="姓名"
                                align="center"
@@ -201,7 +201,7 @@ export default {
         {
           slot: 'joinStatus',
         },
-        { prop: 'signInStatus', align: 'center', label: '签到', formart: v => v === '1' ? '已签到' : '未签到' },
+        {prop: 'signInStatus', align: 'center', label: '签到', formart: v => v === '1' ? '已签到' : '未签到'},
         {
           slot: 'option',
         }
@@ -249,11 +249,9 @@ export default {
         params: {id}
       }).then(res => {
         if (res?.data) {
-          this.info = {
-            ...res.data,
-            content: this.formatContent(res.data.content || ""),
-            files: res.data.files || []
-          };
+          let {files = [], content} = res.data
+          content = content.replace(/(\r\n)|(\n)/g, "<br>")
+          this.info = {...res.data, content, files};
           this.searchMeetinguser()
         }
       });

project/sass/apps/AppConference/detail.vue

@@ -255,11 +255,9 @@ export default {
         params: {id}
       }).then(res => {
         if (res?.data) {
-          this.info = {
-            ...res.data,
-            content: this.formatContent(res.data.content || ""),
-            files: res.data.files || []
-          };
+          let {files = [], content} = res.data
+          content = content.replace(/(\r\n)|(\n)/g, "<br>")
+          this.info = {...res.data, content, files};
           this.searchMeetinguser()
         }
       });