cloud-web-corejs 1.1.0-dev.6 → 1.1.0-dev.61

package/src/layout/components/TagsView/style.scss

@@ -0,0 +1,92 @@
+// TagsView 页签导航外壳。由组件入口加载，不进入全局 Core 样式入口。
+@import "~@base/styles/variables.scss";
+
+.navbar-tag {
+  height: 31px;
+  -moz-box-flex: 1;
+  -webkit-box-flex: 1;
+  box-flex: 1;
+  padding-right: 100px;
+  width: calc(100% - 38px);
+  margin-left: 38px;
+  border-bottom: solid 2px $baseColor;
+  .telescopMenuIcon {
+    width: 32px;
+    line-height: 32px;
+    height: 31px;
+    cursor: pointer;
+    position: absolute;
+    left: 0;
+    top: 2px;
+    background: #dce5ef;
+    text-align: center;
+    border-radius: 1px;
+  }
+  .el-scrollbar__view {
+    padding-left: 84px;
+  }
+
+  .tags-view-item {
+    display: inline-block;
+    position: relative;
+    cursor: pointer;
+    font-size: $fontSizeBase;
+    line-height: 30px;
+    padding: 0 27px 0 18px;
+    &:first-child {
+      position: absolute;
+      left: 0;
+      background: #f0f5fb;
+      bottom: 16px;
+      z-index: 2;
+    }
+    &:last-of-type {
+      margin-right: 30px;
+    }
+    &.active {
+      color: #fff;
+      //border-bottom:solid 3px  $baseColor;
+      //line-height: 31px;
+      background: $baseColor;
+      border-radius: 2px 34px 0 0;
+      z-index: 3;
+    }
+  }
+  .tags-operBox {
+    position: absolute;
+    top: -1px;
+    right: 0;
+    line-height: 32px;
+    z-index: 2;
+    background: #f1f6fc;
+    bottom: 4px;
+    .item {
+      margin: 0 8px;
+      font-size: 17px;
+      cursor: pointer;
+      outline: none;
+      line-height: 32px;
+    }
+  }
+  .contextmenu {
+    margin: 0;
+    z-index: 3000;
+    position: absolute;
+    list-style-type: none;
+    padding: 5px 0;
+    border-radius: 4px;
+    font-size: $fontSizeBase;
+    font-weight: 400;
+    background: #fff;
+    color: #333;
+    box-shadow: 2px 2px 3px 0 rgba(0, 0, 0, 0.3);
+    li {
+      margin: 0;
+      padding: 7px 16px;
+      cursor: pointer;
+      &:hover {
+        background: $border-color-lighter;
+      }
+    }
+  }
+}

package/src/layout/components/watermark/index.vue

@@ -1,5 +1,5 @@
 <template>
