imatrix-ui 2.8.23 → 2.8.24

package/package.json

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

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

@@ -1346,60 +1346,76 @@ 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
-            }
-          } else {
-            subTableData = gridParams.options.subTableData
-            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))
-          )
+          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 = 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
+        } else {
+          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) {

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'
 /**
  * 获得相对地址
  */
@@ -234,3 +236,79 @@ export function isMobileBrowser() {
 			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)
 }
 /**
  * 根据动态数据源获得下拉选的选项集合