xs-common-plugins 1.1.2 → 1.1.6

package/src/plugins/row-col-cmp/rowCmp/methods.js

@@ -1,30 +1,30 @@
-export default {
-  // ------------------------------------------------------------------
-  // pragma mark - inti(初始化行为)
-  // ------------------------------------------------------------------
-  createdInit() {
-    
-  },
-  mountedInit() {
-  },
-
-  getdata() {
-    return 11
-  },
-
-  // ------------------------------------------------------------------
-  // pragma mark - Event Response(响应事件)
-  // 命名规范: Name + EventHandler
-  // ------------------------------------------------------------------
-  Demo_handler() {
-  
-  },
-  
-  // ------------------------------------------------------------------
-  // pragma mark - Private Methods(私有方法: ) 
-  // 命名规范: 前缀 __ + name
-  // ------------------------------------------------------------------
-  __demoFunction() {
-  
-  }
+export default {
+  // ------------------------------------------------------------------
+  // pragma mark - inti(初始化行为)
+  // ------------------------------------------------------------------
+  createdInit() {
+    
+  },
+  mountedInit() {
+  },
+
+  getdata() {
+    return 11
+  },
+
+  // ------------------------------------------------------------------
+  // pragma mark - Event Response(响应事件)
+  // 命名规范: Name + EventHandler
+  // ------------------------------------------------------------------
+  Demo_handler() {
+  
+  },
+  
+  // ------------------------------------------------------------------
+  // pragma mark - Private Methods(私有方法: ) 
+  // 命名规范: 前缀 __ + name
+  // ------------------------------------------------------------------
+  __demoFunction() {
+  
+  }
 }

package/src/router/index.js

@@ -1,43 +1,47 @@
-import Vue from 'vue'
-import VueRouter from 'vue-router'
-import autoRouter from '../automatically/router'
-Vue.use(VueRouter)
-
-const routes = [
-  {
-    path: '/',
-    name: 'layout',
-    component: () => import('../views/layout/index'),
-    redirect: '/home', // 默认展示页面
-    meta: { title: '首页', icon: 'example' },
-    children: [autoRouter[0]]
-  },
-  {
-    path: '/home',
-    name: 'home',
-    component: () => import('../views/layout/index'),
-    meta: { title: '首页', icon: 'example' },
-    children: [{
-      path:'/',
-      component: () => import('../views/home/index'),
-    }],
-  },
-  {
-    path: '/callback',
-    name: 'callback',
-    meta: { title: '认证' },
-    component: ()=> import('../views/callback/index')
-  },
-  {
-    path: '/slienceAuth',
-    name: 'slienceAuth',
-    meta: {title: '静默授权'},
-    component: () => import("../views/slienceAuth/index")
-  }
-]
-
-const router = new VueRouter({
-  routes
-})
-
-export default router
+import Vue from 'vue'
+import VueRouter from 'vue-router'
+import autoRouter from '../automatically/router'
+Vue.use(VueRouter)
+
+const originalPush = VueRouter.prototype.push;
+VueRouter.prototype.push = function push(location) {
+  return originalPush.call(this, location).catch(err => err)
+}
+const routes = [
+  {
+    path: '/',
+    name: 'layout',
+    component: () => import('../views/layout/index'),
+    redirect: '/home', // 默认展示页面
+    meta: { title: '首页', icon: 'example' },
+    children: [autoRouter[0]]
+  },
+  {
+    path: '/home',
+    name: 'home',
+    component: () => import('../views/layout/index'),
+    meta: { title: '首页', icon: 'example' },
+    children: [{
+      path:'/',
+      component: () => import('../views/home/index'),
+    }],
+  },
+  {
+    path: '/callback',
+    name: 'callback',
+    meta: { title: '认证' },
+    component: ()=> import('../views/callback/index')
+  },
+  {
+    path: '/slienceAuth',
+    name: 'slienceAuth',
+    meta: {title: '静默授权'},
+    component: () => import("../views/slienceAuth/index")
+  }
+]
+
+const router = new VueRouter({
+  routes
+})
+
+export default router

package/src/store/getters.js

@@ -1,13 +1,13 @@
-const getters = {
-  sidebar: state => state.app.sidebar,
-  device: state => state.app.device,
-  token: state => state.user.token,
-  avatar: state => state.user.avatar,
-  name: state => state.user.name,
-  widgetObj: state => state.widgetdata.widgetObj,
-  widgetMeta: state => state.widgetdata.meta,
-  menuList: state => state.app.menuList,
-  ossCfg: state => state.oss.ossCfg,
-  dic: state => state.dic.ask,
-}
-export default getters
+const getters = {
+  sidebar: state => state.app.sidebar,
+  device: state => state.app.device,
+  token: state => state.user.token,
+  avatar: state => state.user.avatar,
+  name: state => state.user.name,
+  widgetObj: state => state.widgetdata.widgetObj,
+  widgetMeta: state => state.widgetdata.meta,
+  menuList: state => state.app.menuList,
+  ossCfg: state => state.oss.ossCfg,
+  dic: state => state.dic.ask,
+}
+export default getters

package/src/store/index.js

@@ -1,58 +1,58 @@
-import Vue from 'vue'
-import Vuex from 'vuex'
-import getters from './getters'
-import app from './modules/app'
-import user from './modules/user'
-import widgetdata from './modules/widgetdata'
-import dic from './modules/dic'
-import oss from './modules/oss'
-
-const globalCfg = require("../modules/module.config");
-const importModules = globalCfg.IMPORT_MODULES;
-
-import storeConfig from '../modules/storeCfg.js'
-
-Vue.use(Vuex)
-
-const modulesDB = storeConfig;
-
-let mod = {};
-if (importModules) {
-  importModules.forEach(element => {
-    if (modulesDB[`module_${element}`]) {
-      mod[`module_${element}`] = Object.assign({}, {
-        namespaced: true,
-      }, modulesDB[`module_${element}`])
-    }
-  });
-}
-
-let storeCfg = {
-  state: {
-    search: null, // 全局搜索
-    glo_loading: false
-  },
-  mutations: {
-    setSearch(state, val) {
-      state.search = val
-    },
-
-    setLoading(state, val) {
-      state.glo_loading = val
-    }
-  },
-
-  modules: {
-    app,
-    user,
-    widgetdata,
-    dic,
-    oss,
-    ...mod
-  },
-  getters
-}
-
-const store = new Vuex.Store(storeCfg)
-
-export default store
+import Vue from 'vue'
+import Vuex from 'vuex'
+import getters from './getters'
+import app from './modules/app'
+import user from './modules/user'
+import widgetdata from './modules/widgetdata'
+import dic from './modules/dic'
+import oss from './modules/oss'
+
+const globalCfg = require("../modules/module.config");
+const importModules = globalCfg.IMPORT_MODULES;
+
+import storeConfig from '../modules/storeCfg.js'
+
+Vue.use(Vuex)
+
+const modulesDB = storeConfig;
+
+let mod = {};
+if (importModules) {
+  importModules.forEach(element => {
+    if (modulesDB[`module_${element}`]) {
+      mod[`module_${element}`] = Object.assign({}, {
+        namespaced: true,
+      }, modulesDB[`module_${element}`])
+    }
+  });
+}
+
+let storeCfg = {
+  state: {
+    search: null, // 全局搜索
+    glo_loading: false
+  },
+  mutations: {
+    setSearch(state, val) {
+      state.search = val
+    },
+
+    setLoading(state, val) {
+      state.glo_loading = val
+    }
+  },
+
+  modules: {
+    app,
+    user,
+    widgetdata,
+    dic,
+    oss,
+    ...mod
+  },
+  getters
+}
+
+const store = new Vuex.Store(storeCfg)
+
+export default store

package/src/store/modules/app.js

@@ -1,55 +1,55 @@
-import Cookies from 'js-cookie'
-
-const state = {
-  sidebar: {
-    opened: true,   //侧边栏默认关闭
-    withoutAnimation: false
-  },
-  menuList: [], // 侧边菜单
-  device: 'desktop'
-}
-
-const mutations = {
-  TOGGLE_SIDEBAR: state => {
-    state.sidebar.opened = !state.sidebar.opened
-    state.sidebar.withoutAnimation = false
-    if (state.sidebar.opened) {
-      Cookies.set('sidebarStatus', 1)
-    } else {
-      Cookies.set('sidebarStatus', 0)
-    }
-  },
-  CLOSE_SIDEBAR: (state, withoutAnimation) => {
-    Cookies.set('sidebarStatus', 0)
-    state.sidebar.opened = false
-    state.sidebar.withoutAnimation = withoutAnimation
-  },
-  TOGGLE_DEVICE: (state, device) => {
-    state.device = device
-  },
-  SET_MENULIST: (state, list) => {
-    state.menuList = list
-  }
-}
-
-const actions = {
-  toggleSideBar({ commit }) {
-    commit('TOGGLE_SIDEBAR')
-  },
-  closeSideBar({ commit }, { withoutAnimation }) {
-    commit('CLOSE_SIDEBAR', withoutAnimation)
-  },
-  toggleDevice({ commit }, device) {
-    commit('TOGGLE_DEVICE', device)
-  },
-  getMenuList({ commit }, list) {
-    commit('SET_MENULIST', list)
-  }
-}
-
-export default {
-  namespaced: true,
-  state,
-  mutations,
-  actions
-}
+import Cookies from 'js-cookie'
+
+const state = {
+  sidebar: {
+    opened: true,   //侧边栏默认关闭
+    withoutAnimation: false
+  },
+  menuList: [], // 侧边菜单
+  device: 'desktop'
+}
+
+const mutations = {
+  TOGGLE_SIDEBAR: state => {
+    state.sidebar.opened = !state.sidebar.opened
+    state.sidebar.withoutAnimation = false
+    if (state.sidebar.opened) {
+      Cookies.set('sidebarStatus', 1)
+    } else {
+      Cookies.set('sidebarStatus', 0)
+    }
+  },
+  CLOSE_SIDEBAR: (state, withoutAnimation) => {
+    Cookies.set('sidebarStatus', 0)
+    state.sidebar.opened = false
+    state.sidebar.withoutAnimation = withoutAnimation
+  },
+  TOGGLE_DEVICE: (state, device) => {
+    state.device = device
+  },
+  SET_MENULIST: (state, list) => {
+    state.menuList = list
+  }
+}
+
+const actions = {
+  toggleSideBar({ commit }) {
+    commit('TOGGLE_SIDEBAR')
+  },
+  closeSideBar({ commit }, { withoutAnimation }) {
+    commit('CLOSE_SIDEBAR', withoutAnimation)
+  },
+  toggleDevice({ commit }, device) {
+    commit('TOGGLE_DEVICE', device)
+  },
+  getMenuList({ commit }, list) {
+    commit('SET_MENULIST', list)
+  }
+}
+
+export default {
+  namespaced: true,
+  state,
+  mutations,
+  actions
+}

package/src/store/modules/dic.js

@@ -22,7 +22,7 @@
  let dicing = [];
  const actions = {
    GET_ASK({ state, commit }, { props, value }) {
-    if (!value) return;
+    if (!value || value == '0') return;
      let servers = props[0] || "";
      let tableName = props[1] || "";
      let key = servers + tableName;

package/src/store/modules/settings.js

@@ -1,28 +1,28 @@
-
-const state = {
-  showSettings: false,
-  fixedHeader: true,
-  sidebarLogo: true
-}
-
-const mutations = {
-  CHANGE_SETTING: (state, { key, value }) => {
-    if (state.hasOwnProperty(key)) {
-      state[key] = value
-    }
-  }
-}
-
-const actions = {
-  changeSetting({ commit }, data) {
-    commit('CHANGE_SETTING', data)
-  }
-}
-
-export default {
-  namespaced: true,
-  state,
-  mutations,
-  actions
-}
-
+
+const state = {
+  showSettings: false,
+  fixedHeader: true,
+  sidebarLogo: true
+}
+
+const mutations = {
+  CHANGE_SETTING: (state, { key, value }) => {
+    if (state.hasOwnProperty(key)) {
+      state[key] = value
+    }
+  }
+}
+
+const actions = {
+  changeSetting({ commit }, data) {
+    commit('CHANGE_SETTING', data)
+  }
+}
+
+export default {
+  namespaced: true,
+  state,
+  mutations,
+  actions
+}
+

package/src/store/modules/user.js

@@ -1,94 +1,94 @@
-import { getToken, setToken, removeToken } from '@/utils/auth'
-
-const getDefaultState = () => {
-  return {
-    token: getToken(),
-    name: '',
-    avatar: ''
-  }
-}
-
-const state = getDefaultState()
-
-const mutations = {
-  RESET_STATE: (state) => {
-    Object.assign(state, getDefaultState())
-  },
-  SET_TOKEN: (state, token) => {
-    state.token = token
-  },
-  SET_NAME: (state, name) => {
-    state.name = name
-  },
-  SET_AVATAR: (state, avatar) => {
-    state.avatar = avatar
-  }
-}
-
-const actions = {
-  // user login
-  login({ commit }, userInfo) {
-    const { username, password } = userInfo
-    return new Promise((resolve, reject) => {
-      login({ username: username.trim(), password: password }).then(response => {
-        const { data } = response
-        commit('SET_TOKEN', data.token)
-        setToken(data.token)
-        resolve()
-      }).catch(error => {
-        reject(error)
-      })
-    })
-  },
-
-  // get user info
-  getInfo({ commit, state }) {
-    return new Promise((resolve, reject) => {
-      getInfo(state.token).then(response => {
-        const { data } = response
-
-        if (!data) {
-          reject('Verification failed, please Login again.')
-        }
-
-        const { name, avatar } = data
-
-        commit('SET_NAME', name)
-        commit('SET_AVATAR', avatar)
-        resolve(data)
-      }).catch(error => {
-        reject(error)
-      })
-    })
-  },
-
-  // user logout
-  logout({ commit, state }) {
-    return new Promise((resolve, reject) => {
-      logout(state.token).then(() => {
-        removeToken() // must remove  token  first
-        commit('RESET_STATE')
-        resolve();
-      }).catch(error => {
-        reject(error)
-      })
-    })
-  },
-
-  // remove token
-  resetToken({ commit }) {
-    return new Promise(resolve => {
-      removeToken() // must remove  token  first
-      commit('RESET_STATE')
-      resolve()
-    })
-  }
-}
-
-export default {
-  namespaced: true,
-  state,
-  mutations,
-  actions
-}
-
+import { getToken, setToken, removeToken } from '@/utils/auth'
+
+const getDefaultState = () => {
+  return {
+    token: getToken(),
+    name: '',
+    avatar: ''
+  }
+}
+
+const state = getDefaultState()
+
+const mutations = {
+  RESET_STATE: (state) => {
+    Object.assign(state, getDefaultState())
+  },
+  SET_TOKEN: (state, token) => {
+    state.token = token
+  },
+  SET_NAME: (state, name) => {
+    state.name = name
+  },
+  SET_AVATAR: (state, avatar) => {
+    state.avatar = avatar
+  }
+}
+
+const actions = {
+  // user login
+  login({ commit }, userInfo) {
+    const { username, password } = userInfo
+    return new Promise((resolve, reject) => {
+      login({ username: username.trim(), password: password }).then(response => {
+        const { data } = response
+        commit('SET_TOKEN', data.token)
+        setToken(data.token)
+        resolve()
+      }).catch(error => {
+        reject(error)
+      })
+    })
+  },
+
+  // get user info
+  getInfo({ commit, state }) {
+    return new Promise((resolve, reject) => {
+      getInfo(state.token).then(response => {
+        const { data } = response
+
+        if (!data) {
+          reject('Verification failed, please Login again.')
+        }
+
+        const { name, avatar } = data
+
+        commit('SET_NAME', name)
+        commit('SET_AVATAR', avatar)
+        resolve(data)
+      }).catch(error => {
+        reject(error)
+      })
+    })
+  },
+
+  // user logout
+  logout({ commit, state }) {
+    return new Promise((resolve, reject) => {
+      logout(state.token).then(() => {
+        removeToken() // must remove  token  first
+        commit('RESET_STATE')
+        resolve();
+      }).catch(error => {
+        reject(error)
+      })
+    })
+  },
+
+  // remove token
+  resetToken({ commit }) {
+    return new Promise(resolve => {
+      removeToken() // must remove  token  first
+      commit('RESET_STATE')
+      resolve()
+    })
+  }
+}
+
+export default {
+  namespaced: true,
+  state,
+  mutations,
+  actions
+}
+