imatrix-ui 2.7.78-dw → 2.7.78

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "imatrix-ui",
-  "version": "2.7.78-dw",
+  "version": "2.7.78",
   "description": "前端组件库：表格、表单、组织结构树等",
   "main": "lib/super-ui.umd.min.js",
   "private": false,

package/src/api/tab.js

@@ -0,0 +1,30 @@
+const tabJs = {
+  addTabs(query, openTab, path, fullpath) {
+    let flag = false
+    let menuCode
+    let menuName
+    if (query) {
+      menuCode = query._menuCode
+      menuName = query._menuName
+    }
+    if (openTab && menuCode) {
+      for (let i = 0; i < openTab.length; i++) {
+        const item = openTab[i]
+        console.log('item.name', item.name)
+
+        if (menuCode && item.code === menuCode) {
+          console.log('to.path--menuCode1=', menuCode)
+          this.$store.commit('set_active_index', menuCode)
+          flag = true
+          break
+        }
+      }
+    }
+    if (!flag && menuCode) {
+      console.log('to.path--menuCode2=', menuCode)
+      this.$store.commit('add_tabs', { code: menuCode, name: menuName, routePath: path, routeQuery: query, fullpath: fullpath })
+      this.$store.commit('set_active_index', menuCode)
+    }
+  }
+}
+export default tabJs

package/src/i18n/i18n.js

@@ -1,5 +1,5 @@
 import Vue from 'vue'
-import locale from '@gcommon/gcommon-ui/lib/locale'
+import locale from 'element-ui/lib/locale'
 import VueI18n from 'vue-i18n'
 import en from './langs/en'
 import cn from './langs/cn'

package/src/i18n/langs/cn.js

