update core

package.json

@@ -7,7 +7,7 @@
     "build.demo": "vue-cli-service build --modern --mode pro.demo",
     "lint": "vue-cli-service lint",
     "rm_cache": "rm -rf ./node_modules/.cache",
-    "core": "yarn add git+ssh://git@git.linkortech.com:10022/yingchaojie/web-toolkit.git"
+    "core": "yarn add git+https://github.com/mizuki1412/web-toolkit.git"
   },
   "lint-staged": {
     "*.ts": [
@@ -17,7 +17,7 @@
   },
   "dependencies": {
     "element-ui": "^2.13.0",
-    "web-toolkit": "git+ssh://git@git.linkortech.com:10022/yingchaojie/web-toolkit.git"
+    "web-toolkit": "git+https://github.com/mizuki1412/web-toolkit.git"
   },
   "devDependencies": {
     "@babel/core": "7.7.4",

src/config.ts

 
-// 主菜单
-export const mainMenuTitles = [
-  // 如果没有子导航，直接在这指定CName一样的值
-  'Demo1', 'icon-monitor',
-  'Demo2', 'icon-dashboard',
-  'Demo3', 'icon-dashboard',
-];
-
-export const loginTitle1 = process.env.VUE_APP_LOGIN_TITLE1;
-export const loginTitle2 = process.env.VUE_APP_LOGIN_TITLE2;
-export const loginLogo = process.env.VUE_APP_LOGIN_LG;
-export const titleLogo = process.env.VUE_APP_TITLE_LG;
-export const schema = process.env.VUE_APP_LOGIN_SCHEMA;

src/main.ts

@@ -3,14 +3,23 @@ import App from './App.vue';
 
 // 加载所用组件，含core
 import './plugin';
-
 import { axiosIntercept, routeIntercept, buildMenu} from 'web-toolkit/src/case-main';
+// 主菜单
+export const mainMenuTitles = [
+  // 如果没有子导航，直接在这指定CName一样的值
+  'Demo1', 'icon-monitor',
+  'Demo2', 'icon-dashboard',
+  'Demo3', 'icon-dashboard',
+];
+export const loginTitle1 = process.env.VUE_APP_LOGIN_TITLE1;
+export const loginTitle2 = process.env.VUE_APP_LOGIN_TITLE2;
+export const loginLogo = process.env.VUE_APP_LOGIN_LG;
+export const titleLogo = process.env.VUE_APP_TITLE_LG;
+export const schema = process.env.VUE_APP_LOGIN_SCHEMA;
 
-import { mainMenuTitles } from './config';
 import './scss/common.scss';
 import { routes } from './router/routes';
 import { genRouter } from 'web-toolkit/src/case-main/router';
-
 export const router = genRouter(routes);
 buildMenu(routes, mainMenuTitles);
 routeIntercept(router);

src/plugin/element.ts

-import Vue from 'vue';
-import { debounce } from 'web-toolkit/src/utils';
-function adapt() {
-  const screenWidth = window.innerWidth;
-  let size = '';
-  if (screenWidth < 940) {
-    size = 'mini';
-  } else if (screenWidth < 1000) {
-    size = 'small';
-  } else {
-    size = 'medium';
-  }
-  Vue.prototype.$ELEMENT = { size };
-}
-window.addEventListener('resize', debounce(adapt));
-adapt();

src/plugin/filter.ts

-import Vue from 'vue';
-import { isNumber, formatDateTime, formatDate } from 'web-toolkit/src/utils';
-
-Vue.filter('datetime', (value?: number | Date) => {
-  if (isNumber(value)) {
-    const date = new Date(value);
-    if (date.toString().includes('Invalid')) {
-      return '- -';
-    } else {
-      return formatDateTime(date);
-    }
-  } else if (value instanceof Date) {
-    return formatDateTime(value);
-  } else {
-    return '- -';
-  }
-});
-
-Vue.filter('date', (value?: number | Date) => {
-  if (isNumber(value)) {
-    const date = new Date(value);
-    if (date.toString().includes('Invalid')) {
-      return '- -';
-    } else {
-      return formatDate(date);
-    }
-  } else if (value instanceof Date) {
-    return formatDate(value);
-  } else {
-    return '- -';
-  }
-});

src/plugin/index.ts

 // 注意放第一个
 import './web-toolkit';
 import './echarts';
-import './filter';
-import './element';

src/plugin/web-toolkit.ts

@@ -10,14 +10,10 @@ import 'web-toolkit/src/case-main';
 import 'web-toolkit/src/filter/date-time';
 
 // components
-import lktTable from 'web-toolkit/src/components/lkt-table.vue';
+import lktTable from 'web-toolkit/src/components/kit-table.vue';
 Vue.component('lkt-table', lktTable);
-import lktSelect from 'web-toolkit/src/components/lkt-select.vue';
-Vue.component('lkt-select', lktSelect);
-import LktDatePicker from 'web-toolkit/src/components/lkt-date-picker.vue';
+import LktDatePicker from 'web-toolkit/src/components/kit-date-picker.vue';
 Vue.component('lkt-date-picker', LktDatePicker);
-import LktCheck from 'web-toolkit/src/components/lkt-check.vue';
-Vue.component('lkt-check', LktCheck);
 import KitDialogSimple from 'web-toolkit/src/components/kit-dialog-simple.vue';
 Vue.component('kit-dialog-simple', KitDialogSimple);
 import KitErrChannel from 'web-toolkit/src/components/kit-err-channel.vue';

src/views/login.vue

@@ -38,7 +38,7 @@ import { ref, createComponent, Ref, onMounted } from '@vue/composition-api';
 import { ElForm } from 'element-ui/types/form';
 import { useLoading } from 'web-toolkit/src/service';
 import { postService, storeUserInfo, updateStoreUserInfo, submitErrChanel, pushMsgErr } from 'web-toolkit/src/case-main';
-import {loginTitle1, loginTitle2, loginLogo, schema} from '@/config';
+import {loginTitle1, loginTitle2, loginLogo, schema} from '@/main';
 import {router} from '@/main';
 import { Route } from 'vue-router';
 import {assert} from 'web-toolkit/src/utils/index';

src/views/main/Navbar.vue

@@ -13,7 +13,7 @@
 <script lang="ts">
 import LktHeaderSide from './header-side.vue';
 import LktMenu from './Menu.vue';
-import {loginTitle1, loginTitle2, loginLogo, titleLogo} from '@/config';
+import {loginTitle1, loginTitle2, loginLogo, titleLogo} from '@/main';
 export default {
     components: {
       LktHeaderSide, LktMenu,

vue.config.js

@@ -23,7 +23,6 @@ module.exports = {
       sass: {
         data: `
           @import "node_modules/web-toolkit/src/scss/color.scss";
-          @import "node_modules/web-toolkit/src/scss/device.scss";
           @import "node_modules/web-toolkit/src/scss/${theme}.scss";
         `
       }