From b35314bf833e04179a959a4d6f109f4d42f051f4 Mon Sep 17 00:00:00 2001
From: aixianling <aixianling@sinoecare.com>
Date: Mon, 13 Jun 2022 10:46:55 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=BC=80=E5=8F=91=E5=B1=95?=
 =?UTF-8?q?=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 examples/App.vue                                     | 12 +-----------
 examples/components/mainContent.vue                  |  2 +-
 examples/components/sliderNav.vue                    | 12 ++++++++++--
 package.json                                         |  2 +-
 project/sass/apps/AppBuildManage/AppBuildManage.vue  |  2 +-
 project/sass/apps/AppResident/AppResident.vue        |  2 +-
 project/sass/apps/grid/AppGridBlock/AppGridBlock.vue |  2 +-
 project/sass/apps/grid/AppGridMap/AppGridMap.vue     |  2 +-
 .../sass/apps/grid/AppGridMember/AppGridMember.vue   |  2 +-
 public/index.html                                    |  2 +-
 10 files changed, 19 insertions(+), 21 deletions(-)

diff --git a/examples/App.vue b/examples/App.vue
index 5844b409..2227e9d5 100644
--- a/examples/App.vue
+++ b/examples/App.vue
@@ -1,6 +1,6 @@
 <template>
   <div id="app">
-    <header-nav v-if="showTools" :title="serveName">
+    <header-nav v-if="showTools" title="web端产品库">
       <template #right>
         <div @click="showTools=false">隐藏工具栏</div>
         <div @click="handleLogin">点此登录</div>