@@ -1,4 +1,4 @@
-import zhLocale from '@gcommon/gcommon-ui/lib/locale/lang/zh-CN'
+import zhLocale from 'element-ui/lib/locale/lang/zh-CN'
 const cn = {
   imatrixUIPublicModel: {
     sure: '确定',
@@ -67,7 +67,10 @@ const cn = {
     invalideDoubleValue: '{num} 不是合法的小数',
     noJumpPage: '未配置跳转页面',
     saveSuccessfully: '保存成功',
-    pleaseInputSearchCondition: '请输入查询条件'
+    pleaseInputSearchCondition: '请输入查询条件',
+    fileUpload: '文件上传',
+    selectYear: '选择年',
+    search: '查询'
   },
   // 列表组件
   superGrid: {
@@ -105,7 +108,9 @@ const cn = {
     selectAll: '全选',
     viewImage: '查看图片',
     previewTitleWhenNotImg: '非图片格式，使用其它方式预览',
-    refresh: '刷新'
+    refresh: '刷新',
+    open: '展开',
+    fold: '收起'
   },
   // 部门树组件
   departmentTree: {

package/src/i18n/langs/en.js

@@ -1,4 +1,4 @@
-import enLocale from '@gcommon/gcommon-ui/lib/locale/lang/en'
+import enLocale from 'element-ui/lib/locale/lang/en'
 const en = {
   imatrixUIPublicModel: {
     sure: 'Sure',
@@ -67,7 +67,10 @@ const en = {
     invalideDoubleValue: '{num} is not a legal decimal',
     noJumpPage: 'Jump page not configured',
     saveSuccessfully: 'Savee successfully',
-    pleaseInputSearchCondition: 'Please enter the query criteria'
+    pleaseInputSearchCondition: 'Please enter the query criteria',
+    fileUpload: 'File Upload',
+    selectYear: 'Select Year',
+    search: 'Search'
   },
   superGrid: {
     columnConfig: 'Column Config',
@@ -104,7 +107,9 @@ const en = {
     selectAll: 'Select All',
     viewImage: 'View Image',
     previewTitleWhenNotImg: 'Non picture format, preview in other ways',
-    refresh: 'Refresh'
+    refresh: 'Refresh',
+    open: 'Open',
+    fold: 'Fold'
   },
   departmentTree: {
 

package/src/permission.js

@@ -4,10 +4,10 @@ import { getToken, setToken } from './utils/auth' // 验权
 import store from './store'
 import router, { errorRouterMap } from './router'
 NProgress.configure({ showSpinner: false })// NProgress Configuration
-import { Message } from '@gcommon/gcommon-ui'
+import { Message } from 'element-ui'
 import Vue from 'vue'
 
-const whiteList = ['/login', '/update-password', '/forget-password', '/reset-password', '/redirect', '/login-auto'] // 不重定向白名单
+const whiteList = ['/login', '/update-password', '/forget-password', '/reset-password', '/redirect'] // 不重定向白名单
 router.beforeEach((to, from, next) => {
   NProgress.start()
   console.log('router.beforeEach-to=', to)
@@ -32,7 +32,7 @@ router.beforeEach((to, from, next) => {
   // console.log('router.beforeEach-getToken()=', token)
   if (['/update-password', '/forget-password', '/reset-password', '/redirect'].indexOf(to.path) === -1 && token) {
     if (to.path === '/login') {
-      next({ path: '/', query: to.query })
+      next({ path: '/' })
       NProgress.done() // if current page is dashboard will not trigger	afterEach hook, so manually handle it
     } else {
       console.log('router.beforeEach-to.path!=login')

package/src/plugins.js

@@ -3,9 +3,9 @@ import Vue from 'vue'
 import 'normalize.css/normalize.css' // A modern alternative to CSS resets
 import './styles/index.scss' // global css
 
-import ElementUI from '@gcommon/gcommon-ui'
-import '@gcommon/gcommon-ui/lib/theme-chalk/index.css'
-import locale from '@gcommon/gcommon-ui/lib/locale/lang/zh-CN' // lang i18n
+import ElementUI from 'element-ui'
+import 'element-ui/lib/theme-chalk/index.css'
+import locale from 'element-ui/lib/locale/lang/zh-CN' // lang i18n
 
 import SuperUI from 'imatrix-ui'
 import 'imatrix-ui/lib/super-ui.css'

package/src/store/getters.js

@@ -7,6 +7,8 @@ const getters = {
   protectedRouters: state => state.permission.protectedRouters,
   currentUserPermissions: state => state.permission.currentUserPermissions,
   preventReclick: state => state.app.preventReclick,
-  menus: state => state.user.menus
+  menus: state => state.user.menus,
+  openTab: state => state.tabContent.openTab,
+  activeIndex: state => state.tabContent.activeIndex
 }
 export default getters

package/src/store/index.js

@@ -3,6 +3,7 @@ import Vuex from 'vuex'
 import app from './modules/app'
 import user from './modules/user'
 import permission from './modules/permission'
+import tabContent from './modules/tab-content'
 import getters from './getters'
 
 Vue.use(Vuex)
@@ -11,7 +12,8 @@ const store = new Vuex.Store({
   modules: {
     app,
     user,
-    permission
+    permission,
+    tabContent
   },
   getters
 })

package/src/store/modules/tab-content.js

@@ -0,0 +1,32 @@
+const tabContent = {
+  state: {
+    openTab: [], // 所有打开的路由
+    activeIndex: null // 激活状态
+  },
+  mutations: {
+    // 添加tabs
+    add_tabs(state, data) {
+      state.openTab.push(data)
+    },
+    // 删除tabs
+    delete_tabs(state, route) {
+      let index = 0
+      for (const option of state.openTab) {
+        if (option.code === route.code) {
+          break
+        }
+        index++
+      }
+      state.openTab.splice(index, 1)
+    },
+    // 设置当前激活的tab
+    set_active_index(state, index) {
+      state.activeIndex = index
+    }
+  },
+  actions: {
+
+  }
+}
+
+export default tabContent

package/src/styles/index.scss

@@ -32,3 +32,20 @@ body .el-table th.gutter {
 body .el-table colgroup.gutter {
   display: table-cell !important;
 }
+
+
+.card-title{
+  width:4px;
+  height:22px;
+  position: absolute;
+  left:0;
+  align-items:center;
+  text-align:center
+}
+
+.card-title-bgc{
+  width:4px;
+  height:14px;
+  display:inline-block;
+  background-color:#3081f2
+}

package/src/styles/theme/gray/font-style.scss

@@ -6,4 +6,21 @@
     cursor: pointer;
   }
 
+  .form-list-file {
+    color: rgba(0, 0, 0, 0.65);
+    background: #F2F6FA;
+    border-radius: 6px;
+    font-size: 14px;
+    cursor: pointer;
+    height: 28px;
+    line-height: 28px;
+    padding: 0 8px 0 8px;
+    margin-right: 32px
+  }
+
+  .tip-font {
+    color: rgba(0, 0, 0, 0.65);
+    font-size: 14px;
+  }
+
 }

package/src/styles/theme/gray/index.scss

@@ -1,14 +1,5 @@
 @import './sidebar.scss';
 @import './font-style.scss';
-
-.gray .el-dialog__header {
-  padding: 10px 10px 10px;
-}
-
-.gray .el-dialog__body {
-  padding: 10px 10px;
-}
-
 .gray {
   font-family: microsoft yahei, Arial, Helvetica, sans-serif;
   font-size: 14px;
@@ -75,16 +66,23 @@
 
   //main-container全局样式
   .app-main {
-    min-height: 100%
+    min-height: 100%;
+    background: #f7f7f8;
   }
 
   .app-container {
-    padding: 20px;
+    // padding: 20px;
+    padding: 0px;
+    .box-card {
+      margin: 16px 24px 24px 24px;
+      .el-card__body {
+        padding-top: 16px;
+      }
+    }
   }
 
   .operation-area {
-    margin-bottom: 10px;
-    height: 40px;
+    margin-bottom: 16px;
   }
 
   .form-container {
@@ -133,56 +131,20 @@
   .el-tree-node.is-current>.el-tree-node__content {
     background-color: #c2d6ea !important;
   }
-
-  // .el-pagination {
-  //   background: #fff;
-  //   text-align: center;
-  //   padding: 5px 0;
-  //   color: #777;
-  // }
-
-  // .el-pager li.active {
-  //   color: #4A4A4A;
-  //   background: #FBE997;
-  //   border-radius: 50px;
-  // }
-
-  // .el-table td,
-  // .el-table th {
-  //   padding: 10px 0;
-  //   min-width: 0;
-  //   -webkit-box-sizing: border-box;
-  //   box-sizing: border-box;
-  //   text-overflow: ellipsis;
-  //   vertical-align: middle;
-  //   position: relative;
-  //   text-align: left
-  // }
-
-  // .el-table--enable-row-hover .el-table__body tr:hover>td {
-  //   background-color: #FFF3CB
-  // }
-
-  // .el-table--striped .el-table__body tr.el-table__row--striped.current-row td,
-  // .el-table__body tr.current-row>td,
-  // .el-table__body tr.hover-row.current-row>td,
-  // .el-table__body tr.hover-row.el-table__row--striped.current-row>td,
-  // .el-table__body tr.hover-row.el-table__row--striped>td,
-  // .el-table__body tr.hover-row>td {
-  //   background-color: #FFF3CB
-  // }
-
-  // .el-table th {
-  //   background-color: #eee;
-  //   color: #555
-  // }
-
-  // // 列表表头整个都有背景色
-  // .el-table .el-table__header-wrapper {
-  //   background: #eee;
-  // }
   .menu-tab-container .el-tabs__item {
     height: 48px;
     line-height: 48px;
   }
+
+  //顶部标签字体样式
+  .menu-tab-container .el-tabs__item.is-active{
+    color:#3D4cf2;
+  }
+  //顶部标签样式
+  .menu-tab-container .el-tabs__active-bar{
+    background-color: #3D4cf2;
+  }
+  .el-pagination {
+    text-align: right;
+  }
 }

package/src/utils/jump-page-utils.js

@@ -117,6 +117,18 @@ export function openPage(pageSetting) {
   }
 }
 
+// 附加参数中是否设值了ID参数。如果添加了id参数，则不需要自动添加dataId参数
+function isHasIdAdditionalParam(jumpPageAdditional) {
+  if (jumpPageAdditional && jumpPageAdditional.length > 0) {
+    for (let i = 0; i < jumpPageAdditional.length; i++) {
+      const item = jumpPageAdditional[i]
+      if (item.paramName && (item.paramName === 'id' || item.paramName === 'ID')) {
+        return true
+      }
+    }
+  }
+}
+
 // 页面跳转处理，api方法;additionalParamMap是上个页面传过来的附加参数集合;
 // isFromChart 是否是从chart方面来，如果是，则弹窗和刷新页面都用winows方式打开
 export function jumpToPage(jumpPageSetting, system, dataId, entity, additionalParamMap, ids, buttonCode, parentFormData) {
@@ -138,6 +150,7 @@ export function jumpToPage(jumpPageSetting, system, dataId, entity, additionalPa
         paramMap.additionalParamMap = additionalParamMap
         console.log('paramMap.parentFormData', parentFormData)
         paramMap.parentFormData = parentFormData
+        const isHasIdParam = isHasIdAdditionalParam(jumpPageSetting.jumpPageAdditional)
 
         Vue.prototype.$http.post(paramPath, paramMap).then((result) => {
           let paramStoreId = ''
@@ -147,13 +160,13 @@ export function jumpToPage(jumpPageSetting, system, dataId, entity, additionalPa
           }
           jumpPageSetting.paramStoreId = paramStoreId
           // 存入缓存
-          jumpToPageTwo(jumpPageSetting, system, dataId, ids, buttonCode).then(openPageParams => {
+          jumpToPageTwo(jumpPageSetting, system, dataId, ids, buttonCode, isHasIdParam).then(openPageParams => {
             // openPageParams:xxx弹框打开页面时需要的参数 或 刷新页面时路由查询参数
             resolve(openPageParams)
           })
         })
       } else {
-        jumpToPageTwo(jumpPageSetting, system, dataId, ids, buttonCode).then(openPageParams => {
+        jumpToPageTwo(jumpPageSetting, system, dataId, ids, buttonCode, false).then(openPageParams => {
           // openPageParams:xxx弹框打开页面时需要的参数 或 刷新页面时路由查询参数
           resolve(openPageParams)
         })
@@ -204,7 +217,7 @@ function isFullPath(path) {
   return path.indexOf('http:') === 0 || path.indexOf('https:') === 0
 }
 // 正式跳转
-function jumpToPageTwo(jumpPageSetting, system, dataId, ids, buttonCode) {
+function jumpToPageTwo(jumpPageSetting, system, dataId, ids, buttonCode, isHasIdParam) {
   return new Promise((resolve, reject) => {
     const jumpPageUrl = jumpPageSetting.jumpPageUrl
     if (!jumpPageUrl) {
@@ -212,7 +225,7 @@ function jumpToPageTwo(jumpPageSetting, system, dataId, ids, buttonCode) {
     }
     if (jumpPageUrl.indexOf('page:') === 0) {
       // 表示是自定义系统跳转页面编码
-      jumpWithSuperPage(jumpPageUrl, system, dataId, jumpPageSetting, ids, buttonCode).then((openPageParams) => {
+      jumpWithSuperPage(jumpPageUrl, system, dataId, jumpPageSetting, ids, buttonCode, isHasIdParam).then((openPageParams) => {
         resolve(openPageParams)
       })
     } else {
@@ -230,7 +243,7 @@ function jumpToPageTwo(jumpPageSetting, system, dataId, ids, buttonCode) {
         const frontendUrl = getSystemFrontendUrl(system.frontendUrl)
         path = frontendUrl + '/#' + path
       }
-      jumpToPageWithFullPath(dataId, path, additionalParameterStr, jumpPageSetting, ids, buttonCode)
+      jumpToPageWithFullPath(dataId, path, additionalParameterStr, jumpPageSetting, ids, buttonCode, isHasIdParam)
       resolve()
     }
   })
@@ -242,8 +255,8 @@ function jumpToPageTwo(jumpPageSetting, system, dataId, ids, buttonCode) {
  * @param {*} additionalParameterStr
  * @param {*} jumpPage
  */
-function jumpToPageWithFullPath(dataId, path, additionalParameterStr, jumpPage, ids, buttonCode) {
-  path = packagePathParams(dataId, path, jumpPage, ids, buttonCode)
+function jumpToPageWithFullPath(dataId, path, additionalParameterStr, jumpPage, ids, buttonCode, isHasIdParam) {
+  path = packagePathParams(dataId, path, jumpPage, ids, buttonCode, isHasIdParam)
   // 保持这种情况参数传递，是为了解决不同域时获得不到sessionStorage中存的附加参数问题
   if (additionalParameterStr && additionalParameterStr !== '') {
     if (path.indexOf('?') !== -1) {
@@ -289,9 +302,9 @@ function jumpToPageWithFullPath(dataId, path, additionalParameterStr, jumpPage,
 }
 
 // path封装参数
-function packagePathParams(dataId, path, jumpPage, ids, buttonCode) {
+function packagePathParams(dataId, path, jumpPage, ids, buttonCode, isHasIdParam) {
   if (jumpPage.isNeedId === undefined || jumpPage.isNeedId === null || jumpPage.isNeedId === true) {
-    if (dataId) {
+    if (!isHasIdParam && dataId) {
       // 表示是修改或查看页面，封装id参数
       let paramSeparator = '?'
       if (path.indexOf('?') > 0) {
@@ -339,7 +352,7 @@ function getPageCode(jumpPageUrl) {
   return pageCode
 }
 // 使用页面组件内部调整
-function jumpWithSuperPage(jumpPageUrl, system, dataId, jumpPageSetting, ids, buttonCode) {
+function jumpWithSuperPage(jumpPageUrl, system, dataId, jumpPageSetting, ids, buttonCode, isHasIdParam) {
   return new Promise((resolve, reject) => {
     // 表示是自定义系统跳转页面编码
     console.log('----jumpWithSuperPage---', jumpPageUrl, system, dataId, jumpPageSetting)
@@ -355,14 +368,14 @@ function jumpWithSuperPage(jumpPageUrl, system, dataId, jumpPageSetting, ids, bu
     }
     sessionStorage.setItem(pageCode + '-jumpMode', JSON.stringify(jumpJsonData))
     if (jumpMode === 'popup') {
-      const path = packageOpenUrl(system, pageCode, dataId, jumpPageSetting, jumpMode, ids, buttonCode)
+      const path = packageOpenUrl(system, pageCode, dataId, jumpPageSetting, jumpMode, ids, buttonCode, isHasIdParam)
       // 页面布局中的按钮打开
       const popPageSetting = openDialogWhenPopup(jumpPageSetting, system, pageCode, dataId, jumpMode, ids, buttonCode)
       popPageSetting._path = path
       resolve(popPageSetting)
     } else if (jumpMode === 'newTab') {
       // 新页签打开
-      const path = packageOpenUrl(system, pageCode, dataId, jumpPageSetting, jumpMode, ids, buttonCode)
+      const path = packageOpenUrl(system, pageCode, dataId, jumpPageSetting, jumpMode, ids, buttonCode, isHasIdParam)
       window.open(path)
       resolve()
     } else {
@@ -375,7 +388,7 @@ function jumpWithSuperPage(jumpPageUrl, system, dataId, jumpPageSetting, ids, bu
         ids: ids ? ids.join(',') : ''
       }
       if (jumpPageSetting.isNeedId === undefined || jumpPageSetting.isNeedId === null || jumpPageSetting.isNeedId === true) {
-        if (dataId) {
+        if (!isHasIdParam && dataId) {
           // 表示是修改或查看页面，封装id参数
           queryParam.id = dataId
         }
@@ -384,7 +397,7 @@ function jumpWithSuperPage(jumpPageUrl, system, dataId, jumpPageSetting, ids, bu
       if (paramStoreId && paramStoreId !== '') {
         queryParam['paramStoreId'] = paramStoreId
       }
-      const path = packageOpenUrl(system, pageCode, dataId, jumpPageSetting, jumpMode, ids, buttonCode)
+      const path = packageOpenUrl(system, pageCode, dataId, jumpPageSetting, jumpMode, ids, buttonCode, isHasIdParam)
       queryParam._path = path
       resolve(queryParam)
     }
@@ -432,10 +445,10 @@ function openDialogWhenPopup(jumpPageSetting, system, pageCode, dataId, jumpMode
   return popPageSetting
 }
 
-function packageOpenUrl(system, pageCode, dataId, jumpPageSetting, jumpMode, ids, buttonCode) {
+function packageOpenUrl(system, pageCode, dataId, jumpPageSetting, jumpMode, ids, buttonCode, isHasIdParam) {
   const frontendUrl = getSystemFrontendUrl(system.frontendUrl)
   const path = frontendUrl + '/#/dsc-full-screen/page?customSystem=' + system.code + '&pageCode=' + pageCode + '&jumpMode=' + jumpMode
-  return packagePathParams(dataId, path, jumpPageSetting, ids, buttonCode)
+  return packagePathParams(dataId, path, jumpPageSetting, ids, buttonCode, isHasIdParam)
 }
 
 // 解析跳转页面附带参数

package/src/utils/request.js

@@ -1,7 +1,7 @@
 import axios from 'axios'
 import {
   Message
-} from '@gcommon/gcommon-ui'
+} from 'element-ui'
 import {
   getToken,
   removeToken

package/src/views/404.vue

@@ -8,18 +8,18 @@
         <img class="pic-404__child right" src="@/assets/404/404-cloud.png" alt="404">
       </div>
       <div class="bullshit">
-        <div class="bullshit__oops">
-          OOPS!
+        <div class="bullshit__oops">
+          OOPS!
         </div>
-        <div class="bullshit__info">
+        <div class="bullshit__info">
           版权所有
           <a class="link-type" href="https://wallstreetcn.com" target="_blank">华尔街见闻</a>
         </div>
-        <div class="bullshit__headline">
-          {{ message }}
+        <div class="bullshit__headline">
+          {{ message }}
         </div>
-        <div class="bullshit__info">
-          请检查您输入的网址是否正确，请点击以下按钮返回主页或者发送错误报告
+        <div class="bullshit__info">
+          请检查您输入的网址是否正确，请点击以下按钮返回主页或者发送错误报告
         </div>
         <a href="" class="bullshit__return-home">返回首页</a>
       </div>

package/src/views/dsc-component/Sidebar/Item.vue

@@ -0,0 +1,58 @@
+<script>
+export default {
+  name: 'MenuItem',
+  functional: true,
+  props: {
+    icon: {
+      type: String,
+      default: ''
+    },
+    title: {
+      type: String,
+      default: ''
+    },
+    hasChildren: {
+      type: Boolean,
+      default: false
+    },
+    isRoot: {
+      type: Boolean,
+      default: false
+    }
+  },
+  render(h, context) {
+    let icon = context.props.icon
+    const { title, hasChildren, isRoot } = context.props
+    const vnodes = []
+
+    if (icon) {
+      if (icon.indexOf('fa-') === 0) {
+        // 表示以“fa-”开头，使用font-awesome中的图标
+        icon = 'fa ' + icon
+      }
+      icon += ' svg-icon'
+      vnodes.push(<div style='display: inline-block;'><i class={icon}/></div>)
+    }
+
+    if (title) {
+      let width = '130px'
+      if (hasChildren) {
+        // 当是父菜单时，为了使后面的三角能显示出来，需要将宽度设小点
+        width = '100px'
+      }
+      if (isRoot) {
+        // 是否是根目录，没有子菜单时
+        vnodes.push(<div style='display: inline-block'>
+          <div title={title} style={'display: inline-block;width:' + width + ';overflow:hidden;text-overflow:ellipsis;white-space:nowrap;word-break:keep-all;'}>{(title)}</div>
+        </div>)
+      } else {
+        // 有子菜单时
+        vnodes.push(<div slot='title' style='display: inline-block'>
+          <div title={title} style={'display: inline-block;width:' + width + ';overflow:hidden;text-overflow:ellipsis;white-space:nowrap;word-break:keep-all;'}>{(title)}</div>
+        </div>)
+      }
+    }
+    return vnodes
+  }
+}
+</script>

package/src/views/dsc-component/Sidebar/Link.vue

@@ -0,0 +1,31 @@
+
+<template>
+  <div>
+    <!-- eslint-disable vue/require-component-is-->
+    <!-- <a v-if="isExter" :href="to.path" target="_blank" rel="noopener">
+    <slot />
+  </a> -->
+
+    <router-link :to="to">
+      <slot />
+    </router-link>
+  </div>
+</template>
+
+<script>
+
+export default {
+  props: {
+    to: {
+      type: Object,
+      required: true
+    }
+  },
+  data() {
+    const isExter = this.to.isExternal
+    return {
+      isExter
+    }
+  }
+}
+</script>