agilebuilder-ui 1.1.24 → 1.1.25

package/lib/{tab-content-iframe-index-e6bc24b5.js → tab-content-iframe-index-55b69efd.js}

@@ -1,5 +1,5 @@
 import { openBlock as r, createElementBlock as t, createCommentVNode as o } from "vue";
-import { _ as s } from "./index-e23f840f.js";
+import { _ as s } from "./index-ce3ae297.js";
 const u = ["src"], f = s({ data: () => ({ src: null }), watch: { $route(n, c) {
   this.src = this.$route.query.src;
 } }, mounted() {

package/lib/{tab-content-index-5a36eab4.js → tab-content-index-f8882314.js}

@@ -1,4 +1,4 @@
-import { _ as f, c as $, g as x, b as P, s as h, m as M, M as O, i as I } from "./index-e23f840f.js";
+import { _ as f, c as $, g as x, b as P, s as h, m as M, M as O, i as I } from "./index-ce3ae297.js";
 import { resolveComponent as u, openBlock as l, createBlock as b, withCtx as g, createVNode as v, TransitionGroup as L, createElementBlock as p, Fragment as T, renderList as C, createElementVNode as m, toDisplayString as w, normalizeClass as S, createCommentVNode as y } from "vue";
 const k = { class: "no-redirect" }, A = f({ name: "Breadcrumb", data: () => ({ levelList: null }), computed: { levelListWithTitle() {
   return this.levelList.filter((e) => e.meta.title !== void 0 && e.meta.title !== null);

package/lib/{tache-subprocess-history-59bda1ed.js → tache-subprocess-history-a2d815d2.js}

@@ -1,5 +1,5 @@
 import { resolveComponent as t, openBlock as a, createElementBlock as s, createElementVNode as y, createVNode as l, withCtx as r, createTextVNode as n, toDisplayString as p, createCommentVNode as c, createBlock as h } from "vue";
-import { _ as I } from "./index-e23f840f.js";
+import { _ as I } from "./index-ce3ae297.js";
 const g = { style: { "padding-bottom": "10px" } }, k = { key: 0, class: "graphDiv" }, N = I({ name: "TacheSubprocessHistory", data: () => ({ type: "graph", workflowId: null }), created() {
   const o = this.$route.query.workflowId;
   o && (this.workflowId = parseInt(o));

package/package.json

@@ -1,9 +1,9 @@
 {
   "name": "agilebuilder-ui",
-  "version": "1.1.24",
+  "version": "1.1.25",
   "type": "module",
   "private": false,
-  "main": "./lib/super-ui.js",
+  "main": "./packages/index.js",
   "scripts": {
     "lib": "vite build --mode production",
     "lib:dev": "vite build --mode development",

package/packages/hamburger/src/hamburger.vue

@@ -1,17 +1,17 @@
 <template>
-	<div class="00-Color/9-gray">
-		<el-icon v-if="isActive" @click="toggleClick">
-			<Fold style="width: 24px;height: 24px"/>
-		</el-icon>
-		<el-icon v-else @click="toggleClick">
-			<Expand style="width: 24px;height: 24px"/>
-		</el-icon>
+	<div class="amd-hamburger-container-main">
+		<div class="amd-hamburger-container-icon"  @click="toggleClick">
+			<el-icon>
+				<Fold v-if="isActive" />
+				<Expand v-else />
+			</el-icon>
+		</div>
 	</div>
 </template>
 <script setup></script>
 <script>
 import {$emit} from '../../utils/gogocodeTransfer'
-import {Expand, Fold} from '@element-plus/icons-vue'
+import {Expand, Fold, SwitchButton} from '@element-plus/icons-vue'
 
 export default {
 	name: 'Hamburger',
@@ -34,17 +34,19 @@ export default {
 }
 </script>
 
-<style scoped>
-.hamburger {
-  display: inline-block;
-  cursor: pointer;
-  width: 14px;
-  height: 14px;
-  transform: rotate(90deg);
-  transition: 0.38s;
-  transform-origin: 50% 50%;
+<style lang="scss" scoped>
+.amd-hamburger-container-main {
+	padding: 0;
+	display: flex;
+	align-items: center;
+	justify-content: end;
+	.amd-hamburger-container-icon {
+		display: flex;
+		align-items: center;
+		justify-content: center;
+		width: var(--admin-layout-left-menu-collapse, 54px);
+		font-size: 18px;
+		cursor: pointer;
+	}
 }
-.hamburger.is-active {
-  transform: rotate(0deg);
-}
-</style>
+</style>

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

@@ -12,7 +12,7 @@
 					:is-join-table="isJoinTable"
 				/>
 			</el-col>
-			<el-col :span="span" :class="{ 'no-show-open': !isShowOpen, 'no-search-button-auto': isSearchButtonAuto  }">
+			<el-col :span="span" class="search-btns-view" :class="{ 'no-show-open': !isShowOpen, 'no-search-button-auto': isSearchButtonAuto  }">
 				<search-button
 					ref="searchBtnOpen"
 					:is-open="myOpen"

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

@@ -456,15 +456,15 @@ export default {
     // 限制高度最低值
     hasMaxHeight() {
       if (this.maxHeight) {
-        return this.maxHeight <= 100 ? 100 : this.maxHeight
+        return this.maxHeight <= 100 ? 100 : this.maxHeight ?? undefined
       }
       return undefined
     },
 
     // 是指固钉高度最低值
     hasTableHeight() {
-      if (this.maxHeight) {
-        return this.tableHeight <= 100 ? 100 : this.tableHeight
+      if (this.tableHeight) {
+        return this.tableHeight <= 100 ? 100 : this.tableHeight ?? undefined
       }
       return undefined
     },
@@ -3414,11 +3414,10 @@ export default {
           }
         }
 
-        &:has(.search-button) {
+        &.search-btns-view {
           &:not(.no-show-open) {
             margin-left: auto;
             margin-top: auto;
-            flex: 1 1 auto;
             max-width: none;
           }
 

package/packages/svg-icon/src/svg-icon.vue

@@ -38,6 +38,6 @@ export default {
   height: 1.2em;
   vertical-align: -0.25em;
   fill: currentColor;
-  overflow: hidden;
+  overflow: initial;
 }
 </style>

package/public/favicon.svg

@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg version="1.1" xmlns="http://www.w3.org/2000/svg"
+     viewBox="0 0 442 442"
+     preserveAspectRatio="xMidYMid meet">
+
+<g transform="translate(0.000000,442.000000) scale(0.100000,-0.100000)" stroke="none">
+<path fill="#e15814" d="M1801 4004 c-395 -45 -745 -180 -1045 -402 -377 -280 -644 -692 -727
+-1123 -19 -99 -21 -137 -16 -313 4 -175 8 -214 31 -301 69 -265 189 -470 391
+-670 123 -122 168 -156 184 -139 11 12 111 300 111 320 0 9 -42 59 -93 112
+-194 203 -281 394 -294 639 l-6 112 29 12 c21 8 166 9 522 4 429 -7 494 -10
+499 -23 4 -8 -3 -58 -15 -111 -12 -53 -51 -238 -87 -411 -36 -173 -86 -409
+-111 -525 -24 -115 -55 -257 -67 -314 l-22 -103 26 -22 c36 -31 276 -128 299
+-121 23 7 25 13 60 174 82 383 175 818 234 1086 36 165 106 489 155 720 50
+231 135 629 191 885 55 256 100 474 100 486 0 11 -5 25 -12 32 -16 16 -185 14
+-337 -4z m-101 -358 c0 -14 -22 -128 -49 -253 -28 -125 -78 -356 -112 -513
+-35 -163 -68 -292 -77 -302 -14 -17 -52 -18 -526 -18 -285 0 -517 4 -525 9
+-30 19 61 236 166 396 197 300 564 551 993 681 103 31 130 31 130 0z"/>
+<path fill="#239753" d="M2401 3956 c-6 -7 -38 -139 -72 -292 -33 -153 -87 -400 -119 -549
+-32 -148 -82 -376 -109 -505 -28 -129 -140 -649 -251 -1155 -110 -505 -199
+-926 -198 -934 4 -19 62 -33 253 -62 191 -29 411 -29 600 0 201 31 436 85 450
+105 7 9 24 73 38 143 14 71 62 306 106 523 44 217 105 516 136 665 59 291 64
+329 39 339 -9 3 -166 6 -350 6 l-334 0 0 30 c0 50 41 204 58 217 12 10 198 13
+853 13 529 0 840 4 844 10 3 5 -6 44 -21 87 -225 661 -642 1045 -1364 1255
+-179 53 -250 69 -414 98 -141 24 -131 23 -145 6z"/>
+<path fill="#239753" d="M3677 2213 c-5 -9 -47 -194 -212 -942 -82 -368 -113 -527 -105 -535
+12 -12 32 -2 185 99 183 121 259 185 410 351 121 131 198 239 264 371 104 207
+158 397 163 569 l3 89 -352 3 c-193 1 -354 -1 -356 -5z"/>
+</g>
+</svg>

package/src/store/modules/system.js

@@ -12,9 +12,10 @@ const mutations = {
         Object.keys(payload).forEach(key => {
             if (key in state) {
                 state[key] = payload[key];
-                // if (['theme'].includes(key)) {
-                //     setTheme(payload[key])
-                // }
+                if (['theme'].includes(key)) {
+                    setTheme(payload[key])
+                    document.querySelector('body')?.setAttribute('class', payload[key])
+                }
             }
         });
     }

package/src/styles/_layout-custom-properties.scss

@@ -1,6 +1,6 @@
 :root {
     --admin-layout-header-height: 54px; // 系统顶部高度
-    --admin-layout-left-menu-expand: 240px; // 系统侧边导航栏 展开
+    --admin-layout-left-menu-expand: 224px; // 系统侧边导航栏 展开
     --admin-layout-left-menu-collapse: 54px; // 系统侧边导航栏 收起
     --admin-layout-main-gap: 20px; // 页面布局内间距
     --app-main-padding: 15px; // 页面外框内间距

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

@@ -71,11 +71,11 @@
 
   //main-container全局样式
   .app-main {
-    padding: var(--app-main-padding, 20px);
-    min-height: 100vh; // min-height: calc(100vh - (var(--app-main-padding, 20px) * 2));
+    padding: var(--app-main-padding, 15px);
+    min-height: 100vh; // min-height: calc(100vh - (var(--app-main-padding, 15px) * 2));
 
     & > .app-container {
-      max-height: calc(100vh - (var(--app-main-padding, 20px) * 2));
+      max-height: calc(100vh - (var(--app-main-padding, 15px) * 2));
     }
   }
 
@@ -183,8 +183,8 @@
 
   //main-container全局样式
   .app-main {
-    padding: var(--app-main-padding, 20px);
-    min-height: 100vh; // min-height: calc(100vh - (var(--app-main-padding, 20px) * 2));
+    padding: var(--app-main-padding, 15px);
+    min-height: 100vh; // min-height: calc(100vh - (var(--app-main-padding, 15px) * 2));
   }
 
   // 解决tab页签中内容多时没有滚动条问题

package/src/styles/theme/black/sidebar.scss

@@ -8,13 +8,13 @@ $menuBgBlack:#333;
   .main-container {
     height: 100%;
     transition: margin-left .28s;
-    margin-left: 224px;
+    margin-left: var(--admin-layout-left-menu-expand, 224px);
     position: relative;
   }
   // 侧边栏
   .sidebar-container {
     transition: width 0.28s;
-    width: 224px !important;
+    width: var(--admin-layout-left-menu-expand, 224px) !important;
     height: 100%;
     position: fixed;
     top: 0;
@@ -29,6 +29,19 @@ $menuBgBlack:#333;
     line-height: 16px;
     background: #333;
     box-shadow: 0px 2px 8px 0px rgba(164, 178, 201, 0.4);
+      
+    & {
+      display: flex;
+      flex-direction: column;
+
+      & > .el-scrollbar {
+        flex: 1 1 auto;
+        .el-menu {
+          margin-top: 5px;
+        }
+      }
+    }
+
     //reset element-ui css
     .horizontal-collapse-transition {
       transition: 0s width ease-in-out, 0s padding-left ease-in-out, 0s padding-right ease-in-out;
@@ -38,9 +51,6 @@ $menuBgBlack:#333;
     }
     .scrollbar-wrapper {
       overflow-x: hidden!important;
-      .el-scrollbar__view {
-        height: calc(100vh - 70px);
-      }
       .system-item {
         padding-left: 10px;
         font-size: medium;
@@ -53,8 +63,6 @@ $menuBgBlack:#333;
       line-height: 58px;
       height: 58px;
       background-color: #333;
-      // float: left;
-      padding: 0 20px;
       .path{
         fill:#eee;
       }
@@ -67,9 +75,6 @@ $menuBgBlack:#333;
       width: 100%;
       overflow: hidden;
     }
-    .svg-icon {
-      margin-right: 16px;
-    }
     .el-menu {
       border: none;
       height: 100%;
@@ -84,18 +89,19 @@ $menuBgBlack:#333;
   }
   .hideSidebar {
     .sidebar-container {
-      width: 54px !important;
+      width: var(--admin-layout-left-menu-collapse, 54px) !important;
+      .smb-sidebar-menu-item {
+        .smb-sidebar-menu-item-icon {
+          & ~ * {
+            display: none !important;
+          }
+        }
+      }
     }
     .main-container {
-      margin-left: 54px;
-    }
-    .submenu-title-noDropdown {
-      padding-left: 20px !important;
-      position: relative;
-      .el-tooltip {
-        padding: 0 20px !important;
-      }
+      margin-left: var(--admin-layout-left-menu-collapse, 54px);
     }
+
     .el-submenu {
       overflow: hidden;
       &>.el-submenu__title {
@@ -179,11 +185,4 @@ $menuBgBlack:#333;
   }
 }
 
-.el-menu--vertical{
-  & >.el-menu{
-    .svg-icon{
-      margin-right: 16px;
-    }
-  }
-}
 }

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

@@ -71,8 +71,8 @@
 
   //main-container全局样式
   .app-main {
-    padding: var(--app-main-padding, 20px);
-    min-height: 100vh; // min-height: calc(100vh - (var(--app-main-padding, 20px) * 2));
+    padding: var(--app-main-padding, 15px);
+    min-height: 100vh; // min-height: calc(100vh - (var(--app-main-padding, 15px) * 2));
   }
 
   // 解决tab页签中内容多时没有滚动条问题

package/src/styles/theme/blue/sidebar.scss

@@ -8,13 +8,13 @@
   .main-container {
     height: 100%;
     transition: margin-left .28s;
-    margin-left: 224px;
+    margin-left: var(--admin-layout-left-menu-expand, 224px);
     position: relative;
   }
   // 侧边栏
   .sidebar-container {
     transition: width 0.28s;
-    width: 224px !important;
+    width: var(--admin-layout-left-menu-expand, 224px) !important;
     height: 100%;
     position: fixed;
     top: 0;
@@ -29,6 +29,19 @@
     line-height: 16px;
     background: #eee;
     box-shadow: 0px 2px 8px 0px rgba(164, 178, 201, 0.4);
+      
+    & {
+      display: flex;
+      flex-direction: column;
+
+      & > .el-scrollbar {
+        flex: 1 1 auto;
+        .el-menu {
+          margin-top: 5px;
+        }
+      }
+    }
+
     //reset element-ui css
     .horizontal-collapse-transition {
       transition: 0s width ease-in-out, 0s padding-left ease-in-out, 0s padding-right ease-in-out;
@@ -38,9 +51,6 @@
     }
     .scrollbar-wrapper {
       overflow-x: hidden!important;
-      .el-scrollbar__view {
-        height: calc(100vh - 70px);
-      }
       .system-item {
         padding-left: 10px;
         font-size: medium;
@@ -53,8 +63,6 @@
       line-height: 58px;
       height: 58px;
       background-color: #F9F9F9;
-      // float: left;
-      padding: 0 20px;
     }
     .is-horizontal {
       display: none;
@@ -64,9 +72,6 @@
       width: 100%;
       overflow: hidden;
     }
-    .svg-icon {
-      margin-right: 16px;
-    }
     .el-menu {
       border: none;
       height: 100%;
@@ -81,18 +86,19 @@
   }
   .hideSidebar {
     .sidebar-container {
-      width: 54px !important;
+      width: var(--admin-layout-left-menu-collapse, 54px) !important;
+      .smb-sidebar-menu-item {
+        .smb-sidebar-menu-item-icon {
+          & ~ * {
+            display: none !important;
+          }
+        }
+      }
     }
     .main-container {
-      margin-left: 54px;
-    }
-    .submenu-title-noDropdown {
-      padding-left: 20px !important;
-      position: relative;
-      .el-tooltip {
-        padding: 0 20px !important;
-      }
+      margin-left: var(--admin-layout-left-menu-collapse, 54px);
     }
+
     .el-submenu {
       overflow: hidden;
       &>.el-submenu__title {
@@ -161,11 +167,4 @@
   }
 }
 
-.el-menu--vertical{
-  & >.el-menu{
-    .svg-icon{
-      margin-right: 16px;
-    }
-  }
-}
 }

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

@@ -71,8 +71,8 @@
 
   //main-container全局样式
   .app-main {
-    padding: var(--app-main-padding, 20px);
-    min-height: 100vh; // min-height: calc(100vh - (var(--app-main-padding, 20px) * 2));
+    padding: var(--app-main-padding, 15px);
+    min-height: 100vh; // min-height: calc(100vh - (var(--app-main-padding, 15px) * 2));
   }
 
   // 解决tab页签中内容多时没有滚动条问题

package/src/styles/theme/blue2/sidebar.scss

@@ -10,14 +10,14 @@
     .main-container {
       height: 100%;
       transition: margin-left .28s;
-      margin-left: 224px;
+      margin-left: var(--admin-layout-left-menu-expand, 224px);
       position: relative;
     }
 
     // 侧边栏
     .sidebar-container {
       transition: width 0.28s;
-      width: 224px !important;
+      width: var(--admin-layout-left-menu-expand, 224px) !important;
       height: 100%;
       position: fixed;
       top: 0;
@@ -32,6 +32,18 @@
       line-height: 16px;
       background: #eee;
       box-shadow: 0px 2px 8px 0px rgba(164, 178, 201, 0.4);
+      
+      & {
+        display: flex;
+        flex-direction: column;
+
+        & > .el-scrollbar {
+          flex: 1 1 auto;
+          .el-menu {
+            margin-top: 5px;
+          }
+        }
+      }
 
       //reset element-ui css
       .horizontal-collapse-transition {
@@ -45,10 +57,6 @@
       .scrollbar-wrapper {
         overflow-x: hidden !important;
 
-        .el-scrollbar__view {
-          height: calc(100vh - 70px);
-        }
-
         .system-item {
           padding-left: 10px;
           font-size: medium;
@@ -62,8 +70,6 @@
         line-height: 58px;
         height: 58px;
         background-color: #F9F9F9;
-        // float: left;
-        padding: 0 20px;
       }
 
       .is-horizontal {
@@ -76,10 +82,6 @@
         overflow: hidden;
       }
 
-      .svg-icon {
-        margin-right: 16px;
-      }
-
       .el-menu {
         border: none;
         height: 100%;
@@ -95,20 +97,18 @@
 
     .hideSidebar {
       .sidebar-container {
-        width: 54px !important;
+        width: var(--admin-layout-left-menu-collapse, 54px) !important;
+        .smb-sidebar-menu-item {
+          .smb-sidebar-menu-item-icon {
+            & ~ * {
+              display: none !important;
+            }
+          }
+        }
       }
 
       .main-container {
-        margin-left: 54px;
-      }
-
-      .submenu-title-noDropdown {
-        padding-left: 20px !important;
-        position: relative;
-
-        .el-tooltip {
-          padding: 0 20px !important;
-        }
+        margin-left: var(--admin-layout-left-menu-collapse, 54px);
       }
 
       .el-submenu {
@@ -190,12 +190,4 @@
       }
     }
   }
-
-  .el-menu--vertical {
-    &>.el-menu {
-      .svg-icon {
-        margin-right: 16px;
-      }
-    }
-  }
 }

package/src/styles/theme/dark-blue/index.scss

@@ -86,8 +86,8 @@
 
   //main-container全局样式
   .app-main {
-    padding: var(--app-main-padding, 20px);
-    min-height: 100vh; // min-height: calc(100vh - (var(--app-main-padding, 20px) * 2));
+    padding: var(--app-main-padding, 15px);
+    min-height: 100vh; // min-height: calc(100vh - (var(--app-main-padding, 15px) * 2));
     background: #f7f7f8;
   }