imatrix-ui 2.9.8-pv2 → 2.9.8-pv4

package/package.json

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

package/packages/dynamic-source-select/src/dynamic-source-select-service.js

@@ -50,20 +50,25 @@ const dynamicSourceSelectService = {
     }
 
     return new Promise((resolve, reject) => {
-      this.$http.post(backendUrl + '/common/dynamic-data-source/' + dynamicSourceCode, params).then(result => {
-        if (result.backendUrl) {
-          // result.backendUrl表示需要使用动态数据源所属的系统路径重新获得一次数据
-          this.$http.post(result.backendUrl + '/common/dynamic-data-source/' + dynamicSourceCode, params).then(finallyResult => {
-            resolve(finallyResult)
-          }).catch(error => {
-            reject(error)
-          })
-        } else {
-          resolve(result)
-        }
-      }).catch(error => {
-        reject(error)
-      })
+      // 页面设计不请求动态数据源
+      if (Vue.prototype.systemCode !== undefined && Vue.prototype.systemCode === 'iMatrix') {
+        resolve()
+      } else {
+        this.$http.post(backendUrl + '/common/dynamic-data-source/' + dynamicSourceCode, params).then(result => {
+          if (result.backendUrl) {
+            // result.backendUrl表示需要使用动态数据源所属的系统路径重新获得一次数据
+            this.$http.post(result.backendUrl + '/common/dynamic-data-source/' + dynamicSourceCode, params).then(finallyResult => {
+              resolve(finallyResult)
+            }).catch(error => {
+              reject(error)
+            })
+          } else {
+            resolve(result)
+          }
+        }).catch(error => {
+          reject(error)
+        })
+      }
     })
   }
 }

package/packages/super-grid/src/super-grid-service.js

@@ -1,10 +1,10 @@
 /* eslint-disable no-undef */
-import Vue from 'vue'
 import Sortable from 'sortablejs'
-import store from './store'
+import Vue from 'vue'
 import {
   packageEnumAndBeanColumnValueSets
 } from '../../utils/value-set'
+import store from './store'
 import {
   isHasOptionFunction
 } from './utils'
