From 3a23ab9e65d7bc29734d7ce90a98eec25a826153 Mon Sep 17 00:00:00 2001 From: Poised_flw Date: Wed, 27 Oct 2021 21:41:31 +0800 Subject: [PATCH] add "plugin:vue-scoped-css/all" for .eslintrc.js --- src/tis_app_template_kt/.eslintrc.js | 11 +- src/tis_app_template_kt/package.json | 1 + src/tis_app_template_kt/sdk/tisplatform.json | 20 --- .../src/components/BottomView.vue | 2 +- src/tis_app_template_kt/src/tis/bus.js | 8 +- src/tis_app_template_kt/src/tis/index.js | 6 +- src/tis_app_template_kt/yarn.lock | 123 +++++++++++++++++- 7 files changed, 133 insertions(+), 38 deletions(-) diff --git a/src/tis_app_template_kt/.eslintrc.js b/src/tis_app_template_kt/.eslintrc.js index 5592b18..1f08017 100644 --- a/src/tis_app_template_kt/.eslintrc.js +++ b/src/tis_app_template_kt/.eslintrc.js @@ -3,12 +3,19 @@ module.exports = { env: { node: true }, - extends: ["plugin:vue/essential", "eslint:recommended", "@vue/prettier"], + extends: [ + "plugin:vue/essential", + "eslint:recommended", + "@vue/prettier", + "plugin:vue-scoped-css/all" + ], parserOptions: { parser: "babel-eslint" }, rules: { "no-console": process.env.NODE_ENV === "production" ? "warn" : "off", - "no-debugger": process.env.NODE_ENV === "production" ? "warn" : "off" + "no-debugger": process.env.NODE_ENV === "production" ? "warn" : "off", + "vue-scoped-css/enforce-style-type": ["error", { allows: ['scoped'] }], + "prettier/prettier": 0 } }; diff --git a/src/tis_app_template_kt/package.json b/src/tis_app_template_kt/package.json index ea80b14..3206752 100644 --- a/src/tis_app_template_kt/package.json +++ b/src/tis_app_template_kt/package.json @@ -23,6 +23,7 @@ "eslint": "^6.7.2", "eslint-plugin-prettier": "^3.1.3", "eslint-plugin-vue": "^6.2.2", + "eslint-plugin-vue-scoped-css": "^1.3.0", "lint-staged": "^9.5.0", "postcss-px-to-viewport": "git+https://git.inscloudtech.com/mirrors/postcss-px-to-viewport.git", "prettier": "^1.19.1", diff --git a/src/tis_app_template_kt/sdk/tisplatform.json b/src/tis_app_template_kt/sdk/tisplatform.json index bb6c854..5e3e9c9 100644 --- a/src/tis_app_template_kt/sdk/tisplatform.json +++ b/src/tis_app_template_kt/sdk/tisplatform.json @@ -16,25 +16,5 @@ "/TIS_COMPONENT_MAP2D/js/app.js" ], "preload": false - }, - "TIS_LAYERMANAGER": { - "cssFiles": [ - "/TIS_LAYERMANAGER/css/app.css" - ], - "jsFiles": [ - "/TIS_LAYERMANAGER/js/chunk-vendors.js", - "/TIS_LAYERMANAGER/js/app.js" - ], - "preload": false - }, - "TIS_MGS": { - "cssFiles": [ - "/TIS_MGS/css/app.css" - ], - "jsFiles": [ - "/TIS_MGS/js/chunk-vendors.js", - "/TIS_MGS/js/app.js" - ], - "preload": false } } \ No newline at end of file diff --git a/src/tis_app_template_kt/src/components/BottomView.vue b/src/tis_app_template_kt/src/components/BottomView.vue index 1632b70..fc5468f 100644 --- a/src/tis_app_template_kt/src/components/BottomView.vue +++ b/src/tis_app_template_kt/src/components/BottomView.vue @@ -319,4 +319,4 @@ } } } - \ No newline at end of file + diff --git a/src/tis_app_template_kt/src/tis/bus.js b/src/tis_app_template_kt/src/tis/bus.js index 729b93f..1733521 100644 --- a/src/tis_app_template_kt/src/tis/bus.js +++ b/src/tis_app_template_kt/src/tis/bus.js @@ -4,8 +4,8 @@ import {registerApps} from './scriptsLoader/index' // temp let curBaseUrl = '' -// 挂载vue的示例 -let vueInstance = null +const dev = process.env.NODE_ENV === 'development'; +const baseUrl = dev ? process.env.BASE_URL : ""; // 数据机制，考虑vuex来实现 const bus = new Vue({ data: { @@ -17,10 +17,6 @@ const bus = new Vue({ widgets: [],//在应用模板内部需要加载的widgets }, methods: { - setVueInstance(instance) { - vueInstance = instance - }, - getDeviceType() { return this.deviceType }, diff --git a/src/tis_app_template_kt/src/tis/index.js b/src/tis_app_template_kt/src/tis/index.js index 0f1c48d..3258ef7 100644 --- a/src/tis_app_template_kt/src/tis/index.js +++ b/src/tis_app_template_kt/src/tis/index.js @@ -7,7 +7,6 @@ if (window.__POWERED_BY_QIANKUN__) { import Vue from "vue"; import store from './store' import AsyncComputed from 'vue-async-computed' -import {registerApps} from './scriptsLoader/index' import axios from 'axios' import Vuex from 'vuex' import EventBusExample from '../components/EventBusExample' @@ -20,13 +19,11 @@ const dev = process.env.NODE_ENV === 'development'; // const sdk = process.env.VUE_APP_SDK === 'sdk'; //作为sdk向组件提供能力时，确保加载的资源是当前组件域下的资源， // http://localhost:7001是一个写死的路径。。如何能正确的获取到组件的域 -// 在这个文件中进行对kt的适配 -const baseUrl = dev ? process.env.BASE_URL : ""; -let curBaseUrl = ''; let _App, _instance, _options = {}, // _layout,//由自定义组件和第三方组件组成的布局组件集合 + // eslint-disable-next-line no-unused-vars _props = {}; export function setup(App, options = {}) { @@ -37,7 +34,6 @@ export function setup(App, options = {}) { if (typeof _options.install === "function") { _options.install(Vue); } - // registerApps(_options.components) // 独立运行时 if (!window.__POWERED_BY_QIANKUN__) { Vue.prototype.$tis = bus; diff --git a/src/tis_app_template_kt/yarn.lock b/src/tis_app_template_kt/yarn.lock index 4f50ddf..05fdabb 100644 --- a/src/tis_app_template_kt/yarn.lock +++ b/src/tis_app_template_kt/yarn.lock @@ -2927,6 +2927,13 @@ css-loader@^3.5.3: schema-utils "^2.7.0" semver "^6.3.0" +css-parse@~2.0.0: + version "2.0.0" + resolved "https://registry.npm.taobao.org/css-parse/download/css-parse-2.0.0.tgz#a468ee667c16d81ccf05c58c38d2a97c780dbfd4" + integrity sha1-pGjuZnwW2BzPBcWMONKpfHgNv9Q= + dependencies: + css "^2.0.0" + css-select-base-adapter@^0.1.1: version "0.1.1" resolved "https://registry.npm.taobao.org/css-select-base-adapter/download/css-select-base-adapter-0.1.1.tgz#3b2ff4972cc362ab88561507a95408a1432135d7" @@ -2979,6 +2986,16 @@ css-what@^5.0.0: resolved "https://registry.npmmirror.com/css-what/download/css-what-5.1.0.tgz?cache=0&sync_timestamp=1633863955744&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fcss-what%2Fdownload%2Fcss-what-5.1.0.tgz#3f7b707aadf633baf62c2ceb8579b545bb40f7fe" integrity sha1-P3tweq32M7r2LCzrhXm1RbtA9/4= +css@^2.0.0: + version "2.2.4" + resolved "https://registry.npm.taobao.org/css/download/css-2.2.4.tgz#c646755c73971f2bba6a601e2cf2fd71b1298929" + integrity sha1-xkZ1XHOXHyu6amAeLPL9cbEpiSk= + dependencies: + inherits "^2.0.3" + source-map "^0.6.1" + source-map-resolve "^0.5.2" + urix "^0.1.0" + cssesc@^3.0.0: version "3.0.0" resolved "https://registry.npm.taobao.org/cssesc/download/cssesc-3.0.0.tgz#37741919903b868565e1c09ea747445cd18983ee" @@ -3102,6 +3119,13 @@ debug@^4.0.1, debug@^4.1.0, debug@^4.1.1: dependencies: ms "2.1.2" +debug@~3.1.0: + version "3.1.0" + resolved "https://registry.nlark.com/debug/download/debug-3.1.0.tgz#5bb5a0672628b64149566ba16819e61518c67261" + integrity sha1-W7WgZyYotkFJVmuhaBnmFRjGcmE= + dependencies: + ms "2.0.0" + decamelize@^1.2.0: version "1.2.0" resolved "https://registry.npmmirror.com/decamelize/download/decamelize-1.2.0.tgz?cache=0&sync_timestamp=1633055760479&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fdecamelize%2Fdownload%2Fdecamelize-1.2.0.tgz#f6534d15148269b20352e7bee26f501f9a191290" @@ -3578,6 +3602,19 @@ eslint-plugin-prettier@^3.1.3: dependencies: prettier-linter-helpers "^1.0.0" +eslint-plugin-vue-scoped-css@^1.3.0: + version "1.3.0" + resolved "https://registry.npmmirror.com/eslint-plugin-vue-scoped-css/download/eslint-plugin-vue-scoped-css-1.3.0.tgz#24a551359da83002a2b5c5917343e153cacc20db" + integrity sha1-JKVRNZ2oMAKitcWRc0PhU8rMINs= + dependencies: + eslint-utils "^3.0.0" + lodash "^4.17.19" + postcss "^8.2.4" + postcss-safe-parser "^6.0.0" + postcss-scss "^3.0.0" + postcss-selector-parser "^6.0.2" + postcss-styl "^0.8.0" + eslint-plugin-vue@^6.2.2: version "6.2.2" resolved "https://registry.npmmirror.com/eslint-plugin-vue/download/eslint-plugin-vue-6.2.2.tgz?cache=0&sync_timestamp=1634704359960&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Feslint-plugin-vue%2Fdownload%2Feslint-plugin-vue-6.2.2.tgz#27fecd9a3a24789b0f111ecdd540a9e56198e0fe" @@ -3610,11 +3647,23 @@ eslint-utils@^1.4.3: dependencies: eslint-visitor-keys "^1.1.0" +eslint-utils@^3.0.0: + version "3.0.0" + resolved "https://registry.nlark.com/eslint-utils/download/eslint-utils-3.0.0.tgz#8aebaface7345bb33559db0a1f13a1d2d48c3672" + integrity sha1-iuuvrOc0W7M1WdsKHxOh0tSMNnI= + dependencies: + eslint-visitor-keys "^2.0.0" + eslint-visitor-keys@^1.0.0, eslint-visitor-keys@^1.1.0: version "1.3.0" resolved "https://registry.nlark.com/eslint-visitor-keys/download/eslint-visitor-keys-1.3.0.tgz#30ebd1ef7c2fdff01c3a4f151044af25fab0523e" integrity sha1-MOvR73wv3/AcOk8VEESvJfqwUj4= +eslint-visitor-keys@^2.0.0: + version "2.1.0" + resolved "https://registry.nlark.com/eslint-visitor-keys/download/eslint-visitor-keys-2.1.0.tgz#f65328259305927392c938ed44eb0a5c9b2bd303" + integrity sha1-9lMoJZMFknOSyTjtROsKXJsr0wM= + eslint@^6.7.2: version "6.8.0" resolved "https://registry.npmmirror.com/eslint/download/eslint-6.8.0.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Feslint%2Fdownload%2Feslint-6.8.0.tgz#62262d6729739f9275723824302fb227c8c93ffb" @@ -3900,7 +3949,7 @@ fast-deep-equal@^3.1.1: resolved "https://registry.npm.taobao.org/fast-deep-equal/download/fast-deep-equal-3.1.3.tgz#3a7d56b559d6cbc3eb512325244e619a65c6c525" integrity sha1-On1WtVnWy8PrUSMlJE5hmmXGxSU= -fast-diff@^1.1.2: +fast-diff@^1.1.2, fast-diff@^1.2.0: version "1.2.0" resolved "https://registry.npm.taobao.org/fast-diff/download/fast-diff-1.2.0.tgz#73ee11982d86caaf7959828d519cfe927fac5f03" integrity sha1-c+4RmC2Gyq95WYKNUZz+kn+sXwM= @@ -4290,7 +4339,7 @@ glob-to-regexp@^0.3.0: resolved "https://registry.nlark.com/glob-to-regexp/download/glob-to-regexp-0.3.0.tgz#8c5a1494d2066c570cc3bfe4496175acc4d502ab" integrity sha1-jFoUlNIGbFcMw7/kSWF1rMTVAqs= -glob@^7.0.3, glob@^7.1.2, glob@^7.1.3, glob@^7.1.4: +glob@^7.0.3, glob@^7.1.2, glob@^7.1.3, glob@^7.1.4, glob@^7.1.6: version "7.2.0" resolved "https://registry.npmmirror.com/glob/download/glob-7.2.0.tgz?cache=0&sync_timestamp=1632353796482&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Fglob%2Fdownload%2Fglob-7.2.0.tgz#d15535af7732e02e948f4c41628bd910293f6023" integrity sha1-0VU1r3cy4C6Uj0xBYovZECk/YCM= @@ -5587,6 +5636,11 @@ lodash.memoize@^4.1.2: resolved "https://registry.nlark.com/lodash.memoize/download/lodash.memoize-4.1.2.tgz#bcc6c49a42a2840ed997f323eada5ecd182e0bfe" integrity sha1-vMbEmkKihA7Zl/Mj6tpezRguC/4= +lodash.sortedlastindex@^4.1.0: + version "4.1.0" + resolved "https://registry.nlark.com/lodash.sortedlastindex/download/lodash.sortedlastindex-4.1.0.tgz#4569878196b450dac6aab4ceb0896ceed4a67255" + integrity sha1-RWmHgZa0UNrGqrTOsIls7tSmclU= + lodash.transform@^4.6.0: version "4.6.0" resolved "https://registry.npm.taobao.org/lodash.transform/download/lodash.transform-4.6.0.tgz#12306422f63324aed8483d3f38332b5f670547a0" @@ -5888,6 +5942,11 @@ mkdirp@^0.5.1, mkdirp@^0.5.3, mkdirp@^0.5.5, mkdirp@~0.5.1: dependencies: minimist "^1.2.5" +mkdirp@~1.0.4: + version "1.0.4" + resolved "https://registry.nlark.com/mkdirp/download/mkdirp-1.0.4.tgz?cache=0&sync_timestamp=1624625160603&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fmkdirp%2Fdownload%2Fmkdirp-1.0.4.tgz#3eb5ed62622756d79a5f0e2a221dfebad75c2f7e" + integrity sha1-PrXtYmInVteaXw4qIh3+utdcL34= + move-concurrently@^1.0.1: version "1.0.1" resolved "https://registry.nlark.com/move-concurrently/download/move-concurrently-1.0.1.tgz#be2c005fda32e0b29af1f05d7c4b33214c701f92" @@ -5952,6 +6011,11 @@ nan@^2.12.1: resolved "https://registry.nlark.com/nan/download/nan-2.15.0.tgz?cache=0&sync_timestamp=1628093656744&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fnan%2Fdownload%2Fnan-2.15.0.tgz#3f34a473ff18e15c1b5626b62903b5ad6e665fee" integrity sha1-PzSkc/8Y4VwbVia2KQO1rW5mX+4= +nanoid@^3.1.30: + version "3.1.30" + resolved "https://registry.npmmirror.com/nanoid/download/nanoid-3.1.30.tgz#63f93cc548d2a113dc5dfbc63bfa09e2b9b64362" + integrity sha1-Y/k8xUjSoRPcXfvGO/oJ4rm2Q2I= + nanomatch@^1.2.9: version "1.2.13" resolved "https://registry.npm.taobao.org/nanomatch/download/nanomatch-1.2.13.tgz#b87a8aa4fc0de8fe6be88895b38983ff265bd119" @@ -6918,6 +6982,18 @@ postcss-reduce-transforms@^4.0.2: postcss "^7.0.0" postcss-value-parser "^3.0.0" +postcss-safe-parser@^6.0.0: + version "6.0.0" + resolved "https://registry.nlark.com/postcss-safe-parser/download/postcss-safe-parser-6.0.0.tgz#bb4c29894171a94bc5c996b9a30317ef402adaa1" + integrity sha1-u0wpiUFxqUvFyZa5owMX70Aq2qE= + +postcss-scss@^3.0.0: + version "3.0.5" + resolved "https://registry.npmmirror.com/postcss-scss/download/postcss-scss-3.0.5.tgz#bd484faf05890e48a6f5e097acb3d104cc7b9ac7" + integrity sha1-vUhPrwWJDkim9eCXrLPRBMx7msc= + dependencies: + postcss "^8.2.7" + postcss-selector-parser@^3.0.0: version "3.1.2" resolved "https://registry.nlark.com/postcss-selector-parser/download/postcss-selector-parser-3.1.2.tgz?cache=0&sync_timestamp=1620752939806&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fpostcss-selector-parser%2Fdownload%2Fpostcss-selector-parser-3.1.2.tgz#b310f5c4c0fdaf76f94902bbaa30db6aa84f5270" @@ -6935,6 +7011,17 @@ postcss-selector-parser@^6.0.0, postcss-selector-parser@^6.0.2: cssesc "^3.0.0" util-deprecate "^1.0.2" +postcss-styl@^0.8.0: + version "0.8.0" + resolved "https://registry.npmmirror.com/postcss-styl/download/postcss-styl-0.8.0.tgz#55ab00b92bb2fdc41a6f996afc9c665aed19276b" + integrity sha1-VasAuSuy/cQab5lq/JxmWu0ZJ2s= + dependencies: + debug "^4.1.1" + fast-diff "^1.2.0" + lodash.sortedlastindex "^4.1.0" + postcss "^7.0.27 || ^8.0.0" + stylus "^0.54.7" + postcss-svgo@^4.0.3: version "4.0.3" resolved "https://registry.nlark.com/postcss-svgo/download/postcss-svgo-4.0.3.tgz?cache=0&sync_timestamp=1622234649078&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fpostcss-svgo%2Fdownload%2Fpostcss-svgo-4.0.3.tgz#343a2cdbac9505d416243d496f724f38894c941e" @@ -6971,6 +7058,15 @@ postcss@^7.0.0, postcss@^7.0.1, postcss@^7.0.14, postcss@^7.0.27, postcss@^7.0.3 picocolors "^0.2.1" source-map "^0.6.1" +"postcss@^7.0.27 || ^8.0.0", postcss@^8.2.4, postcss@^8.2.7: + version "8.3.11" + resolved "https://registry.npmmirror.com/postcss/download/postcss-8.3.11.tgz#c3beca7ea811cd5e1c4a3ec6d2e7599ef1f8f858" + integrity sha1-w77KfqgRzV4cSj7G0udZnvH4+Fg= + dependencies: + nanoid "^3.1.30" + picocolors "^1.0.0" + source-map-js "^0.6.2" + prelude-ls@~1.1.2: version "1.1.2" resolved "https://registry.nlark.com/prelude-ls/download/prelude-ls-1.1.2.tgz#21932a549f5e52ffd9a827f570e04be62a97da54" @@ -7511,7 +7607,7 @@ safe-regex@^1.1.0: dependencies: ret "~0.1.10" -"safer-buffer@>= 2.1.2 < 3", safer-buffer@^2.0.2, safer-buffer@^2.1.0, safer-buffer@~2.1.0: +"safer-buffer@>= 2.1.2 < 3", safer-buffer@^2.0.2, safer-buffer@^2.1.0, safer-buffer@^2.1.2, safer-buffer@~2.1.0: version "2.1.2" resolved "https://registry.npm.taobao.org/safer-buffer/download/safer-buffer-2.1.2.tgz#44fa161b0187b9549dd84bb91802f9bd8385cd6a" integrity sha1-RPoWGwGHuVSd2Eu5GAL5vYOFzWo= @@ -7830,7 +7926,12 @@ source-list-map@^2.0.0: resolved "https://registry.npm.taobao.org/source-list-map/download/source-list-map-2.0.1.tgz#3993bd873bfc48479cca9ea3a547835c7c154b34" integrity sha1-OZO9hzv8SEecyp6jpUeDXHwVSzQ= -source-map-resolve@^0.5.0: +source-map-js@^0.6.2: + version "0.6.2" + resolved "https://registry.npm.taobao.org/source-map-js/download/source-map-js-0.6.2.tgz#0bb5de631b41cfbda6cfba8bd05a80efdfd2385e" + integrity sha1-C7XeYxtBz72mz7qL0FqA79/SOF4= + +source-map-resolve@^0.5.0, source-map-resolve@^0.5.2: version "0.5.3" resolved "https://registry.npm.taobao.org/source-map-resolve/download/source-map-resolve-0.5.3.tgz#190866bece7553e1f8f267a2ee82c606b5509a1a" integrity sha1-GQhmvs51U+H48mei7oLGBrVQmho= @@ -8155,6 +8256,20 @@ stylehacks@^4.0.0: postcss "^7.0.0" postcss-selector-parser "^3.0.0" +stylus@^0.54.7: + version "0.54.8" + resolved "https://registry.nlark.com/stylus/download/stylus-0.54.8.tgz#3da3e65966bc567a7b044bfe0eece653e099d147" + integrity sha1-PaPmWWa8Vnp7BEv+DuzmU+CZ0Uc= + dependencies: + css-parse "~2.0.0" + debug "~3.1.0" + glob "^7.1.6" + mkdirp "~1.0.4" + safer-buffer "^2.1.2" + sax "~1.2.4" + semver "^6.3.0" + source-map "^0.7.3" + supports-color@^2.0.0: version "2.0.0" resolved "https://registry.nlark.com/supports-color/download/supports-color-2.0.0.tgz?cache=0&sync_timestamp=1626703414084&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fsupports-color%2Fdownload%2Fsupports-color-2.0.0.tgz#535d045ce6b6363fa40117084629995e9df324c7"