imatrix-ui 2.9.30-dw-tmp1 → 2.9.32-dw

package/package.json

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

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

@@ -293,11 +293,11 @@
       ref="item"
       v-model="innerValue"
       :disabled="disabled"
-      :min="!inputNumberSet.min?-Infinity:inputNumberSet.min"
-      :max="!inputNumberSet.max?Infinity:inputNumberSet.min"
-      :step="!inputNumberSet.step?1:inputNumberSet.step"
-      :precision="inputNumberSet.precision"
       :controls-position="inputNumberSet.position"
+      :max="inputNumberSet.max==0?0:(!inputNumberSet.max?Infinity:inputNumberSet.max)"
+      :min="inputNumberSet.min==0?0:(!inputNumberSet.min?-Infinity:inputNumberSet.min)"
+      :precision="inputNumberSet.precision"
+      :step="!inputNumberSet.step?1:inputNumberSet.step"
       @input="cellEvent('input',$event)"
       @change="cellEvent('change',$event)"
       @focus="cellEvent('focus',$event)"
@@ -583,18 +583,7 @@ export default {
     }
 
     if (this.column.componentType === 'inputNumber') {
-      if (this.column.valueSetOptions && this.column.valueSetOptions !== '' && this.column.componentType === 'inputNumber') {
-        const inputNumberSetting = JSON.parse(this.column.valueSetOptions)
-        this.inputNumberSet = inputNumberSetting
-      } else {
-        this.inputNumberSet = {
-          min: null,
-          max: null,
-          step: 1,
-          precision: 0,
-          position: ''
-        }
-      }
+      this.setInputNumberConfig()
     }
     // 如果是多选文件类型，需要解析（需要设置临时字段，判断文件还是图片，图片需要预览）
     if (this.column.valueSetOptions && this.column.componentType !== 'inputNumber') {
@@ -1275,8 +1264,23 @@ export default {
     },
     fnProhibitToEdit(entity) {
       this.$emit('prohibitToEdit', entity)
+    },
+    setInputNumberConfig() {
+      if (this.column.componentType === 'inputNumber') {
+        if (this.column.valueSetOptions && this.column.valueSetOptions !== '' && this.column.componentType === 'inputNumber') {
+          const inputNumberSetting = JSON.parse(this.column.valueSetOptions)
+          this.inputNumberSet = inputNumberSetting
+        } else {
+          this.inputNumberSet = {
+            min: null,
+            max: null,
+            step: 1,
+            precision: 0,
+            position: ''
+          }
+        }
+      }
     }
-
   }
 }
 </script>

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