@@ -27,7 +27,7 @@ const superGridService = {
         this.fetchData(null, null, null, null)
         resolve()
       } else {
-        const url = Vue.prototype.baseAPI + '/component/super-grids/' + this.code
+        const url = Vue.prototype.baseAPI + '/component/super-grids/' + this.code + '/' + this.publishVersion
         const param = {}
         const isSqlSetting = this.options.isSql
         if (this.options && typeof (isSqlSetting) !== 'undefined') {
@@ -268,13 +268,13 @@ const superGridService = {
             const watchParentAttrs = dynamicColumnInfo.watchParentAttr.split(',')
             watchParentAttrs.forEach(watchParentAttr => {
               if (watchParentAttr) {
-              // 存储属性对应的值
+                // 存储属性对应的值
                 if (!param.watchParentAttrValues) {
                   param.watchParentAttrValues = {}
                 }
                 param.watchParentAttrValues[watchParentAttr] = this.parentFormData[watchParentAttr]
-                const unWatch = this.$watch('parentFormData.' + watchParentAttr, function(newValue, oldValue) {
-                // 重新加载表格及表格数据
+                const unWatch = this.$watch('parentFormData.' + watchParentAttr, function (newValue, oldValue) {
+                  // 重新加载表格及表格数据
                   if (!gridParams.dynamicTemp) {
                     gridParams.dynamicTemp = {}
                   }
@@ -284,7 +284,7 @@ const superGridService = {
                   }
                   gridParams.dynamicTemp.watchParentAttrValues[watchParentAttr] = newValue
                   if (this.$refs && this.$refs.superGrid) {
-                  // 手动注销watch，否则会调用多次watch
+                    // 手动注销watch，否则会调用多次watch
                     unWatch()
                     // 重新加载表格及表格数据
                     this.$emit('reload-grid')

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

@@ -279,6 +279,10 @@ export default {
         return {}
       }
     },
+    publishVersion: {
+      type: Number,
+      default: 0
+    },
     // 为了兼容平台的旧写法，暂不删除以下属性
     // 操作列、占位符列内容显示的函数，格式为：{'属性名':方法},例如：{'name':viewUser,'operation':showOperation}
     customFormatter: {
@@ -1346,51 +1350,86 @@ export default {
           gridParams.options.subTableData &&
           gridParams.options.subTableData.length > 0
         ) {
-          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
-            }
+          this.packageSubTableData(gridParams, gridParams.options.subTableData)
+        } else {
+          const isCanRefreshTableData = this.canRefreshTableData(gridParams)
+          if (isCanRefreshTableData) {
+            // 可以刷新表格记录
+            return this.fetchListData(searchParam, isSearch, parentRowIds, resove)
           } else {
-            subTableData = gridParams.options.subTableData
+            // 子表无记录时不需要刷新子表记录。表示是新建或修改时子表无记录，且不需要刷新子表。
+            if (
+              this.isSubTableEmpty(gridParams)
+            ) {
+              // 表示是新建表单时，子表记录集合是空数组
+              console.log('子表无记录----code=', this.code, gridParams)
+              const subTableData = []
+              this.packageSubTableData(gridParams, subTableData)
+            }
             this.hasLoadData = true
+            gridParams.loaded = 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))
-          )
+        }
+      }
+    },
+    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
         } else {
-          return this.fetchListData(searchParam, isSearch, parentRowIds, resove)
+          subTableData = initSubTableData
+          this.hasLoadData = true
         }
+      } 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
@@ -2017,6 +2056,7 @@ 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-grid-service.js

@@ -1,11 +1,11 @@
 /* eslint-disable no-undef */
 import Vue from 'vue'
-import store from './store'
 import { packageEnumAndBeanColumnValueSets } from '../../utils/value-set'
+import store from './store'
 import { isHasOptionFunction } from './utils'
 const superGridService = {
   initialize() {
-    const url = Vue.prototype.baseAPI + '/component/super-grids/' + this.code
+    const url = Vue.prototype.baseAPI + '/component/super-grids/' + this.code + '/' + this.publishVersion
     const param = {}
     const isSqlSetting = this.options.isSql
     if (this.options && typeof (isSqlSetting) !== 'undefined') {

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

@@ -235,6 +235,10 @@ export default {
       default: function() {
         return {}
       }
+    },
+    publishVersion: {
+      type: Number,
+      default: 0
     }
   },
   data() {
@@ -321,7 +325,7 @@ export default {
     this.$watch('hasLoadData', function(newVal, oldVal) {
       if (newVal === true) {
         this.$nextTick(() => {
-          this.rowDrop()
+          // this.rowDrop()
           const gridParams = store.get(this.storeId)
           if (isHasOptionFunction('gridComplete', this.storeId)) {
             gridParams.options.gridComplete.call(this, { gridData: this.gridData, columns: gridParams.columns, superGrid: this.$refs.superGrid })

package/src/store/modules/user.js

@@ -1,5 +1,5 @@
 import ssoService from '../../api/sso-service'
-import { setToken, removeToken, setUsername, getUsername, removeUsername, setCurrentUser, removeCurrentUser } from '../../utils/auth'
+import { setToken, removeToken, setUsername, getUsername, removeUsername, setCurrentUser, removeCurrentUser, removePublishControl } from '../../utils/auth'
 
 import { removePermissions, getPermissions, setPermissions, getMenus, setMenus, removeMenus } from '../../utils/permissionAuth'
 
@@ -102,6 +102,8 @@ const user = {
 
           removeMenus()
 
+          removePublishControl()
+
           resolve(data)
         }).catch(error => {
           reject(error)

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

@@ -79,8 +79,11 @@
       }
 
       .el-menu {
+        position: static;
         border: none;
-        height: 100%;
+        // height: 100%;
+        height: auto;
+        max-height: 100vh;
         width: 100% !important;
         background-color: #FFF;
         color: #000D1F
@@ -188,13 +191,22 @@
     }
   }
 
+  .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 .el-submenu.is-active>.el-submenu__title {
+  .sidebar-container-popper .el-menu-item.is-active,.sidebar-container-popper .el-menu .el-submenu.is-active>.el-submenu__title {
     background-color: #EBECFF !important;
     color: #3D4CF2;
     font-weight: 500;

package/src/utils/auth-api.js

@@ -4,6 +4,8 @@ import Vue from 'vue'
 const jwtKey = 'JWT'
 const currentUserNameKey = 'USERNAME'
 const currentUserInfoKey = 'CURRENT_USER'
+const versionEnv = 'VERSION_ENVIRONMENT'
+const userVersion = 'CURRENT_USER_SYSTEM_VERSION'
 
 function getToken() {
   let token = getCookieCache(jwtKey)
@@ -96,6 +98,11 @@ function setSessionCache(key, value) {
 function removeSessionCache(key) {
   sessionStorage.removeItem(key)
 }
+
+function removePublishControl() {
+  removeCookieCache(versionEnv)
+  removeCookieCache(userVersion)
+}
 export default {
   getToken,
   setToken,
@@ -111,5 +118,6 @@ export default {
   removeCookieCache,
   getSessionCache,
   setSessionCache,
-  removeSessionCache
+  removeSessionCache,
+  removePublishControl
 }

package/src/utils/auth.js

@@ -59,3 +59,7 @@ export function setSessionCache(key, value) {
 export function removeSessionCache(key) {
   authApi.removeSessionCache(key)
 }
+
+export function removePublishControl() {
+  authApi.removePublishControl()
+}

package/src/utils/common-util.js

@@ -1,5 +1,7 @@
 import sessionStorage from 'sessionstorage'
 import Vue from 'vue'
+import authApi from './auth-api'
+import { getToken } from './auth'
 /**
  * 获得相对地址
  */
@@ -169,7 +171,7 @@ export function isPlateSys(systemCode) {
       systemCode === 'mms' || systemCode === 'task' ||
       systemCode === 'wf' || systemCode === 'dc' ||
       systemCode === 'mc' || systemCode === 'mobile' ||
-      systemCode === 'acs' || systemCode === 'bs')) {
+      systemCode === 'acs' || systemCode === 'bs' || systemCode === 'pcm')) {
     return true
   } else {
     return false
@@ -223,3 +225,90 @@ 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/util.js

@@ -3,6 +3,7 @@ import Vue from 'vue'
 import {
   executeExpression
 } from './calculator/calculator-util'
+import { getLangByShort } from './common-util'
 export function getI18n() {
   if (!window.$locale) {
     i18n.locale = 'cn'
@@ -13,12 +14,11 @@ export function getI18n() {
 }
 
 export function getLanguageWithLocale() {
-  const currentLocale = window.$locale
-  if (currentLocale && currentLocale === 'en') {
-    return 'en_US'
-  } else {
-    return 'zh_CN'
+  let currentLocale = window.$locale
+  if (!currentLocale || currentLocale === 'zh') {
+    currentLocale = '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-class="sidebar-container-popper">
+    <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">
       <template v-slot:title>
         <item :icon="item.iconName" :title="getI18nName(item)" :has-children="item.children.length > 0?true:false" />
       </template>