mooho-base-admin-plus 2.10.9 → 2.10.10

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "mooho-base-admin-plus",
   "description": "MOOHO basic framework for admin by Vue3",
-  "version": "2.10.9",
+  "version": "2.10.10",
   "author": "jinyifan <jinyifan@mooho.com.cn>",
   "license": "MIT",
   "private": false,

package/src/components/view/modal-setting-filtering.vue

@@ -156,17 +156,17 @@
           this.$refs.table.data.forEach(item => {
             let key = item.column;
 
-            if ((item.operatorType = '大于')) {
+            if ((item.operatorType == '大于')) {
               key += '_g';
-            } else if ((item.operatorType = '小于')) {
+            } else if ((item.operatorType == '小于')) {
               key += '_l';
-            } else if ((item.operatorType = '大于等于')) {
+            } else if ((item.operatorType == '大于等于')) {
               key += '_ge';
-            } else if ((item.operatorType = '小于等于')) {
+            } else if ((item.operatorType == '小于等于')) {
               key += '_le';
-            } else if ((item.operatorType = '不等于')) {
+            } else if ((item.operatorType == '不等于')) {
               key += '_n';
-            } else if ((item.operatorType = '文字包含')) {
+            } else if ((item.operatorType == '文字包含')) {
               key += '_c';
             }
 

package/src/layouts/basic-layout/mixins/click-item.js

@@ -1,21 +1,21 @@
-import { findComponentUpward } from 'view-ui-plus/src/utils/assist';
-import { mapState } from 'vuex';
-
-export default {
-  computed: {
-    ...mapState('admin/layout', ['menuSiderReload', 'menuHeaderReload'])
-  },
-  methods: {
-    handleClick(path, type = 'sider') {
-      const current = this.$route.path;
-      if (current === path) {
-        if (type === 'sider' && this.menuSiderReload) this.handleReload();
-        else if (type === 'header' && this.menuHeaderReload) this.handleReload();
-      }
-    },
-    handleReload() {
-      const $layout = findComponentUpward(this, 'BasicLayout');
-      if ($layout) $layout.handleReload();
-    }
-  }
-};
+import { findComponentUpward } from 'view-ui-plus/src/utils/assist';
+import { mapState } from 'vuex';
+
+export default {
+  computed: {
+    ...mapState('admin/layout', ['menuSiderReload', 'menuHeaderReload'])
+  },
+  methods: {
+    handleClick(path, type = 'sider') {
+      const current = this.$route.path;
+      if (current === path) {
+        if (type === 'sider' && this.menuSiderReload) this.handleReload();
+        else if (type === 'header' && this.menuHeaderReload) this.handleReload();
+      }
+    },
+    handleReload() {
+      const $layout = findComponentUpward(this, 'BasicLayout');
+      if ($layout) $layout.handleReload();
+    }
+  }
+};

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/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/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/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/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/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";
+}
+

package/src/styles/font/iconfont.json

@@ -1,65 +1,65 @@
-{
-  "id": "1125611",
-  "name": "iview-admin-pro",
-  "font_family": "i-icon",
-  "css_prefix_text": "i-icon-",
-  "description": "",
-  "glyphs": [
-    {
-      "icon_id": "27328867",
-      "name": "i18n",
-      "font_class": "i18n",
-      "unicode": "e8e9",
-      "unicode_decimal": 59625
-    },
-    {
-      "icon_id": "587065",
-      "name": "refresh",
-      "font_class": "refresh",
-      "unicode": "e7d1",
-      "unicode_decimal": 59345
-    },
-    {
-      "icon_id": "544041",
-      "name": "iconfont-radiobox",
-      "font_class": "record",
-      "unicode": "e61f",
-      "unicode_decimal": 58911
-    },
-    {
-      "icon_id": "2552069",
-      "name": "notification",
-      "font_class": "notification",
-      "unicode": "e69d",
-      "unicode_decimal": 59037
-    },
-    {
-      "icon_id": "3556111",
-      "name": "full-screen",
-      "font_class": "full-screen",
-      "unicode": "e743",
-      "unicode_decimal": 59203
-    },
-    {
-      "icon_id": "1433808",
-      "name": "exit-full-screen",
-      "font_class": "exit-full-screen",
-      "unicode": "e657",
-      "unicode_decimal": 58967
-    },
-    {
-      "icon_id": "6925933",
-      "name": "menu-unfold",
-      "font_class": "menu-unfold",
-      "unicode": "e68b",
-      "unicode_decimal": 59019
-    },
-    {
-      "icon_id": "7839858",
-      "name": "menu-fold",
-      "font_class": "menu-fold",
-      "unicode": "e600",
-      "unicode_decimal": 58880
-    }
-  ]
-}
+{
+  "id": "1125611",
+  "name": "iview-admin-pro",
+  "font_family": "i-icon",
+  "css_prefix_text": "i-icon-",
+  "description": "",
+  "glyphs": [
+    {
+      "icon_id": "27328867",
+      "name": "i18n",
+      "font_class": "i18n",
+      "unicode": "e8e9",
+      "unicode_decimal": 59625
+    },
+    {
+      "icon_id": "587065",
+      "name": "refresh",
+      "font_class": "refresh",
+      "unicode": "e7d1",
+      "unicode_decimal": 59345
+    },
+    {
+      "icon_id": "544041",
+      "name": "iconfont-radiobox",
+      "font_class": "record",
+      "unicode": "e61f",
+      "unicode_decimal": 58911
+    },
+    {
+      "icon_id": "2552069",
+      "name": "notification",
+      "font_class": "notification",
+      "unicode": "e69d",
+      "unicode_decimal": 59037
+    },
+    {
+      "icon_id": "3556111",
+      "name": "full-screen",
+      "font_class": "full-screen",
+      "unicode": "e743",
+      "unicode_decimal": 59203
+    },
+    {
+      "icon_id": "1433808",
+      "name": "exit-full-screen",
+      "font_class": "exit-full-screen",
+      "unicode": "e657",
+      "unicode_decimal": 58967
+    },
+    {
+      "icon_id": "6925933",
+      "name": "menu-unfold",
+      "font_class": "menu-unfold",
+      "unicode": "e68b",
+      "unicode_decimal": 59019
+    },
+    {
+      "icon_id": "7839858",
+      "name": "menu-fold",
+      "font_class": "menu-fold",
+      "unicode": "e600",
+      "unicode_decimal": 58880
+    }
+  ]
+}