imatrix-ui 2.9.8-dw → 2.9.8-pv3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "imatrix-ui",
-  "version": "2.9.8-dw",
+  "version": "2.9.8-pv3",
   "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/plugins/export-data-new.js

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

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

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

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

package/src/i18n/langs/en.js

@@ -1,4 +1,4 @@
-import enLocale from '@gcommon/gcommon-ui/lib/locale/lang/en'
+import enLocale from 'element-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 '@gcommon/gcommon-ui'
+import { Message } from 'element-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 '@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 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 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 '@gcommon/gcommon-ui'
+} from 'element-ui'
 import {
   getToken,
   removeToken

package/src/views/login/index.vue

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