diff --git a/smart-admin-web/.env.prod b/smart-admin-web/.env.prod index 522eeaaa..d90edfe9 100644 --- a/smart-admin-web/.env.prod +++ b/smart-admin-web/.env.prod @@ -3,3 +3,6 @@ VUE_APP_TYPE=prod VUE_APP_URL=http://preview.smartadmin.1024lab.net/smart-admin-api/ VUE_APP_SOCKET_URL=ws://preview.smartadmin.1024lab.net/smart-admin-api/ +// VUE_APP_URL=http://127.0.0.1:10086/smart-admin-api/ +// VUE_APP_SOCKET_URL=ws://127.0.0.1:10086/smart-admin-api/ + diff --git a/smart-admin-web/LICENSE b/smart-admin-web/LICENSE deleted file mode 100644 index 7ec88ac0..00000000 --- a/smart-admin-web/LICENSE +++ /dev/null @@ -1,21 +0,0 @@ -MIT License - -Copyright (c) 2017 iView - -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. diff --git a/smart-admin-web/src/lib/http.js b/smart-admin-web/src/lib/http.js index 12a7b39d..2bb42bac 100644 --- a/smart-admin-web/src/lib/http.js +++ b/smart-admin-web/src/lib/http.js @@ -1,6 +1,6 @@ import Axios from 'axios'; import config from '@/config'; -import { Message, Spin } from 'iview'; +import { Message, Spin } from 'view-design'; import cookie from '@/lib/cookie'; // 之所以封装这个axios,是因为在一些请求中,无法上传信息,很尴尬,估计原因是继承的有问题,无法携带headers export const baseUrl = config.baseUrl.apiUrl; diff --git a/smart-admin-web/src/locale/index.js b/smart-admin-web/src/locale/index.js index e9dd62c3..5509260c 100644 --- a/smart-admin-web/src/locale/index.js +++ b/smart-admin-web/src/locale/index.js @@ -4,9 +4,9 @@ import { localRead } from '@/lib/local'; import customZhCn from './lang/zh-CN'; import customZhTw from './lang/zh-TW'; import customEnUs from './lang/en-US'; -import zhCnLocale from 'iview/src/locale/lang/zh-CN'; -import enUsLocale from 'iview/src/locale/lang/en-US'; -import zhTwLocale from 'iview/src/locale/lang/zh-TW'; +import zhCnLocale from 'view-design/src/locale/lang/zh-CN'; +import enUsLocale from 'view-design/src/locale/lang/en-US'; +import zhTwLocale from 'view-design/src/locale/lang/zh-TW'; Vue.use(VueI18n); diff --git a/smart-admin-web/src/main.js b/smart-admin-web/src/main.js index 7a1e8807..a7b038e1 100644 --- a/smart-admin-web/src/main.js +++ b/smart-admin-web/src/main.js @@ -4,7 +4,7 @@ import Vue from 'vue'; import App from './App'; import router from './router'; import store from './store'; -import iView from 'iview'; +import ViewUI from 'view-design'; import i18n from '@/locale'; import config from '@/config'; import importDirective from '@/directives'; @@ -24,7 +24,7 @@ import enumInfo from '@/constants'; import tableAction from './lib/table-action'; Vue.prototype.$tableAction = tableAction; Vue.use(Enum, { enumInfo }); -Vue.use(iView, { +Vue.use(ViewUI, { i18n: (key, value) => i18n.t(key, value) }); Vue.use(JsonViewer); diff --git a/smart-admin-web/src/router/before-close.js b/smart-admin-web/src/router/before-close.js index 01ba93d7..0d4d61db 100644 --- a/smart-admin-web/src/router/before-close.js +++ b/smart-admin-web/src/router/before-close.js @@ -1,4 +1,4 @@ -import { Modal } from 'iview'; +import { Modal } from 'view-design'; const beforeClose = { before_close_normal: resolve => { diff --git a/smart-admin-web/src/router/index.js b/smart-admin-web/src/router/index.js index 8d57dab0..0a84add6 100644 --- a/smart-admin-web/src/router/index.js +++ b/smart-admin-web/src/router/index.js @@ -2,7 +2,7 @@ import Vue from 'vue'; import Router from 'vue-router'; import { routers } from './routers'; import store from '@/store'; -import iView from 'iview'; +import ViewUI from 'view-design'; import cookie from '@/lib/cookie'; import { localRead } from '@/lib/local'; import { setTitle } from '@/lib/menu-func'; @@ -51,7 +51,7 @@ Router.prototype.closeCurrentPageAndPush = function (pushParam) { }; let storeSelf = store; router.beforeEach((to, from, next) => { - iView.LoadingBar.start(); + ViewUI.LoadingBar.start(); const token = cookie.getToken(); if (!token && to.name !== LOGIN_PAGE_NAME) { // 未登录且要跳转的页面不是登录页 @@ -68,7 +68,7 @@ router.beforeEach((to, from, next) => { name: homeName }); setTitle(to, router.app); - iView.LoadingBar.finish(); + ViewUI.LoadingBar.finish(); window.scrollTo(0, 0); } else { // 特殊页面直接放行 @@ -98,7 +98,7 @@ router.beforeEach((to, from, next) => { router.afterEach(to => { setTitle(to, router.app); - iView.LoadingBar.finish(); + ViewUI.LoadingBar.finish(); window.scrollTo(0, 0); }); diff --git a/smart-admin-web/src/router/routers.js b/smart-admin-web/src/router/routers.js index 28cc3349..de7add97 100644 --- a/smart-admin-web/src/router/routers.js +++ b/smart-admin-web/src/router/routers.js @@ -16,7 +16,7 @@ import { file } from './module/file'; /** * - * iview-admin中meta除了原生参数外可配置的参数: + * meta除了原生参数外可配置的参数: * meta: { * title: { String|Number|Function } * 显示在侧边栏、面包屑和标签栏的文字 diff --git a/smart-admin-web/src/themes/index.less b/smart-admin-web/src/themes/index.less index 2a2286f0..158f852e 100644 --- a/smart-admin-web/src/themes/index.less +++ b/smart-admin-web/src/themes/index.less @@ -1,4 +1,4 @@ -@import '~iview/src/styles/index.less'; +@import '~view-design/src/styles/index.less'; /************** 导航栏 **************/ @@ -256,9 +256,7 @@ box-shadow: none; } } -.ivu-form-item{ - margin-bottom: 15px; -} + .ivu-spin-fix{ background-color: rgba(255, 255, 255, 0.3); } diff --git a/smart-admin-web/vue.config.js b/smart-admin-web/vue.config.js index 827c711d..af5bfbf7 100644 --- a/smart-admin-web/vue.config.js +++ b/smart-admin-web/vue.config.js @@ -12,7 +12,6 @@ const productionGzipExtensions = ['js', 'css']; // 如果您的应用程序部署在子路径中,则需要在这指定子路径 // 例如:https://www.foobar.com/my-app/ // 需要将它改为'/my-app/' -// iview-admin线上演示打包路径: https://file.iviewui.com-dist/ const publicPath = process.env.NODE_ENV === 'production' ? '/' : '/'; const lintOnSave = process.env.NODE_ENV === 'production'; @@ -35,8 +34,8 @@ module.exports = { vendors: './src/vendors' }; config.module - .rule('iview') - .test(/iview.src.*?js$/) + .rule('view-design') + .test(/view-design.src.*?js$/) .use('babel') .loader('babel-loader') .end();