From cb06d11bc1fa15be88e73addd43cea57d9c9fc39 Mon Sep 17 00:00:00 2001 From: vanoneang <525650856@qq.com> Date: Tue, 9 Jul 2019 16:53:47 +0800 Subject: [PATCH 1/3] feat: add auth-disable --- .../base}/preview/preview.vue | 0 src/components/base/table/lin-table.vue | 2 +- src/lin/directives/authorize.js | 21 ++++++++++++++++--- src/lin/plugins/preview/index.js | 2 +- src/views/book/BookList.vue | 2 +- 5 files changed, 21 insertions(+), 6 deletions(-) rename src/{lin/plugins => components/base}/preview/preview.vue (100%) diff --git a/src/lin/plugins/preview/preview.vue b/src/components/base/preview/preview.vue similarity index 100% rename from src/lin/plugins/preview/preview.vue rename to src/components/base/preview/preview.vue diff --git a/src/components/base/table/lin-table.vue b/src/components/base/table/lin-table.vue index 75f46522..5e424f5c 100644 --- a/src/components/base/table/lin-table.vue +++ b/src/components/base/table/lin-table.vue @@ -49,7 +49,7 @@ plain :key="index" size="mini" - v-auth="item.auth ? item.auth : ''" + v-auth="{auth:item.auth ? item.auth : '', type: 'disabled'}" @click.native.prevent.stop="buttonMethods(item.func, scope.$index, scope.row)">{{item.name}} diff --git a/src/lin/directives/authorize.js b/src/lin/directives/authorize.js index d896dbd6..dc245733 100644 --- a/src/lin/directives/authorize.js +++ b/src/lin/directives/authorize.js @@ -16,10 +16,25 @@ function isAllowed(_auth, user, auths) { Vue.directive('auth', { bind(el, binding) { - const isAllow = isAllowed(binding.value, (store.state.user || {}), store.state.auths) + let auth + let type + if (Object.prototype.toString.call(binding.value) === '[object Object]') { + // eslint-disable-next-line prefer-destructuring + auth = binding.value.auth + // eslint-disable-next-line prefer-destructuring + type = binding.value.type + } else { + auth = binding.value + } + const isAllow = isAllowed(auth, (store.state.user || {}), store.state.auths) const element = el - if (!isAllow && binding.value) { - element.style.display = 'none' + if (!isAllow && auth) { + if (type) { + element.disabled = true + element.style.opacity = 0.4 + } else { + element.style.display = 'none' + } } }, }) diff --git a/src/lin/plugins/preview/index.js b/src/lin/plugins/preview/index.js index 3ad2bdbb..f80c5eda 100644 --- a/src/lin/plugins/preview/index.js +++ b/src/lin/plugins/preview/index.js @@ -1,5 +1,5 @@ import Vue from 'vue' -import Preview from './preview.vue' +import Preview from '@/components/base/preview/preview' const previewImage = {} previewImage.install = (Vue, options = {}) => { // eslint-disable-line diff --git a/src/views/book/BookList.vue b/src/views/book/BookList.vue index 79202cf0..f2c958ea 100644 --- a/src/views/book/BookList.vue +++ b/src/views/book/BookList.vue @@ -48,7 +48,7 @@ export default { name: '删除', func: 'handleDelete', type: 'danger', - auth: '删除图书', + auth: 'disabled', }] this.loading = false }, From 3769eb337d2ad51667187e862cc3c240569b2205 Mon Sep 17 00:00:00 2001 From: vanoneang <525650856@qq.com> Date: Sun, 14 Jul 2019 11:13:52 +0800 Subject: [PATCH 2/3] feat: upgrade version --- .env.development | 2 +- package-lock.json | 102 ++++++++-------------- package.json | 2 +- src/components/base/search/lin-search.vue | 2 +- src/config/stage/plugins.js | 4 +- src/lin/directives/authorize.js | 1 + src/views/about/About.vue | 1 + 7 files changed, 44 insertions(+), 70 deletions(-) diff --git a/.env.development b/.env.development index e723b043..8d68bb73 100644 --- a/.env.development +++ b/.env.development @@ -1,3 +1,3 @@ ENV = 'development' -VUE_APP_BASE_URL = 'http://dev.koa.7yue.pro/' \ No newline at end of file +VUE_APP_BASE_URL = 'http://koa.lin.colorful3.com/' \ No newline at end of file diff --git a/package-lock.json b/package-lock.json index b2fc45ba..6e5652e9 100644 --- a/package-lock.json +++ b/package-lock.json @@ -905,6 +905,14 @@ } } }, + "@tinymce/tinymce-vue": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/@tinymce/tinymce-vue/-/tinymce-vue-2.1.0.tgz", + "integrity": "sha512-lDIpeLbkaobS/f00wWaOhGJdiZLdtL0dEDYB4JvqgVeAAoaDFG2PvXXP/kN49xpHpUe8vOdt7xFaN48nrPmsbQ==", + "requires": { + "vue": "^2.5.17" + } + }, "@types/q": { "version": "1.5.1", "resolved": "https://registry.npmjs.org/@types/q/-/q-1.5.1.tgz", @@ -1070,8 +1078,7 @@ "version": "3.0.0", "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz", "integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=", - "dev": true, - "optional": true + "dev": true }, "cross-spawn": { "version": "5.1.0", @@ -1218,7 +1225,6 @@ "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz", "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=", "dev": true, - "optional": true, "requires": { "ansi-regex": "^3.0.0" } @@ -6568,8 +6574,7 @@ "version": "2.1.1", "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz", "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=", - "dev": true, - "optional": true + "dev": true }, "aproba": { "version": "1.2.0", @@ -6593,15 +6598,13 @@ "version": "1.0.0", "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz", "integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c=", - "dev": true, - "optional": true + "dev": true }, "brace-expansion": { "version": "1.1.11", "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==", "dev": true, - "optional": true, "requires": { "balanced-match": "^1.0.0", "concat-map": "0.0.1" @@ -6618,22 +6621,19 @@ "version": "1.1.0", "resolved": "https://registry.npmjs.org/code-point-at/-/code-point-at-1.1.0.tgz", "integrity": "sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c=", - "dev": true, - "optional": true + "dev": true }, "concat-map": { "version": "0.0.1", "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz", "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=", - "dev": true, - "optional": true + "dev": true }, "console-control-strings": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/console-control-strings/-/console-control-strings-1.1.0.tgz", "integrity": "sha1-PXz0Rk22RG6mRL9LOVB/mFEAjo4=", - "dev": true, - "optional": true + "dev": true }, "core-util-is": { "version": "1.0.2", @@ -6764,8 +6764,7 @@ "version": "2.0.3", "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz", "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=", - "dev": true, - "optional": true + "dev": true }, "ini": { "version": "1.3.5", @@ -6779,7 +6778,6 @@ "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz", "integrity": "sha1-754xOG8DGn8NZDr4L95QxFfvAMs=", "dev": true, - "optional": true, "requires": { "number-is-nan": "^1.0.0" } @@ -6796,7 +6794,6 @@ "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz", "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==", "dev": true, - "optional": true, "requires": { "brace-expansion": "^1.1.7" } @@ -6805,15 +6802,13 @@ "version": "0.0.8", "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz", "integrity": "sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0=", - "dev": true, - "optional": true + "dev": true }, "minipass": { "version": "2.3.5", "resolved": "https://registry.npmjs.org/minipass/-/minipass-2.3.5.tgz", "integrity": "sha512-Gi1W4k059gyRbyVUZQ4mEqLm0YIUiGYfvxhF6SIlk3ui1WVxMTGfGdQ2SInh3PDrRTVvPKgULkpJtT4RH10+VA==", "dev": true, - "optional": true, "requires": { "safe-buffer": "^5.1.2", "yallist": "^3.0.0" @@ -6834,7 +6829,6 @@ "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz", "integrity": "sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM=", "dev": true, - "optional": true, "requires": { "minimist": "0.0.8" } @@ -6923,8 +6917,7 @@ "version": "1.0.1", "resolved": "https://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.1.tgz", "integrity": "sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0=", - "dev": true, - "optional": true + "dev": true }, "object-assign": { "version": "4.1.1", @@ -6938,7 +6931,6 @@ "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz", "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=", "dev": true, - "optional": true, "requires": { "wrappy": "1" } @@ -7034,8 +7026,7 @@ "version": "5.1.2", "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz", "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==", - "dev": true, - "optional": true + "dev": true }, "safer-buffer": { "version": "2.1.2", @@ -7077,7 +7068,6 @@ "resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz", "integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=", "dev": true, - "optional": true, "requires": { "code-point-at": "^1.0.0", "is-fullwidth-code-point": "^1.0.0", @@ -7099,7 +7089,6 @@ "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz", "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=", "dev": true, - "optional": true, "requires": { "ansi-regex": "^2.0.0" } @@ -7148,15 +7137,13 @@ "version": "1.0.2", "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz", "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=", - "dev": true, - "optional": true + "dev": true }, "yallist": { "version": "3.0.3", "resolved": "https://registry.npmjs.org/yallist/-/yallist-3.0.3.tgz", "integrity": "sha512-S+Zk8DEWE6oKpV+vI3qWkaK+jSbIK86pCwe2IF/xwIpQ8jEuxpw9NyaGjmp9+BoJv5FV2piqCDcoCtStppiq2A==", - "dev": true, - "optional": true + "dev": true } } }, @@ -7914,8 +7901,7 @@ "ansi-regex": { "version": "2.1.1", "bundled": true, - "dev": true, - "optional": true + "dev": true }, "aproba": { "version": "1.2.0", @@ -7936,14 +7922,12 @@ "balanced-match": { "version": "1.0.0", "bundled": true, - "dev": true, - "optional": true + "dev": true }, "brace-expansion": { "version": "1.1.11", "bundled": true, "dev": true, - "optional": true, "requires": { "balanced-match": "^1.0.0", "concat-map": "0.0.1" @@ -7958,20 +7942,17 @@ "code-point-at": { "version": "1.1.0", "bundled": true, - "dev": true, - "optional": true + "dev": true }, "concat-map": { "version": "0.0.1", "bundled": true, - "dev": true, - "optional": true + "dev": true }, "console-control-strings": { "version": "1.1.0", "bundled": true, - "dev": true, - "optional": true + "dev": true }, "core-util-is": { "version": "1.0.2", @@ -8088,8 +8069,7 @@ "inherits": { "version": "2.0.3", "bundled": true, - "dev": true, - "optional": true + "dev": true }, "ini": { "version": "1.3.5", @@ -8101,7 +8081,6 @@ "version": "1.0.0", "bundled": true, "dev": true, - "optional": true, "requires": { "number-is-nan": "^1.0.0" } @@ -8116,7 +8095,6 @@ "version": "3.0.4", "bundled": true, "dev": true, - "optional": true, "requires": { "brace-expansion": "^1.1.7" } @@ -8124,14 +8102,12 @@ "minimist": { "version": "0.0.8", "bundled": true, - "dev": true, - "optional": true + "dev": true }, "minipass": { "version": "2.3.5", "bundled": true, "dev": true, - "optional": true, "requires": { "safe-buffer": "^5.1.2", "yallist": "^3.0.0" @@ -8150,7 +8126,6 @@ "version": "0.5.1", "bundled": true, "dev": true, - "optional": true, "requires": { "minimist": "0.0.8" } @@ -8231,8 +8206,7 @@ "number-is-nan": { "version": "1.0.1", "bundled": true, - "dev": true, - "optional": true + "dev": true }, "object-assign": { "version": "4.1.1", @@ -8244,7 +8218,6 @@ "version": "1.4.0", "bundled": true, "dev": true, - "optional": true, "requires": { "wrappy": "1" } @@ -8330,8 +8303,7 @@ "safe-buffer": { "version": "5.1.2", "bundled": true, - "dev": true, - "optional": true + "dev": true }, "safer-buffer": { "version": "2.1.2", @@ -8367,7 +8339,6 @@ "version": "1.0.2", "bundled": true, "dev": true, - "optional": true, "requires": { "code-point-at": "^1.0.0", "is-fullwidth-code-point": "^1.0.0", @@ -8387,7 +8358,6 @@ "version": "3.0.1", "bundled": true, "dev": true, - "optional": true, "requires": { "ansi-regex": "^2.0.0" } @@ -8431,14 +8401,12 @@ "wrappy": { "version": "1.0.2", "bundled": true, - "dev": true, - "optional": true + "dev": true }, "yallist": { "version": "3.0.3", "bundled": true, - "dev": true, - "optional": true + "dev": true } } }, @@ -13990,8 +13958,7 @@ "version": "4.0.8", "resolved": "https://registry.npmjs.org/rx-lite/-/rx-lite-4.0.8.tgz", "integrity": "sha1-Cx4Rr4vESDbwSmQH6S2kJGe3lEQ=", - "dev": true, - "optional": true + "dev": true }, "rx-lite-aggregates": { "version": "4.0.8", @@ -15453,6 +15420,11 @@ "integrity": "sha1-QFQRqOfmM5/mTbmiNN4R3DHgK9Q=", "dev": true }, + "tinymce": { + "version": "5.0.11", + "resolved": "https://registry.npmjs.org/tinymce/-/tinymce-5.0.11.tgz", + "integrity": "sha512-V3wRlxsaEOrbh1T3bW0/buR/L+eXsz8w+hJa6E8tfitJNtO9haKqdFCG16oyBEbwpQq9Zc97tHLF2Cx3IX/62w==" + }, "tmp": { "version": "0.0.33", "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.0.33.tgz", diff --git a/package.json b/package.json index 657879f1..ba2051d6 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "lin-cms", - "version": "0.1.0-beta.3", + "version": "0.2.0", "private": true, "scripts": { "serve": "node script/plugin-get-config.js && vue-cli-service serve", diff --git a/src/components/base/search/lin-search.vue b/src/components/base/search/lin-search.vue index 9daca46a..8a9ed3c1 100644 --- a/src/components/base/search/lin-search.vue +++ b/src/components/base/search/lin-search.vue @@ -51,7 +51,7 @@ export default { .lin-search /deep/ .el-input__inner { border-top-left-radius: 20px; border-bottom-left-radius: 20px; - border-right: none; + border-right: none; width: 150px; transition: all 0.2s linear; diff --git a/src/config/stage/plugins.js b/src/config/stage/plugins.js index 8693b4ec..cff65f70 100644 --- a/src/config/stage/plugins.js +++ b/src/config/stage/plugins.js @@ -1,10 +1,10 @@ // 本文件是自动生成, 请勿修改 -import custom from '@/plugins/custom/stage-config' import LinCmsUi from '@/plugins/LinCmsUi/stage-config' +import custom from '@/plugins/custom/stage-config' const pluginsConfig = [ - custom, LinCmsUi, + custom, ] export default pluginsConfig diff --git a/src/lin/directives/authorize.js b/src/lin/directives/authorize.js index dc245733..63100b72 100644 --- a/src/lin/directives/authorize.js +++ b/src/lin/directives/authorize.js @@ -32,6 +32,7 @@ Vue.directive('auth', { if (type) { element.disabled = true element.style.opacity = 0.4 + element.style.cursor = 'not-allowed' } else { element.style.display = 'none' } diff --git a/src/views/about/About.vue b/src/views/about/About.vue index 14fcf20b..1b420b46 100644 --- a/src/views/about/About.vue +++ b/src/views/about/About.vue @@ -36,6 +36,7 @@
  • 圈圈
  • 家乐
  • Jocky
    • +
  • 流乔