mooho-base-admin-plus 0.1.64 → 0.1.68

package/src/layouts/basic-layout/mixins/sider-menu-badge.js

@@ -1,13 +1,13 @@
-import { mapState } from 'vuex';
-
-export default {
-  computed: {
-    ...mapState('admin/menu', ['siderMenuBadge']),
-    badgeData() {
-      let data = null;
-      const siderMenuBadge = this.siderMenuBadge.find(item => item.path === this.menu.path);
-      if (siderMenuBadge) data = siderMenuBadge;
-      return data;
-    }
-  }
-};
+import { mapState } from 'vuex';
+
+export default {
+  computed: {
+    ...mapState('admin/menu', ['siderMenuBadge']),
+    badgeData() {
+      let data = null;
+      const siderMenuBadge = this.siderMenuBadge.find(item => item.path === this.menu.path);
+      if (siderMenuBadge) data = siderMenuBadge;
+      return data;
+    }
+  }
+};

package/src/layouts/basic-layout/mixins/translate-title.js

@@ -1,11 +1,11 @@
-export default {
-  methods: {
-    tTitle(title) {
-      if (title && title.indexOf('$t:') === 0) {
-        return this.$t(title.split('$t:')[1]);
-      } else {
-        return title;
-      }
-    }
-  }
-};
+export default {
+  methods: {
+    tTitle(title) {
+      if (title && title.indexOf('$t:') === 0) {
+        return this.$t(title.split('$t:')[1]);
+      } else {
+        return title;
+      }
+    }
+  }
+};

package/src/layouts/basic-layout/water-mark/index.vue

@@ -1,29 +1,29 @@
-<template>
-  <div :style="styles" v-if="waterMark.show"></div>
-</template>
-<script>
-  import { mapState } from 'vuex';
-  import getWaterMarkCanvas from '../../../libs/water-mark';
-
-  export default {
-    name: 'i-water-mark',
-    computed: {
-      ...mapState('admin/layout', ['waterMark']),
-      styles() {
-        const url = getWaterMarkCanvas(this.waterMark.text, this.waterMark.options);
-        return {
-          width: '100%',
-          height: '100%',
-          position: 'absolute',
-          top: '0',
-          left: '0',
-          'z-index': '2000',
-          'background-size': '320px',
-          'background-repeat': 'repeat',
-          'background-image': `url(${url})`,
-          'pointer-events': 'none'
-        };
-      }
-    }
-  };
-</script>
+<template>
+  <div :style="styles" v-if="waterMark.show"></div>
+</template>
+<script>
+  import { mapState } from 'vuex';
+  import getWaterMarkCanvas from '../../../libs/water-mark';
+
+  export default {
+    name: 'i-water-mark',
+    computed: {
+      ...mapState('admin/layout', ['waterMark']),
+      styles() {
+        const url = getWaterMarkCanvas(this.waterMark.text, this.waterMark.options);
+        return {
+          width: '100%',
+          height: '100%',
+          position: 'absolute',
+          top: '0',
+          left: '0',
+          'z-index': '2000',
+          'background-size': '320px',
+          'background-repeat': 'repeat',
+          'background-image': `url(${url})`,
+          'pointer-events': 'none'
+        };
+      }
+    }
+  };
+</script>

package/src/libs/lodop/index.js

@@ -1,5 +1,7 @@
 /* eslint-disable no-empty */
 /* eslint-disable no-undef */
+import Setting from '../../setting';
+
 var CreatedOKLodop7766 = null;
 
 //= ===判断是否需要安装CLodop云打印服务器:====
@@ -118,7 +120,7 @@ const getLodop = (oOBJECT, oEMBED) => {
       return LODOP;
     }
     //= ==如下空白位置适合调用统一功能(如注册语句、语言选择等):===
-    LODOP.SET_LICENSES('上海汽车信息产业投资有限公司', '1A1683BD13ED8A56138F8BF8328862FF', '', '');
+    LODOP.SET_LICENSES(Setting.lodop.name, Setting.lodop.key, '', '');
 
     //= ==========================================================
     return LODOP;

package/src/libs/random_str.js

@@ -1,10 +1,10 @@
-// 生成随机字符串
-export default function (len = 32) {
-  const $chars = 'abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ1234567890';
-  const maxPos = $chars.length;
-  let str = '';
-  for (let i = 0; i < len; i++) {
-    str += $chars.charAt(Math.floor(Math.random() * maxPos));
-  }
-  return str;
-}
+// 生成随机字符串
+export default function (len = 32) {
+  const $chars = 'abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ1234567890';
+  const maxPos = $chars.length;
+  let str = '';
+  for (let i = 0; i < len; i++) {
+    str += $chars.charAt(Math.floor(Math.random() * maxPos));
+  }
+  return str;
+}

