imatrix-ui 2.9.23-dw → 2.9.25-dw

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "imatrix-ui",
-  "version": "2.9.23-dw",
+  "version": "2.9.25-dw",
   "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/dynamic-source-select/src/dynamic-source-select.vue

@@ -252,7 +252,9 @@ export default {
                           }
                           this.$emit('set-value', {
                             value: targeValue,
-                            targetColumnName: this.column.prop
+                            targetColumnName: this.column.prop,
+                            options: this.optionItems,
+                            valueAttribute: this.valueAttribute
                           })
                         }
                       }
@@ -383,7 +385,8 @@ export default {
             value: value,
             sourceColumnName: sourceColumnName,
             targetColumnName: targetColumnName,
-            options: this.optionItems
+            options: this.optionItems,
+            valueAttribute: this.valueAttribute
           })
         })
       }

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

@@ -5,7 +5,8 @@ import {
   isLastEditRowSave,
   isHasEditOption,
   scrollYToBottom,
-  getAdditionalParamMap
+  getAdditionalParamMap,
+  isDynamicDataSourceSource
 } from './utils'
 import formValidatorService from './formValidatorUtil'
 import Vue from 'vue'
@@ -782,14 +783,30 @@ gridParams.$rowIndex < gridParams.gridData.length) {
       listCode = store.get('_list_code')
     }
     const gridParams = store.get(listCode)
+    const dynamicSourceSelectOptions = gridParams.dynamicSourceSelectOptions
     const columns = gridParams.columns
     columns.forEach(col => {
-      if (col.valueSet && col.valueSet.length > 0) {
-        result[col.prop] = col.valueSet
+      const prop = col.prop
+      const isDynamicDataSource = isDynamicDataSourceSource(col)
+      if (dynamicSourceSelectOptions && isDynamicDataSource && dynamicSourceSelectOptions[prop]) {
+        // { options, valueAttribute }
+        const optionSet = dynamicSourceSelectOptions[prop]
+        result[prop] = this.packageDynamicDataSourceOptions(optionSet.options, optionSet.valueAttribute)
+      } else if (col.valueSet && col.valueSet.length > 0) {
+        result[prop] = col.valueSet
       }
     })
     return result
   },
+  packageDynamicDataSourceOptions(options, valueAttribute) {
+    if (options) {
+      options.forEach(item => {
+        item.value = item[valueAttribute]
+        item.label = item['_label_']
+      })
+    }
+    return options
+  },
   // 取消列表的编辑状态
   restoreGridEdit(listCode) {
     if (!listCode) {

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

@@ -1186,9 +1186,15 @@ export default {
         this.callCustomEventWithParam('replace', { originalValue, newValue, row: this.row, column: this.column, prop })
       }
     },
-    setDynamicSourceSelectValue({ value, sourceColumnName, targetColumnName, options }) {
+    setDynamicSourceSelectValue({ value, sourceColumnName, targetColumnName, options, valueAttribute }) {
       if (targetColumnName) {
         this.setCellValue(targetColumnName, value, 'input')
+        // 动态数据源选项集合存储，导出报告时子表字段值的导出时有使用
+        const gridParams = store.get(this.listCode)
+        if (!gridParams.dynamicSourceSelectOptions) {
+          gridParams.dynamicSourceSelectOptions = {}
+        }
+        gridParams.dynamicSourceSelectOptions[targetColumnName] = { options, valueAttribute }
       }
     },
     multiselectChange(arr) {

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

@@ -34,6 +34,7 @@ const superGridService = {
           this.isSql = isSqlSetting
           param.isSql = isSqlSetting + ''
         }
+        param.publishVersion = this.publishVersion
         if (this.options && typeof (this.options.isAdministerListView) !== 'undefined' && this.options.isAdministerListView) {
           param.isAdminister = this.options.isAdministerListView + ''
         }

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

@@ -282,6 +282,10 @@ export default {
         return {}
       }
     },
+    publishVersion: {
+      type: Number,
+      default: 0
+    },
     // 为了兼容平台的旧写法，暂不删除以下属性
     // 操作列、占位符列内容显示的函数，格式为：{'属性名':方法},例如：{'name':viewUser,'operation':showOperation}
     customFormatter: {
@@ -635,6 +639,14 @@ export default {
       handler(newValue, oldValue) {
         this.$emit('change-rows-per-page', this.pageSize)
       }
+    },
+    // 更新parent值
+    'options.extraParam.entityMap': {
+      deep: true,
+      handler(newValue, oldValue) {
+        console.log('watch====options.extraParam.entityMap===改变==', newValue)
+        this.parentFormData = newValue
+      }
     }
   },
   provide() {

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

@@ -1,7 +1,7 @@
 /* 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() {
@@ -12,6 +12,7 @@ const superGridService = {
       this.isSql = isSqlSetting
       param.isSql = isSqlSetting + ''
     }
+    param.publishVersion = this.publishVersion
     this.isLoading = true
     // 初始化组件时先获取元信息再获取数据，以后翻页、排序、查询不再去获取元数据了
     this.$http.post(url, param).then(data => {

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 {
@@ -229,6 +235,10 @@ export default {
       default: function() {
         return {}
       }
+    },
+    publishVersion: {
+      type: Number,
+      default: 0
     }
   },
   data() {
@@ -280,7 +290,8 @@ export default {
       storeId,
       currentId: null, // 当前点击的记录id
       isShowRadio, // 单选时是否显示单选按钮
-      titleStyle: null // 标题的样式对象，格式为：{ color: 'green', fontWeight: 'bold'}
+      titleStyle: null, // 标题的样式对象，格式为：{ color: 'green', fontWeight: 'bold'}
+      slotBefore: 'before'
     }
   },
   computed: {
@@ -314,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/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()
+}