From 91594ddb1a2feb73ae835f9038ae64960aaad147 Mon Sep 17 00:00:00 2001 From: zhangdaiscott Date: Wed, 4 Mar 2020 22:37:17 +0800 Subject: [PATCH] =?UTF-8?q?1.=E9=A1=B9=E7=9B=AE=E6=A0=B7=E5=BC=8F=20scss?= =?UTF-8?q?=20=E5=85=A8=E9=83=A8=E8=BD=AC=E6=8D=A2=E4=B8=BA=20less?= =?UTF-8?q?=EF=BC=8C=E4=B8=94=E7=A7=BB=E9=99=A4=E4=BA=86=E9=A1=B9=E7=9B=AE?= =?UTF-8?q?=20node-sass=20=E4=BE=9D=E8=B5=96=EF=BC=9B=202.online=E5=BC=80?= =?UTF-8?q?=E5=8F=91ButtonExpHandler=20is=20not=20defined=20#957=EF=BC=9B?= =?UTF-8?q?=203.=E5=85=B3=E4=BA=8E=E6=89=93=E5=8C=85=E5=90=8EJS=E6=96=87?= =?UTF-8?q?=E4=BB=B6=E8=BF=87=E5=A4=A7=EF=BC=8C=E5=AF=BC=E8=87=B4=E5=8A=A0?= =?UTF-8?q?=E8=BD=BD=E7=BC=93=E6=85=A2=E7=9A=84=E5=BB=BA=E8=AE=AE=20#969?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ant-design-vue-jeecg/idea.config.js | 32 +- ant-design-vue-jeecg/package.json | 10 +- ant-design-vue-jeecg/src/assets/checkcode.png | Bin 2241 -> 2236 bytes .../src/components/ChartCard.vue | 2 +- .../src/components/chart/AreaChartTy.vue | 2 +- .../src/components/chart/MiniArea.vue | 2 +- .../src/components/chart/MiniBar.vue | 2 +- .../src/components/chart/MiniProgress.vue | 2 +- .../src/components/chart/RankList.vue | 2 +- .../src/components/chart/Trend.vue | 2 +- .../chart/{chart.scss => chart.less} | 0 .../src/components/jeecg/JModal/index.vue | 5 +- .../src/components/jeecg/JSuperQuery.vue | 2 +- .../src/components/jeecg/modal/JCronModal.vue | 4 +- .../jeecgbiz/JSelectBizComponent/index.vue | 12 +- .../components/jeecgbiz/JSelectMultiUser.vue | 2 +- .../components/jeecgbiz/JSelectPosition.vue | 2 +- .../src/components/jeecgbiz/JSelectRole.vue | 2 +- .../src/components/layouts/BasicLayout.vue | 2 +- .../src/components/layouts/PageView.vue | 2 +- .../src/components/layouts/UserLayout.vue | 2 +- .../src/components/menu/SideMenu.vue | 10 +- .../src/components/page/GlobalFooter.vue | 2 +- .../src/components/page/GlobalLayout.vue | 2 +- .../src/components/page/PageHeader.vue | 2 +- .../src/components/page/PageLayout.vue | 2 +- .../src/components/page/SHeaderNotice.vue | 2 +- .../src/components/setting/SettingDrawer.vue | 2 +- .../src/components/setting/SettingItem.vue | 2 +- .../src/components/tools/DetailList.vue | 2 +- .../src/components/tools/FooterToolBar.vue | 2 +- .../src/components/tools/HeadInfo.vue | 2 +- .../src/components/tools/HeaderNotice.vue | 2 +- .../src/components/tools/TwoStepCaptcha.vue | 2 +- .../src/components/tools/UserMenu.vue | 14 +- ant-design-vue-jeecg/src/main.js | 8 +- .../src/views/account/center/Index.vue | 2 +- .../src/views/account/center/page/App.vue | 2 +- .../views/account/settings/AvatarModal.vue | 2 +- .../views/account/settings/BaseSetting.vue | 2 +- .../src/views/account/settings/Index.vue | 2 +- .../src/views/dashboard/IndexBdc.vue | 2 +- .../src/views/dashboard/IndexChart.vue | 2 +- .../src/views/dashboard/Workplace.vue | 2 +- .../src/views/exception/ExceptionPage.vue | 2 +- .../views/form/advancedForm/AdvancedForm.vue | 2 +- .../src/views/form/stepForm/Step2.vue | 2 +- .../src/views/form/stepForm/Step3.vue | 2 +- .../src/views/form/stepForm/StepForm.vue | 2 +- .../src/views/jeecg/modules/VueCronModal.vue | 4 +- .../src/views/jeecg/report/Analysis.vue | 2 +- .../src/views/list/CardList.vue | 2 +- .../src/views/list/StandardList.vue | 2 +- .../src/views/list/TableInnerEditList.vue | 2 +- .../src/views/list/search/SearchLayout.vue | 2 +- .../online/cgform/auto/ButtonExpHandler.js | 41 ++ .../online/cgform/auto/OnlCgformAutoList.vue | 1 + .../src/views/profile/advanced/Advanced.vue | 2 +- .../src/views/profile/basic/Index.vue | 2 +- .../src/views/result/Result.vue | 2 +- .../system/modules/DeptRoleAuthModal.vue | 2 +- .../system/modules/SysCheckRuleModal.vue | 2 +- .../system/modules/SysCheckRuleTestModal.vue | 2 +- .../system/modules/SysDataSourceModal.vue | 2 +- .../system/modules/UserRecycleBinModal.vue | 2 +- .../views/system/modules/UserRoleModal.vue | 2 +- .../src/views/user/Alteration.vue | 2 +- ant-design-vue-jeecg/src/views/user/Login.vue | 2 +- .../src/views/user/Register.vue | 4 +- ant-design-vue-jeecg/src/views/user/Step2.vue | 2 +- ant-design-vue-jeecg/src/views/user/Step3.vue | 2 +- ant-design-vue-jeecg/vue.config.js | 22 +- ant-design-vue-jeecg/yarn.lock | 479 +++++------------- 73 files changed, 297 insertions(+), 463 deletions(-) rename ant-design-vue-jeecg/src/components/chart/{chart.scss => chart.less} (100%) create mode 100644 ant-design-vue-jeecg/src/views/modules/online/cgform/auto/ButtonExpHandler.js diff --git a/ant-design-vue-jeecg/idea.config.js b/ant-design-vue-jeecg/idea.config.js index 4d86bd9..8318a12 100644 --- a/ant-design-vue-jeecg/idea.config.js +++ b/ant-design-vue-jeecg/idea.config.js @@ -6,19 +6,19 @@ function resolve (dir) { } module.exports = { - context: path.resolve(__dirname, './'), - resolve: { - extensions: ['.js', '.vue', '.json'], - alias: { - 'config': resolve('config'), - '@': resolve('src'), - '@views': resolve('src/views'), - '@comp': resolve('src/components'), - '@core': resolve('src/core'), - '@utils': resolve('src/utils'), - '@entry': resolve('src/entry'), - '@router': resolve('src/router'), - '@store': resolve('src/store') - } - }, -} \ No newline at end of file + context: path.resolve(__dirname, './'), + resolve: { + extensions: ['.js', '.vue', '.json'], + alias: { + 'config': resolve('config'), + '@': resolve('src'), + '@views': resolve('src/views'), + '@comp': resolve('src/components'), + '@core': resolve('src/core'), + '@utils': resolve('src/utils'), + '@entry': resolve('src/entry'), + '@router': resolve('src/router'), + '@store': resolve('src/store') + } + } +} diff --git a/ant-design-vue-jeecg/package.json b/ant-design-vue-jeecg/package.json index 597f6b7..2343568 100644 --- a/ant-design-vue-jeecg/package.json +++ b/ant-design-vue-jeecg/package.json @@ -54,8 +54,6 @@ "html-webpack-plugin": "^4.0.0-beta.11", "less": "^3.9.0", "less-loader": "^4.1.0", - "node-sass": "^4.13.1", - "sass-loader": "^7.3.1", "vue-template-compiler": "^2.6.10" }, "eslintConfig": { @@ -65,7 +63,7 @@ }, "extends": [ "plugin:vue/strongly-recommended", - "eslint:recommended" + "@vue/standard" ], "parserOptions": { "parser": "babel-eslint" @@ -93,7 +91,9 @@ "vue/no-use-v-if-with-v-for": 0, "vue/html-closing-bracket-newline": 0, "vue/no-parsing-error": 0, - "no-console": 0 + "no-console": 0, + "no-tabs": 0, + "indent": [1, 4] } }, "postcss": { @@ -104,6 +104,6 @@ "browserslist": [ "> 1%", "last 2 versions", - "not ie <= 8" + "not ie <= 10" ] } diff --git a/ant-design-vue-jeecg/src/assets/checkcode.png b/ant-design-vue-jeecg/src/assets/checkcode.png index ed86ad16d9581a2ee7643d2294b4a4cb4b84c205..844fa70c56861efed68553088cfa059cd2a3a612 100644 GIT binary patch delta 1794 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 diff --git a/ant-design-vue-jeecg/src/components/ChartCard.vue b/ant-design-vue-jeecg/src/components/ChartCard.vue index 8acb150..a03b31d 100644 --- a/ant-design-vue-jeecg/src/components/ChartCard.vue +++ b/ant-design-vue-jeecg/src/components/ChartCard.vue @@ -42,7 +42,7 @@ } - \ No newline at end of file diff --git a/ant-design-vue-jeecg/src/components/chart/MiniArea.vue b/ant-design-vue-jeecg/src/components/chart/MiniArea.vue index 1c9b48c..97c8ff7 100644 --- a/ant-design-vue-jeecg/src/components/chart/MiniArea.vue +++ b/ant-design-vue-jeecg/src/components/chart/MiniArea.vue @@ -64,6 +64,6 @@ } - \ No newline at end of file diff --git a/ant-design-vue-jeecg/src/components/chart/MiniBar.vue b/ant-design-vue-jeecg/src/components/chart/MiniBar.vue index ed62d30..9dd6bca 100644 --- a/ant-design-vue-jeecg/src/components/chart/MiniBar.vue +++ b/ant-design-vue-jeecg/src/components/chart/MiniBar.vue @@ -71,6 +71,6 @@ } - \ No newline at end of file diff --git a/ant-design-vue-jeecg/src/components/chart/MiniProgress.vue b/ant-design-vue-jeecg/src/components/chart/MiniProgress.vue index 444a9d8..e666828 100644 --- a/ant-design-vue-jeecg/src/components/chart/MiniProgress.vue +++ b/ant-design-vue-jeecg/src/components/chart/MiniProgress.vue @@ -34,7 +34,7 @@ } - \ No newline at end of file diff --git a/ant-design-vue-jeecg/src/components/jeecg/JSuperQuery.vue b/ant-design-vue-jeecg/src/components/jeecg/JSuperQuery.vue index 31066fe..424d6c2 100644 --- a/ant-design-vue-jeecg/src/components/jeecg/JSuperQuery.vue +++ b/ant-design-vue-jeecg/src/components/jeecg/JSuperQuery.vue @@ -420,7 +420,7 @@ } - - \ No newline at end of file diff --git a/ant-design-vue-jeecg/src/components/jeecgbiz/JSelectMultiUser.vue b/ant-design-vue-jeecg/src/components/jeecgbiz/JSelectMultiUser.vue index 31ee117..f2f0f2a 100644 --- a/ant-design-vue-jeecg/src/components/jeecgbiz/JSelectMultiUser.vue +++ b/ant-design-vue-jeecg/src/components/jeecgbiz/JSelectMultiUser.vue @@ -43,4 +43,4 @@ } - \ No newline at end of file + \ No newline at end of file diff --git a/ant-design-vue-jeecg/src/components/jeecgbiz/JSelectPosition.vue b/ant-design-vue-jeecg/src/components/jeecgbiz/JSelectPosition.vue index ce5a401..f863f8e 100644 --- a/ant-design-vue-jeecg/src/components/jeecgbiz/JSelectPosition.vue +++ b/ant-design-vue-jeecg/src/components/jeecgbiz/JSelectPosition.vue @@ -34,4 +34,4 @@ } - \ No newline at end of file + \ No newline at end of file diff --git a/ant-design-vue-jeecg/src/components/jeecgbiz/JSelectRole.vue b/ant-design-vue-jeecg/src/components/jeecgbiz/JSelectRole.vue index 9ef7ffb..6833a38 100644 --- a/ant-design-vue-jeecg/src/components/jeecgbiz/JSelectRole.vue +++ b/ant-design-vue-jeecg/src/components/jeecgbiz/JSelectRole.vue @@ -35,4 +35,4 @@ } - \ No newline at end of file + \ No newline at end of file diff --git a/ant-design-vue-jeecg/src/components/layouts/BasicLayout.vue b/ant-design-vue-jeecg/src/components/layouts/BasicLayout.vue index 48b3fc5..65b40cd 100644 --- a/ant-design-vue-jeecg/src/components/layouts/BasicLayout.vue +++ b/ant-design-vue-jeecg/src/components/layouts/BasicLayout.vue @@ -33,7 +33,7 @@ } - - - \ No newline at end of file + \ No newline at end of file diff --git a/ant-design-vue-jeecg/src/views/system/modules/SysCheckRuleTestModal.vue b/ant-design-vue-jeecg/src/views/system/modules/SysCheckRuleTestModal.vue index 4cf61b1..89b7691 100644 --- a/ant-design-vue-jeecg/src/views/system/modules/SysCheckRuleTestModal.vue +++ b/ant-design-vue-jeecg/src/views/system/modules/SysCheckRuleTestModal.vue @@ -55,4 +55,4 @@ } - \ No newline at end of file + \ No newline at end of file diff --git a/ant-design-vue-jeecg/src/views/system/modules/SysDataSourceModal.vue b/ant-design-vue-jeecg/src/views/system/modules/SysDataSourceModal.vue index 8ae463b..3d2124c 100644 --- a/ant-design-vue-jeecg/src/views/system/modules/SysDataSourceModal.vue +++ b/ant-design-vue-jeecg/src/views/system/modules/SysDataSourceModal.vue @@ -224,4 +224,4 @@ } - \ No newline at end of file + \ No newline at end of file diff --git a/ant-design-vue-jeecg/src/views/system/modules/UserRecycleBinModal.vue b/ant-design-vue-jeecg/src/views/system/modules/UserRecycleBinModal.vue index 0bbc79f..82a6d1d 100644 --- a/ant-design-vue-jeecg/src/views/system/modules/UserRecycleBinModal.vue +++ b/ant-design-vue-jeecg/src/views/system/modules/UserRecycleBinModal.vue @@ -188,4 +188,4 @@ } - \ No newline at end of file + \ No newline at end of file diff --git a/ant-design-vue-jeecg/src/views/system/modules/UserRoleModal.vue b/ant-design-vue-jeecg/src/views/system/modules/UserRoleModal.vue index 523f92b..c569ccd 100644 --- a/ant-design-vue-jeecg/src/views/system/modules/UserRoleModal.vue +++ b/ant-design-vue-jeecg/src/views/system/modules/UserRoleModal.vue @@ -184,7 +184,7 @@ } - -