package/src/libs/request/index.js

@@ -107,7 +107,10 @@ service.interceptors.response.use(
   },
   error => {
     if (error && error.response && error.response.status === 401) {
-      getRouter().push('/login?redirect=' + getRouter().history._startLocation);
+      console.log('1', getRouter());
+      if (getRouter().currentRoute.value.path != '/login') {
+        getRouter().push('/login?redirect=' + getRouter().options.history.location);
+      }
     }
 
     store.commit('admin/loader/end');

package/src/libs/water-mark.js

@@ -1,44 +1,44 @@
-/**
- * @description 生成水印
- * */
-export default function getWaterMarkCanvas(text, options) {
-  const canvas = document.createElement('canvas');
-  const ctx = canvas.getContext('2d');
-  const canvasWidth = 400;
-  const canvasHeight = 400;
-  canvas.width = canvasWidth;
-  canvas.height = canvasHeight;
-  ctx.textAlign = 'center';
-  ctx.textBaseline = 'bottom';
-  ctx.globalAlpha = options.globalAlpha || 0.1;
-  ctx.font = options.font || '20px Microsoft Yahei';
-
-  ctx.translate(canvasWidth / 2, canvasHeight / 2);
-  ctx.rotate(options.rotateAngle || -0.4);
-
-  ctx.translate((-canvasWidth / 2) * 1.2, (-canvasHeight / 2) * 1.2);
-
-  const waterMarkText = [];
-  const chunkWidth = options.chunkWidth || 400;
-  const chunkHeight = options.chunkHeight || 120;
-  const horizontalChunkCount = 0;
-  const verticalChunkCount = 1;
-
-  for (let j = 0, initY = chunkHeight / 2, indent = 0; j <= verticalChunkCount; j += 1) {
-    indent = parseInt(j % 2);
-
-    for (let i = 0, initX = chunkWidth / 2; i <= horizontalChunkCount; i += 1) {
-      waterMarkText.push({
-        text,
-        x: i * chunkWidth + indent * initX,
-        y: j * chunkHeight + initY
-      });
-    }
-  }
-
-  waterMarkText.forEach(item => {
-    ctx.fillText(item.text, item.x, item.y);
-  });
-
-  return ctx.canvas.toDataURL();
-}
+/**
+ * @description 生成水印
+ * */
+export default function getWaterMarkCanvas(text, options) {
+  const canvas = document.createElement('canvas');
+  const ctx = canvas.getContext('2d');
+  const canvasWidth = 400;
+  const canvasHeight = 400;
+  canvas.width = canvasWidth;
+  canvas.height = canvasHeight;
+  ctx.textAlign = 'center';
+  ctx.textBaseline = 'bottom';
+  ctx.globalAlpha = options.globalAlpha || 0.1;
+  ctx.font = options.font || '20px Microsoft Yahei';
+
+  ctx.translate(canvasWidth / 2, canvasHeight / 2);
+  ctx.rotate(options.rotateAngle || -0.4);
+
+  ctx.translate((-canvasWidth / 2) * 1.2, (-canvasHeight / 2) * 1.2);
+
+  const waterMarkText = [];
+  const chunkWidth = options.chunkWidth || 400;
+  const chunkHeight = options.chunkHeight || 120;
+  const horizontalChunkCount = 0;
+  const verticalChunkCount = 1;
+
+  for (let j = 0, initY = chunkHeight / 2, indent = 0; j <= verticalChunkCount; j += 1) {
+    indent = parseInt(j % 2);
+
+    for (let i = 0, initX = chunkWidth / 2; i <= horizontalChunkCount; i += 1) {
+      waterMarkText.push({
+        text,
+        x: i * chunkWidth + indent * initX,
+        y: j * chunkHeight + initY
+      });
+    }
+  }
+
+  waterMarkText.forEach(item => {
+    ctx.fillText(item.text, item.x, item.y);
+  });
+
+  return ctx.canvas.toDataURL();
+}

package/src/pages/template/processPage.vue

@@ -32,7 +32,13 @@
         <Button type="primary" custom-icon="fa fa-save" @click="save">保存</Button>
         <Button
           type="warning"
-          v-if="$refs.form && $refs.form.data && $refs.form.data.application && $refs.form.data.application.status == 'Rejected'"
+          v-if="
+            $refs.form &&
+            $refs.form.data &&
+            $refs.form.data.application &&
+            $refs.form.data.applicationID &&
+            ($refs.form.data.application.status == 'Draft' || $refs.form.data.application.status == 'Rejected')
+          "
           custom-icon="fa fa-trash-alt"
           @click="cancel"
         >

package/src/plugins/log/index.js

@@ -0,0 +1,25 @@
+import store from '../../store';
+import util from '../../libs/util';
+
+export default {
+  install(app) {
+    // 快速打印 log
+    app.config.globalProperties.$log = {
+      ...util.log,
+      push(data) {
+        if (typeof data === 'string') {
+          // 如果传递来的数据是字符串
+          // 赋值给 message 字段
+          // 为了方便使用
+          // eg: this.$log.push('foo text')
+          store.dispatch('admin/log/push', {
+            message: data
+          });
+        } else if (typeof data === 'object') {
+          // 如果传递来的数据是对象
+          store.dispatch('admin/log/push', data);
+        }
+      }
+    };
+  }
+};

package/src/setting.js

@@ -46,6 +46,15 @@ const Setting = {
     // 是否通过远程接口来获取 i81n 文件
     remote: false
   },
+  /**
+   * 打印控件
+   * */
+  lodop: {
+    // 名称
+    name: '南京摩赫信息技术有限公司',
+    // key
+    key: '58C4DF8932E17DEBE409D1E7F683CAFE'
+  },
   /**
    * 布局配置
    * */
@@ -77,7 +86,7 @@ const Setting = {
     // 是否固定顶栏
     headerFix: true,
     // 是否在下滑时隐藏顶栏，需开启 headerFix，如果开启了 tabsFix，Tabs 也会被隐藏
-    headerHide: false,
+    headerHide: true,
     // 是否显示顶部菜单栏
     // 一般来说，侧边的菜单栏足以满足大部分业务，如需动态切换侧边栏，可开启此选项启用顶部一级菜单，此时侧边栏将作为二级菜单
     headerMenu: false,
@@ -120,7 +129,9 @@ const Setting = {
     // 是否允许点击遮罩层关闭
     maskClosable: true,
     // 是否允许拖动
-    draggable: true
+    draggable: true,
+    // 筛选标题栏宽度
+    filterWidth: 125
   },
   /**
    * 多页 Tabs

package/src/store/modules/admin/modules/page.js

@@ -181,37 +181,40 @@ export default {
      */
     open({ state, commit, dispatch }, { name, params, query, fullPath }) {
       return new Promise(async resolve => {
-        // 已经打开的页面
-        let opened = state.opened;
-        // 判断此页面是否已经打开 并且记录位置
-        let pageOpenedIndex = 0;
-        const pageOpened = opened.find((page, index) => {
-          const same = page.fullPath === fullPath;
-          pageOpenedIndex = same ? index : pageOpenedIndex;
-          return same;
-        });
-        if (pageOpened) {
-          // 页面以前打开过
-          await dispatch('openedUpdate', {
-            index: pageOpenedIndex,
-            params,
-            query,
-            fullPath
+        setTimeout(async () => {
+          // 已经打开的页面
+          let opened = state.opened;
+          // 判断此页面是否已经打开 并且记录位置
+          let pageOpenedIndex = 0;
+          const pageOpened = opened.find((page, index) => {
+            const same = page.fullPath === fullPath;
+            pageOpenedIndex = same ? index : pageOpenedIndex;
+            return same;
           });
-        } else {
-          // 页面以前没有打开过
-          let page = state.pool.find(t => t.name === name);
-          // 如果这里没有找到 page 代表这个路由虽然在框架内 但是不参与标签页显示
-          if (page) {
-            await dispatch('add', {
-              tag: Object.assign({}, page),
+          if (pageOpened) {
+            // 页面以前打开过
+            await dispatch('openedUpdate', {
+              index: pageOpenedIndex,
               params,
               query,
               fullPath
             });
+          } else {
+            // 页面以前没有打开过
+            let page = state.pool.find(t => t.name === name);
+            // 如果这里没有找到 page 代表这个路由虽然在框架内 但是不参与标签页显示
+            if (page) {
+              await dispatch('add', {
+                tag: Object.assign({}, page),
+                params,
+                query,
+                fullPath
+              });
+            }
           }
-        }
-        commit('currentSet', fullPath);
+          commit('currentSet', fullPath);
+        });
+
         // end
         resolve();
       });

package/src/styles/common.less

@@ -1,47 +1,47 @@
-#app, body, html{
-    height: 100%;
-}
-body{
-    background-color: @background-color-base;
-    font-size: 14px;
-}
-
-// 隐藏滚动条样式
-.i-scrollbar-hide{
-    &::-webkit-scrollbar{
-        width: 0;
-    }
-    &::-webkit-scrollbar-track{
-        background-color: transparent;
-    }
-    &::-webkit-scrollbar-thumb{
-        background: #e8eaec;
-    }
-}
-
-// 极简滚动条样式
-.i-scrollbar{
-    &::-webkit-scrollbar{
-        width: 6px;
-    }
-    &::-webkit-scrollbar-track{
-        background-color: transparent;
-    }
-    &::-webkit-scrollbar-thumb{
-        background: #808695;
-        border-radius: 4px;
-    }
-}
-
-// 去除 Table 的左右边框，更精简
-.i-table-no-border{
-    .ivu-table th{
-        background-color: #fff;
-    }
-    .ivu-table-wrapper, .ivu-table tr:last-child td{
-        border: none;
-    }
-    .ivu-table:before, .ivu-table:after{
-        display: none;
-    }
-}
+#app, body, html{
+    height: 100%;
+}
+body{
+    background-color: @background-color-base;
+    font-size: 14px;
+}
+
+// 隐藏滚动条样式
+.i-scrollbar-hide{
+    &::-webkit-scrollbar{
+        width: 0;
+    }
+    &::-webkit-scrollbar-track{
+        background-color: transparent;
+    }
+    &::-webkit-scrollbar-thumb{
+        background: #e8eaec;
+    }
+}
+
+// 极简滚动条样式
+.i-scrollbar{
+    &::-webkit-scrollbar{
+        width: 6px;
+    }
+    &::-webkit-scrollbar-track{
+        background-color: transparent;
+    }
+    &::-webkit-scrollbar-thumb{
+        background: #808695;
+        border-radius: 4px;
+    }
+}
+
+// 去除 Table 的左右边框，更精简
+.i-table-no-border{
+    .ivu-table th{
+        background-color: #fff;
+    }
+    .ivu-table-wrapper, .ivu-table tr:last-child td{
+        border: none;
+    }
+    .ivu-table:before, .ivu-table:after{
+        display: none;
+    }
+}

package/src/styles/css/login.css

@@ -323,7 +323,7 @@ i {
 
 .g-side-tab .hd,
 .cf {
-  *zoom: 1;
+  /* *zoom: 1; */
 }
 
 .g-side-tab .hd:before,

package/src/styles/default/index.less

@@ -1,6 +1,6 @@
-// 自定义主题
-// 详见 https://www.iviewui.com/docs/guide/theme
-@import 'view-ui-plus/src/styles/index.less';
-
-@menu-dark-title: #191a23;
-@menu-dark-active-bg: #101117;
+// 自定义主题
+// 详见 https://www.iviewui.com/docs/guide/theme
+@import 'view-ui-plus/src/styles/index.less';
+
+@menu-dark-title: #191a23;
+@menu-dark-active-bg: #101117;

package/src/styles/font/iconfont.css

@@ -1,47 +1,47 @@
-@font-face {
-  font-family: "i-icon"; /* Project id 1125611 */
-  src: url('iconfont.woff2?t=1651052284018') format('woff2'),
-       url('iconfont.woff?t=1651052284018') format('woff'),
-       url('iconfont.ttf?t=1651052284018') format('truetype');
-}
-
-.i-icon {
-  font-family: "i-icon" !important;
-  font-size: 16px;
-  font-style: normal;
-  -webkit-font-smoothing: antialiased;
-  -moz-osx-font-smoothing: grayscale;
-}
-
-.i-icon-i18n:before {
-  content: "\e8e9";
-}
-
-.i-icon-refresh:before {
-  content: "\e7d1";
-}
-
-.i-icon-record:before {
-  content: "\e61f";
-}
-
-.i-icon-notification:before {
-  content: "\e69d";
-}
-
-.i-icon-full-screen:before {
-  content: "\e743";
-}
-
-.i-icon-exit-full-screen:before {
-  content: "\e657";
-}
-
-.i-icon-menu-unfold:before {
-  content: "\e68b";
-}
-
-.i-icon-menu-fold:before {
-  content: "\e600";
-}
-
+@font-face {
+  font-family: "i-icon"; /* Project id 1125611 */
+  src: url('iconfont.woff2?t=1651052284018') format('woff2'),
+       url('iconfont.woff?t=1651052284018') format('woff'),
+       url('iconfont.ttf?t=1651052284018') format('truetype');
+}
+
+.i-icon {
+  font-family: "i-icon" !important;
+  font-size: 16px;
+  font-style: normal;
+  -webkit-font-smoothing: antialiased;
+  -moz-osx-font-smoothing: grayscale;
+}
+
+.i-icon-i18n:before {
+  content: "\e8e9";
+}
+
+.i-icon-refresh:before {
+  content: "\e7d1";
+}
+
+.i-icon-record:before {
+  content: "\e61f";
+}
+
+.i-icon-notification:before {
+  content: "\e69d";
+}
+
+.i-icon-full-screen:before {
+  content: "\e743";
+}
+
+.i-icon-exit-full-screen:before {
+  content: "\e657";
+}
+
+.i-icon-menu-unfold:before {
+  content: "\e68b";
+}
+
+.i-icon-menu-fold:before {
+  content: "\e600";
+}
+