diff --git a/.fatherrc.js b/.fatherrc.js index 888c4339..f0d53670 100644 --- a/.fatherrc.js +++ b/.fatherrc.js @@ -17,6 +17,7 @@ const headPkgs = [ "fes-plugin-locale", "fes-plugin-enums", "fes-plugin-jest", + "fes-plugin-vuex", "create-fes-app", ]; const tailPkgs = []; diff --git a/packages/create-fes-app/templates/app/h5/package.json b/packages/create-fes-app/templates/app/h5/package.json index c01f4f48..deabbfcd 100644 --- a/packages/create-fes-app/templates/app/h5/package.json +++ b/packages/create-fes-app/templates/app/h5/package.json @@ -32,6 +32,6 @@ "@webank/fes": "^2.0.0-alpha.0", "@webank/fes-plugin-icon": "^2.0.0-alpha.0", "@webank/fes-plugin-request": "^2.0.0-alpha.0", - "vue": "^3.0.4" + "vue": "3.0.5" } } diff --git a/packages/create-fes-app/templates/app/pc/package.json b/packages/create-fes-app/templates/app/pc/package.json index ba482c37..9afc4f9d 100644 --- a/packages/create-fes-app/templates/app/pc/package.json +++ b/packages/create-fes-app/templates/app/pc/package.json @@ -36,7 +36,7 @@ "@webank/fes-plugin-locale": "^2.0.0-alpha.0", "@webank/fes-plugin-model": "^2.0.0-alpha.0", "ant-design-vue": "2.0.0-rc.3", - "vue": "3.0.4" + "vue": "3.0.5" } } \ No newline at end of file diff --git a/packages/fes-plugin-access/package.json b/packages/fes-plugin-access/package.json index 2b75b44c..a031e445 100644 --- a/packages/fes-plugin-access/package.json +++ b/packages/fes-plugin-access/package.json @@ -28,6 +28,6 @@ }, "peerDependencies": { "@webank/fes": "^2.0.0-alpha.0", - "vue": "^3.0.4" + "vue": "3.0.5" } } diff --git a/packages/fes-plugin-enums/package.json b/packages/fes-plugin-enums/package.json index 8c96c2b5..1d93c983 100644 --- a/packages/fes-plugin-enums/package.json +++ b/packages/fes-plugin-enums/package.json @@ -28,6 +28,6 @@ }, "peerDependencies": { "@webank/fes": "^2.0.0-alpha.0", - "vue": "^3.0.4" + "vue": "3.0.5" } } diff --git a/packages/fes-plugin-enums/src/runtime/core.tpl b/packages/fes-plugin-enums/src/runtime/core.tpl index e5789ce1..325a59d7 100644 --- a/packages/fes-plugin-enums/src/runtime/core.tpl +++ b/packages/fes-plugin-enums/src/runtime/core.tpl @@ -25,13 +25,15 @@ function get(name, key, opt = { dir: 'value', extend: []}) { key = '' } let list = ENUMS[name] || [] + let value if (key) { let res = list.filter(item => item.key === key)[0] if (!res) return key - return readonly(parseValueDir(res.value, opt.dir) || key) + value = parseValueDir(res.value, opt.dir) || key } else { - return readonly(format(list, opt.extend)) + value = format(list, opt.extend) } + return typeof value === 'object' ? readonly(value) : value } /** diff --git a/packages/fes-plugin-icon/package.json b/packages/fes-plugin-icon/package.json index fb9d5cd1..9e06a5c3 100644 --- a/packages/fes-plugin-icon/package.json +++ b/packages/fes-plugin-icon/package.json @@ -27,7 +27,7 @@ "access": "public" }, "peerDependencies": { - "vue": "^3.0.4" + "vue": "3.0.5" }, "dependencies": { "svgo": "1.3.2" diff --git a/packages/fes-plugin-jest/package.json b/packages/fes-plugin-jest/package.json index 24fe0345..11aff9f6 100644 --- a/packages/fes-plugin-jest/package.json +++ b/packages/fes-plugin-jest/package.json @@ -42,7 +42,7 @@ "jest-transform-stub": "^2.0.0", "jest-watch-typeahead": "^0.6.1", "babel-jest": "^26.6.3", - "vue-jest": "^5.0.5-0", + "vue-jest": "^5.0.0-0", "ts-jest": "^26.5.0", "whatwg-fetch": "^3.4.1", "typescript": "~4.1.2" diff --git a/packages/fes-plugin-layout/package.json b/packages/fes-plugin-layout/package.json index a04d77fe..f0234b5a 100644 --- a/packages/fes-plugin-layout/package.json +++ b/packages/fes-plugin-layout/package.json @@ -33,6 +33,6 @@ "@ant-design/icons-vue": "^5.1.6", "@webank/fes": "^2.0.0-alpha.0", "ant-design-vue": "2.0.0-rc.3", - "vue": "^3.0.4" + "vue": "3.0.5" } } diff --git a/packages/fes-plugin-locale/package.json b/packages/fes-plugin-locale/package.json index 672bf90a..7a9761d6 100644 --- a/packages/fes-plugin-locale/package.json +++ b/packages/fes-plugin-locale/package.json @@ -28,12 +28,12 @@ }, "dependencies": { "@umijs/utils": "3.3.3", - "vue-i18n": "^9.0.0-beta.15" + "vue-i18n": "^9.0.0-rc.5" }, "peerDependencies": { "@ant-design/icons-vue": "^5.1.6", "@webank/fes": "^2.0.0-alpha.0", "ant-design-vue": "2.0.0-rc.3", - "vue": "^3.0.4" + "vue": "3.0.5" } } diff --git a/packages/fes-plugin-model/package.json b/packages/fes-plugin-model/package.json index 479b1fb5..4ea0072f 100644 --- a/packages/fes-plugin-model/package.json +++ b/packages/fes-plugin-model/package.json @@ -31,6 +31,6 @@ }, "peerDependencies": { "@webank/fes": "^2.0.0-alpha.0", - "vue": "^3.0.4" + "vue": "3.0.5" } } diff --git a/packages/fes-plugin-request/package.json b/packages/fes-plugin-request/package.json index 8f7f50f4..1c90632c 100644 --- a/packages/fes-plugin-request/package.json +++ b/packages/fes-plugin-request/package.json @@ -28,7 +28,7 @@ }, "peerDependencies": { "@webank/fes": "^2.0.0-alpha.0", - "vue": "^3.0.4" + "vue": "3.0.5" }, "dependencies": { "axios": "0.21.1" diff --git a/packages/fes-plugin-vuex/.fatherrc.js b/packages/fes-plugin-vuex/.fatherrc.js new file mode 100644 index 00000000..332f1bff --- /dev/null +++ b/packages/fes-plugin-vuex/.fatherrc.js @@ -0,0 +1,3 @@ +export default { + disableTypeCheck: false, +}; diff --git a/packages/fes-plugin-vuex/LICENSE b/packages/fes-plugin-vuex/LICENSE new file mode 100644 index 00000000..0978fbf7 --- /dev/null +++ b/packages/fes-plugin-vuex/LICENSE @@ -0,0 +1,21 @@ +MIT License + +Copyright (c) 2020-present webank + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE. \ No newline at end of file diff --git a/packages/fes-plugin-vuex/README.md b/packages/fes-plugin-vuex/README.md new file mode 100644 index 00000000..139597f9 --- /dev/null +++ b/packages/fes-plugin-vuex/README.md @@ -0,0 +1,2 @@ + + diff --git a/packages/fes-plugin-vuex/package.json b/packages/fes-plugin-vuex/package.json new file mode 100644 index 00000000..5074d0a7 --- /dev/null +++ b/packages/fes-plugin-vuex/package.json @@ -0,0 +1,34 @@ +{ + "name": "@webank/fes-plugin-vuex", + "version": "2.0.0-alpha.2", + "description": "@webank/fes-plugin-vuex", + "main": "lib/index.js", + "files": [ + "lib" + ], + "scripts": { + "test": "echo \"Error: no test specified\" && exit 1" + }, + "repository": { + "type": "git", + "url": "git+https://github.com/WeBankFinTech/fes.js.git", + "directory": "packages/fes-plugin-vuex" + }, + "keywords": [ + "fes" + ], + "author": "aringlai", + "license": "MIT", + "bugs": { + "url": "https://github.com/WeBankFinTech/fes.js/issues" + }, + "homepage": "https://github.com/WeBankFinTech/fes.js#readme", + "publishConfig": { + "access": "public" + }, + "peerDependencies": { + "@webank/fes": "^2.0.0-alpha.0", + "vue": "3.0.5", + "vuex": "^4.0.0-rc.2" + } +} diff --git a/packages/fes-plugin-vuex/src/index.js b/packages/fes-plugin-vuex/src/index.js new file mode 100644 index 00000000..22705455 --- /dev/null +++ b/packages/fes-plugin-vuex/src/index.js @@ -0,0 +1,83 @@ +import { readdirSync, readFileSync, statSync } from 'fs'; +import { join } from 'path'; + +const namespace = 'plugin-vuex'; + +export default (api) => { + const { + paths, + utils: { Mustache } + } = api; + + /** + * 获取文件夹所有JS文件路径 + * @param {string} dir + */ + function getDirFilePaths(dir) { + const dirs = readdirSync(dir); + let pathList = []; + for (const name of dirs) { + const path = join(dir, name); + const info = statSync(path); + if (info.isDirectory()) { + pathList = pathList.concat(getDirFilePaths(path)); + } else if (path.endsWith('.js')) { + pathList.push(path); + } + } + return pathList; + } + + /** + * 解析vuex模块及插件文件 + * @param {Array} pathList 文件路径 + * @param {string} root + */ + function parseStore(pathList, root) { + const store = { + modules: [], + plugins: [], + importModules: [], + importPlugins: [] + }; + for (const path of pathList) { + const moduleName = path.replace(root, '').replace('.js', '').replace(/(\/|\.|-|_)\S/g, text => text[1].toUpperCase()); + if (path.indexOf('plugin') > -1) { + store.importPlugins.push(`import ${moduleName} from '${path}'`); + store.plugins.push(moduleName); + } else { + store.importModules.push(`import ${moduleName} from '${path}'`); + store.modules.push(`${moduleName}`); + } + } + return store; + } + + const absRuntimeFilePath = join(namespace, 'runtime.js'); + api.onGenerateFiles(() => { + const root = join(paths.absSrcPath, 'stores'); + const storePaths = getDirFilePaths(root); + const store = parseStore(storePaths, join(root, '/')); + + // 文件写出 + api.writeTmpFile({ + path: absRuntimeFilePath, + content: Mustache.render( + readFileSync(join(__dirname, 'runtime/runtime.tpl'), 'utf-8'), + { + IMPORT_MODULES: store.importModules.join('\n'), + IMPORT_PLUGINS: store.importPlugins.join('\n'), + MODULES: `{ ${store.modules.join(', ')} }`, + PLUGINS: `[${store.plugins.join(', ')}]` + } + ) + }); + + api.copyTmpFiles({ + namespace, + path: join(__dirname, 'runtime'), + ignore: ['.tpl'] + }); + }); + api.addRuntimePlugin(() => `@@/${absRuntimeFilePath}`); +}; diff --git a/packages/fes-plugin-vuex/src/runtime/runtime.tpl b/packages/fes-plugin-vuex/src/runtime/runtime.tpl new file mode 100644 index 00000000..bf0aec46 --- /dev/null +++ b/packages/fes-plugin-vuex/src/runtime/runtime.tpl @@ -0,0 +1,10 @@ +import { createStore } from 'vuex' +{{{IMPORT_MODULES}}} +{{{IMPORT_PLUGINS}}} + +export function onAppCreated({ app }) { + app.use(createStore({ + modules: {{{MODULES}}}, + plugins: {{{PLUGINS}}} + })) +} \ No newline at end of file diff --git a/packages/fes-runtime/package.json b/packages/fes-runtime/package.json index cc7d74b6..dd5125ff 100644 --- a/packages/fes-runtime/package.json +++ b/packages/fes-runtime/package.json @@ -25,7 +25,7 @@ "access": "public" }, "peerDependencies": { - "vue": "^3.0.4" + "vue": "3.0.5" }, "dependencies": { "vue-router": "^4.0.1" diff --git a/packages/fes-template-h5/package.json b/packages/fes-template-h5/package.json index 7cc7ff9d..e1903a71 100644 --- a/packages/fes-template-h5/package.json +++ b/packages/fes-template-h5/package.json @@ -47,7 +47,7 @@ "@webank/fes": "^2.0.0-alpha.0", "@webank/fes-plugin-icon": "^2.0.0-alpha.0", "@webank/fes-plugin-request": "^2.0.0-alpha.0", - "vue": "^3.0.4" + "vue": "3.0.5" }, "private": true } diff --git a/packages/fes-template/.eslintrc.js b/packages/fes-template/.eslintrc.js index 57c7f909..6300816f 100644 --- a/packages/fes-template/.eslintrc.js +++ b/packages/fes-template/.eslintrc.js @@ -1,8 +1,12 @@ module.exports = { - extends: [require.resolve('@webank/eslint-config-webank')], - files: [ - '**/__tests__/*.{j,t}s?(x)', - '**/tests/unit/**/*.spec.{j,t}s?(x)' + extends: ['@webank/eslint-config-webank/vue.js'], + overrides: [ + { + files: [ + '**/__tests__/*.{j,t}s?(x)', + '**/tests/unit/**/*.spec.{j,t}s?(x)' + ] + } ], env: { jest: true diff --git a/packages/fes-template/package.json b/packages/fes-template/package.json index 55099cd5..d5e5c1de 100644 --- a/packages/fes-template/package.json +++ b/packages/fes-template/package.json @@ -53,8 +53,10 @@ "@webank/fes-plugin-model": "^2.0.0-alpha.0", "@webank/fes-plugin-enums": "^2.0.0-alpha.0", "@webank/fes-plugin-jest": "^2.0.0-alpha.0", + "@webank/fes-plugin-vuex": "^2.0.0-alpha.0", "ant-design-vue": "2.0.0-rc.3", - "vue": "3.0.4" + "vue": "3.0.5", + "vuex": "^4.0.0-rc.2" }, "private": true } diff --git a/packages/fes-template/src/pages/index.vue b/packages/fes-template/src/pages/index.vue index bf40156a..3a304634 100644 --- a/packages/fes-template/src/pages/index.vue +++ b/packages/fes-template/src/pages/index.vue @@ -9,6 +9,7 @@
{{item.value}}：{{item.key}}
{{item.name}}：{{item.disabled}}
{{enumsGet('roles', '2', { dir: 'eName' })}}
+

Vuex

@@ -18,7 +19,8 @@ }