@@ -1983,7 +1983,7 @@ export default {
     // },
     getPaginationInfo() {
       const gridParams = store.get(this.code)
-      if (this.pagination !== null) {
+      if (this.pagination) {
         const pagination = {
           currentPage: this.currentPage,
           pageSize: this.pagination.pageSize,
@@ -1995,7 +1995,7 @@ export default {
         }
         if (
           typeof gridParams.currentPage !== 'undefined' &&
-          gridParams.currentPage !== null
+					gridParams.currentPage !== null
         ) {
           // 保持页数时使用
           pagination.currentPage = gridParams.currentPage
@@ -2003,6 +2003,12 @@ export default {
           gridParams.currentPage = null
         }
         return pagination
+      } else {
+        return {
+          'currentPage': 1,
+          'pageSize': 20,
+          'showTotal': true
+        }
       }
     },
     getSearchParam() {

package/packages/super-nine-grid/src/formatter.js

@@ -1,6 +1,5 @@
 const formatter = {
   number: function(value, options) {
-    debugger
     // 小数位数
     const precision = options.precision
     // 是否显示千分位

package/packages/workflow-history-list/src/workflow-history-list.vue

@@ -3,6 +3,7 @@
     v-if="loaded"
     ref="historyList"
     style="width: 100%"
+    :height="tableHeight"
     :data="histories"
     element-loading-text="Loading"
     border
@@ -122,7 +123,7 @@ export default {
   },
   mounted() {
     this.$nextTick(() => {
-      this.tableHeight = window.innerHeight - this.$refs.historyList.$el.offsetTop
+      this.tableHeight = window.innerHeight - 120
     })
   },
   methods: {

package/src/api/sso-service.js

@@ -1,4 +1,5 @@
 import request from '../utils/request'
+import { getLanguage } from '../utils/auth'
 import Vue from 'vue'
 function login(username, password, language) {
   const usernamePasswordToken = {
@@ -47,7 +48,14 @@ function updatePassword(data) {
 }
 
 function getUserLanguage() {
-  return request.get(Vue.prototype.baseAPI + '/acs/user-languages')
+  const currentLanguage = getLanguage()
+  if (currentLanguage) {
+    return new Promise((resolve, reject) => {
+      resolve(currentLanguage)
+    })
+  } else {
+    return request.get(Vue.prototype.baseAPI + '/acs/user-languages')
+  }
 }
 function forgetPasswordSendMail(username, email) {
   const userInfo = {

package/src/store/modules/user.js

@@ -1,7 +1,8 @@
 import ssoService from '../../api/sso-service'
-import { setToken, removeToken, setUsername, getUsername, removeUsername, setCurrentUser, removeCurrentUser, removePublishControl } from '../../utils/auth'
+import { setToken, removeToken, setUsername, getUsername, removeUsername, setCurrentUser, removeCurrentUser, removePublishControl, setLanguage, removeLanguage, removeAllLanguages } from '../../utils/auth'
 
 import { removePermissions, getPermissions, setPermissions, getMenus, setMenus, removeMenus } from '../../utils/permissionAuth'
+import { isPlateSys } from '../../utils/common-util'
 
 const user = {
   state: {
@@ -30,6 +31,7 @@ const user = {
         ssoService.login(username, userInfo.password, userInfo.language).then(data => {
           // const data = response.data
           setToken(data.jwt)
+          setLanguage(data.language)
           commit('setToken', data.jwt)
           return ssoService.getCurrentUserPermissionsBySystem(data.subject)
         }).then(permissions => {
@@ -93,6 +95,8 @@ const user = {
         ssoService.logout(state.token).then((data) => {
           commit('setToken', '')
           removeToken()
+          removeLanguage()
+          removeAllLanguages()
 
           commit('setName', '')
           removeUsername()
@@ -116,6 +120,8 @@ const user = {
       return new Promise(resolve => {
         commit('setToken', '')
         removeToken()
+        removeLanguage()
+        removeAllLanguages()
 
         commit('setName', '')
         removeUsername()
@@ -184,7 +190,7 @@ const user = {
     getPermissionMenus({ commit }, systemCode) {
       return new Promise((resolve, reject) => {
         const storePermissionMenus = getMenus(systemCode)
-        if (typeof (storePermissionMenus) === 'undefined' || storePermissionMenus === '' || storePermissionMenus === null) {
+        if (isPlateSys(systemCode) || (typeof (storePermissionMenus) === 'undefined' || storePermissionMenus === '' || storePermissionMenus === null)) {
           ssoService.getUserPermissionMenusBySystemCode(systemCode).then(menus => {
             // commit('setMenus', menus)
             setMenus(menus, systemCode)

package/src/utils/auth-api.js

@@ -6,6 +6,8 @@ const currentUserNameKey = 'USERNAME'
 const currentUserInfoKey = 'CURRENT_USER'
 const versionEnv = 'VERSION_ENVIRONMENT'
 const userVersion = 'CURRENT_USER_SYSTEM_VERSION'
+const langKey = 'CURRENT_LANGUAGE'
+const allLangKey = 'AMB_LANG_INFO'
 
 function getToken() {
   let token = getCookieCache(jwtKey)
@@ -103,6 +105,46 @@ function removePublishControl() {
   removeCookieCache(versionEnv)
   removeCookieCache(userVersion)
 }
+
+function getLanguage() {
+  let language = getCookieCache(langKey)
+  const projectModel = Vue.prototype.projectModel
+  if (!language && projectModel && projectModel === 'developing.model') {
+    // 如果是开发环境从sessionStorage中获得token
+    language = getSessionCache(langKey)
+  }
+  return language
+}
+
+function setLanguage(lang) {
+  setCookieCache(langKey, lang)
+  setSessionCache(langKey, lang)
+}
+
+function removeLanguage() {
+  removeCookieCache(langKey)
+  removeSessionCache(langKey)
+}
+
+function getAllLanguages() {
+  let allLanguages = getCookieCache(allLangKey)
+  const projectModel = Vue.prototype.projectModel
+  if (!allLanguages && projectModel && projectModel === 'developing.model') {
+    // 如果是开发环境从sessionStorage中获得token
+    allLanguages = getSessionCache(allLangKey)
+  }
+  return allLanguages
+}
+
+function setAllLanguages(langs) {
+  setCookieCache(allLangKey, langs)
+  setSessionCache(allLangKey, langs)
+}
+
+function removeAllLanguages() {
+  removeCookieCache(allLangKey)
+  removeSessionCache(allLangKey)
+}
 export default {
   getToken,
   setToken,
@@ -119,5 +161,11 @@ export default {
   getSessionCache,
   setSessionCache,
   removeSessionCache,
-  removePublishControl
+  removePublishControl,
+  getLanguage,
+  setLanguage,
+  removeLanguage,
+  getAllLanguages,
+  setAllLanguages,
+  removeAllLanguages
 }

package/src/utils/auth.js

@@ -63,3 +63,27 @@ export function removeSessionCache(key) {
 export function removePublishControl() {
   authApi.removePublishControl()
 }
+
+export function getLanguage() {
+  return authApi.getLanguage()
+}
+
+export function setLanguage(language) {
+  authApi.setLanguage(language)
+}
+
+export function removeLanguage() {
+  authApi.removeLanguage()
+}
+
+export function getAllLanguages() {
+  return authApi.getAllLanguages()
+}
+
+export function setAllLanguages(langs) {
+  authApi.setAllLanguages(langs)
+}
+
+export function removeAllLanguages() {
+  authApi.removeAllLanguages()
+}

package/src/utils/common-util.js

@@ -1,7 +1,6 @@
 import sessionStorage from 'sessionstorage'
 import Vue from 'vue'
-import authApi from './auth-api'
-import { getToken } from './auth'
+import { getToken, getLanguage, getAllLanguages, setAllLanguages } from './auth'
 /**
  * 获得相对地址
  */
@@ -228,13 +227,13 @@ export function getTimeZone() {
 
 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
-		}
+    .test(navigator.userAgent)) {
+    // 移动端浏览器
+    return true
+  } else {
+    // PC浏览器
+    return false
+  }
 }
 
 export function getLocaleByLang(lang) {
@@ -249,32 +248,30 @@ export function getLocaleByLang(lang) {
   return locale
 }
 
-const langKey = 'AMB_LANG_INFO'
-
 export function cacheLangs(langs) {
   let langResult
-  if(langs) {
+  if (langs) {
     langResult = JSON.stringify(langs)
   }
-  return authApi.setCookieCache(langKey,langResult)
+  return setAllLanguages(langResult)
 }
 
 export function getLangs() {
-  return authApi.getCookieCache(langKey)
+  return getAllLanguages()
 }
 /**
- * 
+ *
  * @param {*} langShort 例如：cn或en
  * @returns 例如：zh_CN或en_US
  */
 export function getLangByShort(langShort) {
   let lang
   const langResultJson = getLangs()
-  if(langResultJson){
+  if (langResultJson) {
     const langObj = JSON.parse(langResultJson)
     lang = langObj[langShort]
   }
-  if(!lang){
+  if (!lang) {
     lang = 'zh_CN'
   }
   return lang
@@ -285,30 +282,56 @@ 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)
+      const cookieCacheLangs = getLangs()
+      if (cookieCacheLangs) {
+        setAllLanguages(cookieCacheLangs)
         resolve()
-      })
+      } else {
+        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()
     }
   })
 }
+
+// 首次加载业务系统时，缓存当前用户语言
+export function cacheCurrentLanguageUtil(http) {
+  return new Promise((resolve, reject) => {
+    const token = getToken()
+    if (token) {
+      const currentLanguage = getLanguage()
+      if (currentLanguage) {
+        return new Promise((resolve, reject) => {
+          resolve(currentLanguage)
+        })
+      } else {
+        return http.get(Vue.prototype.baseAPI + '/acs/user-languages')
+      }
+    } else {
+      // 默认是中文
+      resolve('zh_CN')
+    }
+  })
+}

package/src/utils/permissionAuth.js

@@ -7,6 +7,8 @@ export function getSystemCode() {
   let systemCode
   if (Vue.prototype.customSystem) {
     systemCode = Vue.prototype.customSystem
+  } else if (Vue.prototype.currentSystem) {
+    systemCode = Vue.prototype.currentSystem
   } else {
     systemCode = Vue.prototype.systemCode
   }