imatrix-ui 2.7.78 → 2.7.80

package/package.json

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

package/src/styles/index.scss

@@ -31,21 +31,4 @@ body .el-table th.gutter {
 
 body .el-table colgroup.gutter {
   display: table-cell !important;
-}
-
-
-.card-title{
-  width:4px;
-  height:22px;
-  position: absolute;
-  left:0;
-  align-items:center;
-  text-align:center
-}
-
-.card-title-bgc{
-  width:4px;
-  height:14px;
-  display:inline-block;
-  background-color:#3081f2
-}
+}

package/src/styles/theme/gray/card-style.scss

@@ -0,0 +1,42 @@
+.gray {
+  $titleColor: rgba(0, 0, 0, 0.85);
+
+  el-card box-card is-always-shadow .card-radius {
+    border-radius: 12px
+  }
+
+  .form-card-header {
+    width: 3px;
+    height: 14px;
+    left: 0;
+    align-items: center;
+    text-align: center;
+  }
+
+  .form-card-header-bgc {
+    width: 3px;
+    height: 14px;
+    display: flex;
+    background-color: #3D4CF2
+  }
+
+  .form-card-text {
+    padding-left: 8px;
+    font-size: 16px;
+    line-height: 24px;
+    font-weight: 500;
+    color: $titleColor;
+    display: table-cell;
+    position: relative;
+  }
+
+  .superForm {
+    .el-card {
+      border-radius: 12px;
+      box-shadow: 0 1px 4px 0 rgba(0, 13, 31, 0.10);
+    }
+
+
+  }
+
+}

package/src/styles/theme/gray/font-style.scss

@@ -1,4 +1,5 @@
 .gray {
+  $titleColor: rgba(0, 0, 0, 0.85);
 
   .list-file {
     color: rgba(0, 13, 31, 0.45);
@@ -23,4 +24,9 @@
     font-size: 14px;
   }
 
+  .superForm {
+    .el-form-item__label {
+      color: rgba(0, 13, 31, 0.85);
+    }
+  }
 }

package/src/styles/theme/gray/index.scss

@@ -1,5 +1,9 @@
 @import './sidebar.scss';
 @import './font-style.scss';
