imatrix-ui 2.9.8-dw → 2.9.8-pv2

package/package.json

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

package/packages/plugins/export-data-new.js

@@ -6,7 +6,7 @@ import {
 import nineGridStore from '../super-nine-grid/src/store'
 import {
   Message
-} from '@gcommon/gcommon-ui'
+} from 'element-ui'
 import {
   packageEnumAndBeanColumnValueSets
 } from '../utils/value-set'

package/packages/plugins/export-data.js

@@ -6,7 +6,7 @@ import {
 import nineGridStore from '../super-nine-grid/src/store'
 import {
   Message
-} from '@gcommon/gcommon-ui'
+} from 'element-ui'
 import {
   packageEnumAndBeanColumnValueSets
 } from '../utils/value-set'

package/packages/super-grid/src/search-form-item.vue

@@ -41,7 +41,7 @@
       type="yearRange"
       @change="setYearRangeValue(column.prop,$event)"
     />
-    <el-g-date-picker
+    <el-date-picker
       v-else-if="column.componentType==='dateTimePicker'"
       :value="getFormItemValue(column.prop)"
       :default-time="getDefaultTime(column)"

package/packages/super-grid/src/super-grid.vue

@@ -1346,86 +1346,51 @@ export default {
           gridParams.options.subTableData &&
           gridParams.options.subTableData.length > 0
         ) {
-          this.packageSubTableData(gridParams, gridParams.options.subTableData)
-        } else {
-          const isCanRefreshTableData = this.canRefreshTableData(gridParams)
-          if (isCanRefreshTableData) {
-            // 可以刷新表格记录
-            return this.fetchListData(searchParam, isSearch, parentRowIds, resove)
-          } else {
-            // 子表无记录时不需要刷新子表记录。表示是新建或修改时子表无记录，且不需要刷新子表。
-            if (
-              this.isSubTableEmpty(gridParams)
-            ){
-              // 表示是新建表单时，子表记录集合是空数组
-              console.log('子表无记录----code=', this.code, gridParams)
-              const subTableData = []
-              this.packageSubTableData(gridParams,subTableData)
+          this.hasLoadData = false
+          gridParams.loaded = true
+          let subTableData = []
+          // 如果有子表数据，则展示传递的子表数据
+          if (isHasOptionFunction('gridDataLoaded', this.code)) {
+            const gridData = gridParams.options.gridDataLoaded.call(this, {
+              gridData: gridParams.options.subTableData,
+              columns: gridParams.columns
+            })
+            if (gridData) {
+              subTableData = gridData
+              this.hasLoadData = true
+            } else {
+              subTableData = gridParams.options.subTableData
+              this.hasLoadData = true
             }
+          } else {
+            subTableData = gridParams.options.subTableData
             this.hasLoadData = true
-            gridParams.loaded = true
           }
-        }
-      }
-    },
-    isSubTableEmpty (gridParams) {
-      return gridParams.options && gridParams.options.isFormSubTable &&
-      ((gridParams.options.subTableData === undefined || gridParams.options.subTableData === null) ||
-      gridParams.options.subTableData.length === 0)
-    },
-    packageSubTableData(gridParams, initSubTableData) {
-      this.hasLoadData = false
-      gridParams.loaded = true
-      let subTableData = []
-      // 如果有子表数据，则展示传递的子表数据
-      if (isHasOptionFunction('gridDataLoaded', this.code)) {
-        const gridData = gridParams.options.gridDataLoaded.call(this, {
-          gridData: initSubTableData,
-          columns: gridParams.columns
-        })
-        if (gridData) {
-          subTableData = gridData
-          this.hasLoadData = true
+          if (subTableData) {
+            // 子表时所有记录的所有字段设置默认值null，优化子表编辑时性能
+            subTableData.forEach(item => {
+              this.setColumnsDefaultValue(gridParams.allColumns, item)
+            })
+          }
+          if (this.pagination && this.isSubTableShowPage === true) {
+            // 表示子表需要显示分页
+            this.subTableData = subTableData
+            // 更新记录总条数
+            this.pagination.total = this.subTableData.length
+            gridParams.subTableData = this.subTableData
+            this.gridData = this.getSubTableGridData(this.subTableData)
+          } else {
+            this.gridData = subTableData
+          }
+          gridParams.gridData = this.gridData
+          // 完成深拷贝，复制一份对象，行编辑时使用
+          gridParams.orgGridData = [].concat(
+            JSON.parse(JSON.stringify(this.gridData))
+          )
         } else {
-          subTableData = initSubTableData
-          this.hasLoadData = true
+          return this.fetchListData(searchParam, isSearch, parentRowIds, resove)
         }
-      } else {
-        subTableData = initSubTableData
-        this.hasLoadData = true
-      }
-      if (subTableData) {
-        // 子表时所有记录的所有字段设置默认值null，优化子表编辑时性能
-        subTableData.forEach(item => {
-          this.setColumnsDefaultValue(gridParams.allColumns, item)
-        })
-      }
-      if (this.pagination && this.isSubTableShowPage === true) {
-        // 表示子表需要显示分页
-        this.subTableData = subTableData
-        // 更新记录总条数
-        this.pagination.total = this.subTableData.length
-        gridParams.subTableData = this.subTableData
-        this.gridData = this.getSubTableGridData(this.subTableData)
-      } else {
-        this.gridData = subTableData
-      }
-      gridParams.gridData = this.gridData
-      // 完成深拷贝，复制一份对象，行编辑时使用
-      gridParams.orgGridData = [].concat(
-        JSON.parse(JSON.stringify(this.gridData))
-      )
-    },
-    canRefreshTableData (gridParams) {
-      let isCanRefreshTableData = false
-      if (gridParams.options && !gridParams.options.isFormSubTable) {
-        // 如果不是子表时
-        isCanRefreshTableData = true
-      } else if (gridParams.options && gridParams.options.isFormSubTable && gridParams.options.canRrefreshSubtableData !== undefined && gridParams.options.canRrefreshSubtableData === true) {
-        // 是子表，且配置了子表无记录时更新子表记录集合
-        isCanRefreshTableData = true
       }
-      return isCanRefreshTableData
     },
     getSubTableGridData(subTableData) {
       let gridData = subTableData
@@ -2052,7 +2017,6 @@ export default {
     handleSizeChange(val) {
       if (!this.options || !this.options.isPageShow) {
         // console.log(`每页 ${val} 条`)
-        this.currentPage = 1
         this.pageSize = val
         this.changePage()
       }

package/packages/super-nine-grid/src/super-nine-grid.vue

@@ -27,15 +27,21 @@
           </el-col>
           <el-col v-for="(params,index) in gridData" :key="params.id" :span="6" :offset="1.5" class="col-content">
             <el-card :body-style="{ padding: '0px' }" shadow="hover">
-              <div @mouseenter="enter(index)" @mouseleave="leave()" @click="clickContent(params)">
+              <!-- <div @mouseenter="enter(index)" @mouseleave="leave()" @click="clickContent(params)"> -->
+              <div @click="clickContent(params)">
                 <transition name="fade">
-                  <div v-if="seen && index === current" class="popContainer">
-                    <div class="else-button">
+                  <!-- <div v-if="seen && index === current" class="popContainer"> -->
+                  <div class="popContainer">
+                    <div class="else-button" style="background: rgba(0,0,0,0.5); min-height: 20%;">
+                      <!-- <div class="else-button" style="min-height: 20%;"> -->
+                      <slot :name="slotBefore" :params="params" />
                       <template v-for="button in operations">
                         <template v-if="isShowButton(params, button)">
                           <el-tooltip v-if="button.icon" :key="button.name" v-permission="button.permission?button.permission:'true'" class="item" effect="dark" :content="button.name" placement="top">
+                            <!-- <em style="color: black;" :class="button.icon +' icons'" @click.stop="buttonClick(button.event, params)" /> -->
                             <em :class="button.icon +' icons'" @click.stop="buttonClick(button.event, params)" />
                           </el-tooltip>
+                          <!-- <em v-else :key="button.name" v-permission="button.permission?button.permission:'true'" style="color: black;" :class="button.name +' icons'" @click.stop="buttonClick(button.event, params)">{{ button.name }} </em> -->
                           <em v-else :key="button.name" v-permission="button.permission?button.permission:'true'" :class="button.name +' icons'" @click.stop="buttonClick(button.event, params)">{{ button.name }} </em>
                         </template>
                       </template>
@@ -160,7 +166,7 @@
     width: 23.15%;
     display: block;
     height: 200px;
-    background: rgba(0,0,0,0.5);
+    // background: rgba(0,0,0,0.5);
     text-align: right;
   }
   .fade-enter-active, .fade-leave-active {
@@ -280,7 +286,8 @@ export default {
       storeId,
       currentId: null, // 当前点击的记录id
       isShowRadio, // 单选时是否显示单选按钮
-      titleStyle: null // 标题的样式对象，格式为：{ color: 'green', fontWeight: 'bold'}
+      titleStyle: null, // 标题的样式对象，格式为：{ color: 'green', fontWeight: 'bold'}
+      slotBefore: 'before'
     }
   },
   computed: {

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: '确定',

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',

package/src/permission.js

@@ -4,7 +4,7 @@ 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'] // 不重定向白名单

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/styles/index.scss

@@ -9,8 +9,8 @@
 @import './theme/blue2/sidebar.scss';
 @import './theme/gray/index.scss';
 @import './theme/gray/sidebar.scss';
-// @import './theme/dark-blue/index.scss';
-// @import './theme/dark-blue/sidebar.scss';
+@import './theme/dark-blue/index.scss';
+@import './theme/dark-blue/sidebar.scss';
 @import './display-layout.scss';
 
 body {

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

@@ -79,11 +79,8 @@
       }
 
       .el-menu {
-        position: static;
         border: none;
-        // height: 100%;
-        height: auto;
-        max-height: 100vh;
+        height: 100%;
         width: 100% !important;
         background-color: #FFF;
         color: #000D1F
@@ -191,22 +188,13 @@
     }
   }
 
-  .sidebar-container-popper .el-menu{
-    // height: 100vh;
-    height: auto;
-    max-height: 100vh;
-    overflow-y: auto;
-    overflow-x: hidden;
-    scroll-behavior: smooth;
-  }
-
   .sidebar-container-popper .el-submenu__title:not(.is-disabled):hover {
     background: #F7F7F8;
     color: rgba(0, 13, 31, 0.85);
     font-weight: 500;
   }
 
-  .sidebar-container-popper .el-menu-item.is-active,.sidebar-container-popper .el-menu .el-submenu.is-active>.el-submenu__title {
+  .sidebar-container-popper .el-menu .el-submenu.is-active>.el-submenu__title {
     background-color: #EBECFF !important;
     color: #3D4CF2;
     font-weight: 500;

package/src/utils/common-util.js

@@ -1,7 +1,5 @@
 import sessionStorage from 'sessionstorage'
 import Vue from 'vue'
-import authApi from './auth-api'
-import { getToken } from './auth'
 /**
  * 获得相对地址
  */
@@ -171,7 +169,7 @@ export function isPlateSys(systemCode) {
       systemCode === 'mms' || systemCode === 'task' ||
       systemCode === 'wf' || systemCode === 'dc' ||
       systemCode === 'mc' || systemCode === 'mobile' ||
-      systemCode === 'acs' || systemCode === 'bs' || systemCode === 'pcm')) {
+      systemCode === 'acs' || systemCode === 'bs')) {
     return true
   } else {
     return false
@@ -225,90 +223,3 @@ export function getTimeZone() {
   }
   return timeZone
 }
-
-export function isMobileBrowser() {
-  if (/Android|webOS|iPhone|iPad|iPod|BlackBerry|IEMobile|Opera Mini|Opera Mobi|Windows CE|Symbian|Windows Phone|POLARIS|lgtelecom|nokia|SonyEricsson|LG|SAMSUNG|Samsung/i
-				.test(navigator.userAgent)) {
-			//移动端浏览器
-			return true
-		} else {
-			//PC浏览器
-			return false
-		}
-}
-
-export function getLocaleByLang(lang) {
-  let locale = 'cn'
-  if (lang && lang.indexOf('_') > 0) {
-    const language = lang.substring(0, lang.indexOf('_'))
-    locale = language
-  }
-  if (locale === 'zh') {
-    locale = 'cn'
-  }
-  return locale
-}
-
-const langKey = 'AMB_LANG_INFO'
-
-export function cacheLangs(langs) {
-  let langResult
-  if(langs) {
-    langResult = JSON.stringify(langs)
-  }
-  return authApi.setCookieCache(langKey,langResult)
-}
-
-export function getLangs() {
-  return authApi.getCookieCache(langKey)
-}
-/**
- * 
- * @param {*} langShort 例如：cn或en
- * @returns 例如：zh_CN或en_US
- */
-export function getLangByShort(langShort) {
-  let lang
-  const langResultJson = getLangs()
-  if(langResultJson){
-    const langObj = JSON.parse(langResultJson)
-    lang = langObj[langShort]
-  }
-  if(!lang){
-    lang = 'zh_CN'
-  }
-  return lang
-}
-
-// 首次加载业务系统时，缓存所有语言
-export function cacheAllLanguagesUtil(http) {
-  return new Promise((resolve, reject) => {
-    const token = getToken()
-    if (token) {
-      http.get(Vue.prototype.baseAPI + '/component/all-languages').then((langList) => {
-        const langResult = {}
-        if (langList) {
-          langList.forEach(item => {
-            // 例如：zh_CN、en_US
-            const lang = item.value
-            let langShort
-            if (lang.indexOf('_') > 0) {
-              langShort = lang.substring(0, lang.indexOf('_'))
-            }
-            if (langShort && langShort === 'zh') {
-              // 中文处理，为了兼容历史逻辑
-              langShort = 'cn'
-            }
-            if (langShort) {
-              langResult[langShort] = lang
-            }
-          })
-        }
-        cacheLangs(langResult)
-        resolve()
-      })
-    } else {
-      resolve()
-    }
-  })
-}

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/utils/util.js

@@ -3,7 +3,6 @@ import Vue from 'vue'
 import {
   executeExpression
 } from './calculator/calculator-util'
-import { getLangByShort } from './common-util'
 export function getI18n() {
   if (!window.$locale) {
     i18n.locale = 'cn'
@@ -14,11 +13,12 @@ export function getI18n() {
 }
 
 export function getLanguageWithLocale() {
-  let currentLocale = window.$locale
-  if (!currentLocale || currentLocale === 'zh') {
-    currentLocale = 'cn'
+  const currentLocale = window.$locale
+  if (currentLocale && currentLocale === 'en') {
+    return 'en_US'
+  } else {
+    return 'zh_CN'
   }
-  return getLangByShort(currentLocale)
 }
 /**
  * 根据动态数据源获得下拉选的选项集合

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

@@ -8,7 +8,7 @@
       </app-link>
     </template>
 
-    <el-submenu v-else :index="resolvePath(item.code,item.path,item.pageType)" :show-timeout="0" :hide-timeout="50" :popper-append-to-body="false" popper-class="sidebar-container-popper">
+    <el-submenu v-else :index="resolvePath(item.code,item.path,item.pageType)" :show-timeout="0" :hide-timeout="50" popper-class="sidebar-container-popper">
       <template v-slot:title>
         <item :icon="item.iconName" :title="getI18nName(item)" :has-children="item.children.length > 0?true:false" />
       </template>

package/src/views/login/index.vue

@@ -41,7 +41,7 @@
 </template>
 
 <script>
-import { Message } from '@gcommon/gcommon-ui'
+import { Message } from 'element-ui'
 export default {
   name: 'Login',
   data() {