imatrix-ui 2.9.8-pv3 → 2.9.10-dw

package/package.json

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

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

@@ -50,25 +50,20 @@ const dynamicSourceSelectService = {
     }
 
     return new Promise((resolve, reject) => {
-      // 页面设计不请求动态数据源
-      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)
-        })
-      }
+      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/plugins/export-data-new.js

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

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

@@ -758,6 +758,21 @@ const apis = {
     }
     const gridParams = store.get(listCode)
     return gridParams.pagination
+  },
+  // 获得该列表中，下拉选是选项组的字段信息，返回的key是属性名，value是选项集合
+  getOptionsValueSet(listCode) {
+    const result = {}
+    if (!listCode) {
+      listCode = store.get('_list_code')
+    }
+    const gridParams = store.get(listCode)
+    const columns = gridParams.columns
+    columns.forEach(col => {
+      if (col.valueSet && col.valueSet.length > 0) {
+        result[col.prop] = col.valueSet
+      }
+    })
+    return result
   }
 }
 export default apis

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

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

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

@@ -1356,11 +1356,11 @@ export default {
             // 子表无记录时不需要刷新子表记录。表示是新建或修改时子表无记录，且不需要刷新子表。
             if (
               this.isSubTableEmpty(gridParams)
-            ){
+            ) {
               // 表示是新建表单时，子表记录集合是空数组
               console.log('子表无记录----code=', this.code, gridParams)
               const subTableData = []
-              this.packageSubTableData(gridParams,subTableData)
+              this.packageSubTableData(gridParams, subTableData)
             }
             this.hasLoadData = true
             gridParams.loaded = true
@@ -1368,7 +1368,7 @@ export default {
         }
       }
     },
-    isSubTableEmpty (gridParams) {
+    isSubTableEmpty(gridParams) {
       return gridParams.options && gridParams.options.isFormSubTable &&
       ((gridParams.options.subTableData === undefined || gridParams.options.subTableData === null) ||
       gridParams.options.subTableData.length === 0)
@@ -1416,7 +1416,7 @@ export default {
         JSON.parse(JSON.stringify(this.gridData))
       )
     },
-    canRefreshTableData (gridParams) {
+    canRefreshTableData(gridParams) {
       let isCanRefreshTableData = false
       if (gridParams.options && !gridParams.options.isFormSubTable) {
         // 如果不是子表时

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

@@ -27,21 +27,15 @@
           </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 @click="clickContent(params)">
+              <div @mouseenter="enter(index)" @mouseleave="leave()" @click="clickContent(params)">
                 <transition name="fade">
-                  <!-- <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" />
+                  <div v-if="seen && index === current" class="popContainer">
+                    <div class="else-button">
                       <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>
@@ -166,7 +160,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 {
@@ -286,8 +280,7 @@ export default {
       storeId,
       currentId: null, // 当前点击的记录id
       isShowRadio, // 单选时是否显示单选按钮
-      titleStyle: null, // 标题的样式对象，格式为：{ color: 'green', fontWeight: 'bold'}
-      slotBefore: 'before'
+      titleStyle: null // 标题的样式对象，格式为：{ color: 'green', fontWeight: 'bold'}
     }
   },
   computed: {
@@ -321,7 +314,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/i18n/i18n.js

@@ -1,5 +1,5 @@
 import Vue from 'vue'
-import locale from 'element-ui/lib/locale'
+import locale from '@gcommon/gcommon-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 'element-ui/lib/locale/lang/zh-CN'
+import zhLocale from '@gcommon/gcommon-ui/lib/locale/lang/zh-CN'
 const cn = {
   imatrixUIPublicModel: {
     sure: '确定',

package/src/i18n/langs/en.js

@@ -1,4 +1,4 @@
-import enLocale from 'element-ui/lib/locale/lang/en'
+import enLocale from '@gcommon/gcommon-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 'element-ui'
+import { Message } from '@gcommon/gcommon-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 'element-ui'
-import 'element-ui/lib/theme-chalk/index.css'
-import locale from 'element-ui/lib/locale/lang/zh-CN' // lang i18n
+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 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/utils/request.js

@@ -1,7 +1,7 @@
 import axios from 'axios'
 import {
   Message
-} from 'element-ui'
+} from '@gcommon/gcommon-ui'
 import {
   getToken,
   removeToken

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

@@ -27,15 +27,15 @@ export default {
 
     if (icon) {
       if (icon.indexOf('fa-') === 0) {
-        // 表示以“fa-”开头，使用font-awesome中的图标
+        // 表示以“fa-”开头，使用font-awesome中的图标 margin-right: 16px 是因为svg-icon有16px的间隔
         icon = 'fa ' + icon
-        vnodes.push(<div style='display: inline-block;overflow:hidden;'><i class={icon}/></div>)
+        vnodes.push(<div style='display: inline-block;overflow:hidden;'><i class={icon} style='margin-right: 16px;'/></div>)
       } else if (icon.indexOf('svg-') === 0) {
         icon = icon.substring(icon.indexOf('svg-') + 4)
         vnodes.push(<div style='display: inline-block;overflow:hidden;'><svg-icon icon-class={icon}/></div>)
       } else {
         icon += ' svg-icon'
-        vnodes.push(<div style='display: inline-block;overflow:hidden;'><i class={icon}/></div>)
+        vnodes.push(<div style='display: inline-block;overflow:hidden;'><i class={icon} style='margin-right: 16px;'/></div>)
       }
     }
 

package/src/views/login/index.vue

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