+@import './card-style.scss';
+@import './tab-style.scss';
+@import './input-style.scss';
+
 .gray {
   font-family: microsoft yahei, Arial, Helvetica, sans-serif;
   font-size: 14px;
@@ -73,11 +77,11 @@
   .app-container {
     // padding: 20px;
     padding: 0px;
+
     .box-card {
-      margin: 16px 24px 24px 24px;
-      .el-card__body {
-        padding-top: 16px;
-      }
+      margin: 16px 24px;
+
+      .el-card__body {}
     }
   }
 
@@ -131,20 +135,36 @@
   .el-tree-node.is-current>.el-tree-node__content {
     background-color: #c2d6ea !important;
   }
+
   .menu-tab-container .el-tabs__item {
     height: 48px;
     line-height: 48px;
   }
 
   //顶部标签字体样式
-  .menu-tab-container .el-tabs__item.is-active{
-    color:#3D4cf2;
+  .menu-tab-container .el-tabs__item.is-active {
+    color: #3D4cf2;
   }
+
   //顶部标签样式
-  .menu-tab-container .el-tabs__active-bar{
+  .menu-tab-container .el-tabs__active-bar {
     background-color: #3D4cf2;
   }
+
   .el-pagination {
     text-align: right;
   }
+
+  .el-table td {
+    padding: 14px 0;
+  }
+
+  .el-table td,
+  .el-table th {
+    height: 48px;
+  }
+
+  .el-table th {
+    padding: 0;
+  }
 }

package/src/styles/theme/gray/input-style.scss

@@ -0,0 +1,11 @@
+.gray {
+
+  .superForm {
+
+    .el-input--medium .el-input__inner {
+      height: 32px;
+      line-height: 32px;
+    }
+  }
+
+}

package/src/styles/theme/gray/tab-style.scss

@@ -0,0 +1,81 @@
+.gray {
+
+  .superForm,.chartTabPage {
+
+    .el-tabs {
+      background-color: #FFFFFF;
+      // margin-top: 16px;
+      // margin-left: 24px;
+    }
+
+    .el-tabs__active-bar {
+      display: none;
+    }
+
+    .el-tabs__header {
+      margin: 0 0 6px;
+    }
+
+    .el-tabs__header.is-top {
+      border-bottom: 0;
+    }
+
+    .el-tabs--top .el-tabs__item.is-top {
+      padding: 0px 20px 0px 20px;
+    }
+
+    .el-tabs__nav {
+      background-color: #F7F7F8;
+    }
+
+    .el-tabs__item {
+      height: 32px;
+      line-height: 32px;
+      margin: 4px;
+      color: rgba(0, 13, 31, 0.85)
+    }
+
+    .el-tabs__nav-wrap::after {
+      display: none;
+    }
+
+
+    .el-tabs__item.is-active {
+      background-color: #FFFFFF;
+      color: #3D4CF2;
+      font-weight: 500;
+    }
+
+    .el-form--label-right {
+      border-radius: 28px 8px 0 0;
+    }
+
+    .el-tabs__content {
+      background-color: #FFFFFF;
+    }
+
+    .el-tabs--border-card>.el-tabs__content {
+      padding: 0;
+    }
+
+    .el-tabs--border-card {
+      background-color: #F7F7F8;
+      border-radius: 8px 8px 0 0;
+    }
+
+    .el-tabs--border-card>.el-tabs__header {
+      background-color: #F7F7F8;
+    }
+
+    .el-tabs--border-card>.el-tabs__header .el-tabs__item:not(.is-disabled):hover {
+      color: #3D4CF2;
+    }
+
+    .el-tabs--border-card>.el-tabs__header .el-tabs__item.is-active {
+      color: #3D4CF2;
+      font-size: 14px;
+      font-weight: 500;
+    }
+  }
+
+}

package/src/utils/util.js

@@ -539,3 +539,14 @@ export function getPropNameWhenJoinTable(prop, isJoinTable, tableName) {
   }
   return prop
 }
+
+export function isImage(fileName) {
+  // const fileType = fileName.substring(fileName.lastIndexOf('.'), fileName.length).toLowerCase()
+  // const imageTypes = ['.jpg', '.JPG', '.png', '.bmp', '.BMP', '.jpeg', '.gif', '.psd', '.tif', '.tga', '.svg', '.eps']
+  // const index = imageTypes.indexOf(fileType)
+  if (/\.(jpg|JPG|jpeg|JPEG|png|PNG|gif|GIF|bmp|BMP|psd|PSD|tif|TIF)$/.test(fileName)) {
+    return true
+  } else {
+    return false
+  }
+}

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

@@ -96,7 +96,11 @@ export default {
         toPathObj.query = {}
         toPathObj.query.src = routePath
         toPathObj.isExternal = true
-        toPathObj.query.customSystem = Vue.prototype.customSystem
+        if (!this.isHasCustomSystem(routePath)) {
+          // 如果路径中没有拼系统编码，才需要把系统编码放到参数中
+          toPathObj.query.customSystem = Vue.prototype.customSystem
+        }
+
         toPathObj.query._menuCode = menu.code
         toPathObj.query._menuName = menu.name
       } else {
@@ -111,6 +115,21 @@ export default {
       }
       return toPathObj
     },
+    // 是否已存在customSystem参数
+    isHasCustomSystem(routePath) {
+      if (routePath && routePath.indexOf('?') > 0) {
+        const params = routePath.substring(routePath.indexOf('?') + 1)
+        const paramArr = params.split('&')
+        for (let i = 0; i < paramArr.length; i++) {
+          const item = paramArr[i]
+          const key = item.split('=')[0]
+          if (key === 'customSystem') {
+            return true
+          }
+        }
+      }
+      return false
+    },
     clickMenu(toPathObj) {
       console.log('clickMenu----toPathObj=', toPathObj)
       this.addTabs(toPathObj.query, this.$store.state.tabContent.openTab, toPathObj.tabPath)

package/src/views/dsc-component/tabs/tab-content.vue

@@ -51,11 +51,37 @@ export default {
       }
     },
     getFullPath(tag) {
-      let path = '#' + tag.routePath + '?'
-      if (tag.routeQuery) {
-        for (const key in tag.routeQuery) {
-          path += key + '=' + tag.routeQuery[key] + '&'
+      let path
+      if (tag.routePath === '/dsc/iframe-page') {
+        // 表示是iframe页面
+        let src
+        let params = ''
+        if (tag.routeQuery) {
+          for (const key in tag.routeQuery) {
+            if (key === 'src') {
+              src = tag.routeQuery[key]
+            } else {
+              params += key + '=' + tag.routeQuery[key] + '&'
+            }
+          }
         }
+        if (src) {
+          path = src
+        }
+        if (params) {
+          path += '?' + params
+        }
+      } else {
+        // 表示页面跳转
+        path = '#' + tag.routePath + '?'
+        if (tag.routeQuery) {
+          for (const key in tag.routeQuery) {
+            path += key + '=' + tag.routeQuery[key] + '&'
+          }
+        }
+      }
+      if (path && path.length > 0 && path.lastIndexOf('&') === path.length - 1) {
+        path = path.substring(0, path.lastIndexOf('&'))
       }
       return path
     }