-    <div class="watermarkFlag" :style="'background:url('+imgUrl+')'"></div>
+    <div class="watermarkFlag" :style="{ backgroundImage: imgUrl ? 'url(' + imgUrl + ')' : 'none' }"></div>
 </template>
 <script>
 import {

package/src/layout/defaultLayout.vue

@@ -104,8 +104,8 @@ export default {
 </script>
 
 <style lang="scss" scoped>
-@import '~@/styles/mixin.scss';
-@import '~@/styles/variables.scss';
+@import '~@base/styles/mixin.scss';
+@import '~@base/styles/variables.scss';
 
 .app-wrapper {
   @include clearfix;

package/src/router/index.js

@@ -1,48 +1,43 @@
-import Vue from "vue";
-import Router from "vue-router";
-import { Message } from "element-ui";
-
-Vue.use(Router);
-
-import { constantRoutes as route1s } from "@base/router/modules/system";
-import { constantRoutes as route2s } from "@/router/modules/customer";
-
-export const constantRoutes = [...route1s, ...route2s];
-
-const createRouter = () =>
-  new Router({
-    // mode: 'history', // require service support
-    scrollBehavior: () => ({
-      y: 0,
-    }),
-    routes: constantRoutes,
-  });
-
-const router = createRouter();
-
-// 视图改按需加载后，路由跳转会真的去网络拉 chunk，于是多出一类以前不可能发生的失败：
-// 发版后旧标签页持有的 chunk 哈希已失效（404）、网络超时、或被网关截断（截断表现为
-// chunk 内 SyntaxError，不是网络错误）。vue-router 对这类失败是静默的——点了没反应。
-//
-// 菜单驱动的视图不走这里：store/modules/permission.js 的 loadView 自己 catch 后渲染
-// MenuFallback。这里兜的是 constantRoutes 里那批 () => import(...) 的静态路由。
-//
-// 只提示、不自动 reload：本系统表单页多，自动刷新会吞掉用户未保存的录入；而且一旦
-// 某个 chunk 持续拉不到（例如网关截断），自动刷新会退化成"用户每点一次就刷一次"的循环。
-router.onError((error) => {
-  const msg = (error && error.message) || "";
-  if (!/Loading (CSS )?chunk .* failed|ChunkLoadError/i.test(msg)) return;
-  console.error("[router] 页面资源加载失败：", error);
-  try {
-    Message.error("页面资源加载失败，请刷新页面后重试");
-  } catch (e) {
-    // Message 尚未可用时静默，至少 console 里留了痕迹
-  }
-});
-
-export function resetRouter() {
-  const newRouter = createRouter();
-  router.matcher = newRouter.matcher; // reset router
-}
-
-export default router;
+import Vue from "vue";
+import Router from "vue-router";
+import { promptRefreshForUpdate } from "@base/utils/runtimeRecovery";
+
+Vue.use(Router);
+
+import { constantRoutes as route1s } from "@base/router/modules/system";
+import { constantRoutes as route2s } from "@/router/modules/customer";
+
+export const constantRoutes = [...route1s, ...route2s];
+
+const createRouter = () =>
+  new Router({
+    // mode: 'history', // require service support
+    scrollBehavior: () => ({
+      y: 0,
+    }),
+    routes: constantRoutes,
+  });
+
+const router = createRouter();
+
+// 视图改按需加载后，路由跳转会真的去网络拉 chunk，于是多出一类以前不可能发生的失败：
+// 发版后旧标签页持有的 chunk 哈希已失效（404）、网络超时、或被网关截断（截断表现为
+// chunk 内 SyntaxError，不是网络错误）。vue-router 对这类失败是静默的——点了没反应。
+//
+// 菜单驱动的视图不走这里：store/modules/permission.js 的 loadView 自己 catch 后渲染
+// MenuFallback。这里兜的是 constantRoutes 里那批 () => import(...) 的静态路由。
+//
+// 只提示、不自动 reload：本系统表单页多，自动刷新会吞掉用户未保存的录入；而且一旦
+// 某个 chunk 持续拉不到（例如网关截断），自动刷新会退化成"用户每点一次就刷一次"的循环。
+router.onError((error) => {
+  const msg = (error && error.message) || "";
+  if (!/Loading (CSS )?chunk .* failed|ChunkLoadError/i.test(msg)) return;
+  promptRefreshForUpdate(error);
+});
+
+export function resetRouter() {
+  const newRouter = createRouter();
+  router.matcher = newRouter.matcher; // reset router
+}
+
+export default router;

package/src/router/modules/customer.js

@@ -73,4 +73,16 @@ export const constantRoutes = [
       }, 
     ],
   },*/
+  {
+    path: "",
+    component: () => import("@/layout/index"),
+    children: [
+      {
+        path: "/haier/system/salesman/list",
+        component: () => import("@/views/haier/system/salesman/list.vue"),
+        name: "haierSalesmanPilot",
+        meta: { title: "业务员", icon: "user" },
+      },
+    ],
+  },
 ];

package/src/store/modules/settings.js

@@ -1,4 +1,4 @@
-import variables from '@/styles/element-variables.scss'
+import variables from '@base/styles/element-variables.scss'
 
 const state = {
   tagsView: true,