@@ -29,13 +29,6 @@ export default {
   components: {HeaderNav, MainContent, SliderNav},
   computed: {
     ...mapState(['user']),
-    serveName() {
-      let names = {
-        development: "村微产品库",
-        oms: "运营平台产品分库",
-      }
-      return names[process.env.NODE_ENV]
-    },
     login() {
       let url = '/auth/oauth/token';
       /project\/sass/g.test(location.pathname) && (url += "?corpId=ww596787bb70f08288")
@@ -75,9 +68,6 @@ export default {
   created() {
     if (this.user.token) this.getUserInfo()
     wx = jWeixin
-  },
-  mounted() {
-    document.title = this.serveName
   }
 }
 </script>
diff --git a/examples/components/mainContent.vue b/examples/components/mainContent.vue
index d3b99d95..f9e9c7dc 100644
--- a/examples/components/mainContent.vue
+++ b/examples/components/mainContent.vue
@@ -6,7 +6,7 @@
         <ai-empty>欢迎使用村微产品库</ai-empty>
       </el-tab-pane>
       <el-tab-pane v-for="op in tabs" :key="op.name" :closable="op.name!='工作台'" :name="op.name" :label="op.label" lazy>
-        <router-view/>
+        <router-view v-if="currentTab==tabs.name"/>
       </el-tab-pane>
     </el-tabs>
   </section>
diff --git a/examples/components/sliderNav.vue b/examples/components/sliderNav.vue
index fb9f173f..f116bf13 100644
--- a/examples/components/sliderNav.vue
+++ b/examples/components/sliderNav.vue
@@ -8,6 +8,7 @@
              @click.stop="openKidMenu(item)">
           <i class="prep-icon" :class="item.style||'iconfont iconloudongmoxing'"/>
           <span class="menuName fill" v-text="item.label"/>
+          <el-badge type="warning" :hidden="!item.project" :value="item.project"/>
           <i v-if="item.children" class="iconfont" :class="arrowIcon(item.showChildren)"/>
         </div>
         <div class="kidMenu" v-if="item.showChildren" @click.stop>
@@ -41,7 +42,14 @@ export default {
     ...mapState(['user', 'apps']),
     navs() {
       let reg = new RegExp(`.*${this.searchApp?.replace(/-/g,'')||''}.*`, 'gi')
-      return (this.apps || []).filter(e => !this.searchApp || reg?.test(e.name) || reg?.test(e.label))
+      return (this.apps || []).filter(e => !this.searchApp || reg?.test(e.name) || reg?.test(e.label)).map(e => {
+        if (/project/.test(e.path)) {
+          e.project = e.path.replace(/.*project\/([^\/]+)\/.+/, '$1')
+        } else if (/core/.test(e.path)) {
+          e.project = "core"
+        }
+        return e
+      })
     },
     isConsoleRoute() {
       return this.$route.name == "工作台"
@@ -104,7 +112,7 @@ export default {
 </script>
 <style lang="scss" scoped>
 .sliderNav {
-  width: 200px;
+  min-width: 200px;
   height: 100%;
   transition: width .1s;
   display: flex;
diff --git a/package.json b/package.json
index 354a0986..d1b2e2c5 100644
--- a/package.json
+++ b/package.json
@@ -5,7 +5,7 @@
   "author": "kubbo",
   "main": "lib/cw-webapps.common.js",
   "scripts": {
-    "serve": "vue-cli-service serve",
+    "dev": "vue-cli-service serve",
     "lib": "vue-cli-service build --no-clean --target lib --dest lib packages/index.js&&npm unpublish --force&&npm publish",
     "lib:core": "vue-cli-service build --target lib --dest core/dist core/index.js --name dvcp-core&&npm unpublish dvcp-core --force&&npm publish core/",
     "lib:project": "node project/build.js",
diff --git a/project/sass/apps/AppBuildManage/AppBuildManage.vue b/project/sass/apps/AppBuildManage/AppBuildManage.vue
index 917c668f..0e177a12 100644
--- a/project/sass/apps/AppBuildManage/AppBuildManage.vue
+++ b/project/sass/apps/AppBuildManage/AppBuildManage.vue
@@ -12,7 +12,7 @@ import Add from './components/Add'
 import BuildMsg from './components/BuildMsg'
 
 export default {
-  label: '楼栋管理(sass)',
+  label: '楼栋管理',
   name: 'AppBuildManage',
   props: {
     instance: Function,
diff --git a/project/sass/apps/AppResident/AppResident.vue b/project/sass/apps/AppResident/AppResident.vue
index 1faddcf8..9a179c2c 100644
--- a/project/sass/apps/AppResident/AppResident.vue
+++ b/project/sass/apps/AppResident/AppResident.vue
@@ -22,7 +22,7 @@ import ResidentSta from "./residentSta";
 
 export default {
   name: "AppResident",
-  label: "居民档案(saas)",
+  label: "居民档案",
   props: {
     instance: Function,
     dict: Object,
diff --git a/project/sass/apps/grid/AppGridBlock/AppGridBlock.vue b/project/sass/apps/grid/AppGridBlock/AppGridBlock.vue
index 238346d7..c7393f70 100644
--- a/project/sass/apps/grid/AppGridBlock/AppGridBlock.vue
+++ b/project/sass/apps/grid/AppGridBlock/AppGridBlock.vue
@@ -10,7 +10,7 @@ import Add from "./components/add";
 
 export default {
   name: "AppGridBlock",
-  label: "网格区块(saas)",
+  label: "网格区块",
 
   props: {
     instance: Function,
diff --git a/project/sass/apps/grid/AppGridMap/AppGridMap.vue b/project/sass/apps/grid/AppGridMap/AppGridMap.vue
index 5437a42f..c6918b54 100644
--- a/project/sass/apps/grid/AppGridMap/AppGridMap.vue
+++ b/project/sass/apps/grid/AppGridMap/AppGridMap.vue
@@ -18,7 +18,7 @@ import List from "./components/list";
 
 export default {
   name: "AppGridMap",
-  label: "网格地图(saas)",
+  label: "网格地图",
 
   props: {
     instance: Function,
diff --git a/project/sass/apps/grid/AppGridMember/AppGridMember.vue b/project/sass/apps/grid/AppGridMember/AppGridMember.vue
index 60b249fe..bfddb525 100644
--- a/project/sass/apps/grid/AppGridMember/AppGridMember.vue
+++ b/project/sass/apps/grid/AppGridMember/AppGridMember.vue
@@ -20,7 +20,7 @@ import Family from "./components/Family";
 
 export default {
   name: "AppGridMember",
-  label: "网格管理员(saas)",
+  label: "网格管理员",
   props: {
     instance: Function,
     dict: Object,
diff --git a/public/index.html b/public/index.html
index 6955e48c..6faf9027 100644
--- a/public/index.html
+++ b/public/index.html
@@ -5,7 +5,7 @@
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
     <meta name="viewport" content="width=device-width,initial-scale=1.0">
     <link rel="icon" href="<%= BASE_URL %>favicon.ico">
-    <title>村务云应用库-展示页面</title>
+    <title>web端应用库-展示页面</title>
     <script src="https://res.wx.qq.com/open/js/jweixin-1.2.0.js" referrerpolicy="origin"></script>
     <script src="https://open.work.weixin.qq.com/wwopen/js/jwxwork-1.0.0.js" referrerpolicy="origin"></script>
   </head>