agilebuilder-ui 1.1.10 → 1.1.12-tmp1

package/src/styles/index.scss

@@ -199,4 +199,36 @@ body .el-table colgroup.gutter {
   text-align: center;
   vertical-align: middle;
   justify-content: center;
+}
+
+
+/* 分隔组件 */
+.amb-widget-separatelabel {
+  --el-card-border-color: var(--el-border-color-light);
+  --el-card-border-radius: 4px;
+  --el-card-padding: 20px;
+  --el-card-bg-color: var(--el-fill-color-blank);
+  background-color: var(--el-card-bg-color);
+  /* border: 1px solid var(--el-card-border-color); */
+  border-bottom: 1px solid var(--el-card-border-color);
+  border-radius: var(--el-card-border-radius);
+  color: var(--el-text-color-primary);
+  overflow: hidden;
+  transition: var(--el-transition-duration);
+  /* box-shadow: var(--el-box-shadow-light); */
+  padding: 10px;
+  padding-left: 0px;
+  margin-bottom: 18px;
+}
+
+.amb-widget-separatelabel>.label {
+  /* border-left: 4px solid #5893ef; */
+  border-bottom: 2px solid #5893ef;
+  color: #5893ef;
+  display: inline-block;
+  padding-left: 6px;
+  padding-right: 6px;
+  padding-bottom: 10px;
+  /* font-size: 14px; */
+  margin-bottom: -8px;
 }

package/src/styles/theme/tiffany-blue-mobile/drawer.scss

@@ -5,6 +5,10 @@
     .el-drawer__header {
         margin-bottom: 10px;
     }
-  
-  
+
+    .content-drawer {
+      .el-drawer__body {
+        overflow: hidden;
+      }
+    }
   }

package/src/utils/calculator/calculator-factory.js

@@ -11,12 +11,7 @@ class CalculatorFactory {
    * @return
    */
   isNullValue(leftValue, operator) {
-    return (
-      (leftValue === undefined ||
-        leftValue === null ||
-        leftValue + '' === '') &&
-      operator === 'IS_NULL'
-    )
+    return (leftValue === undefined || leftValue === null || leftValue + '' === '') && operator === 'IS_NULL'
   }
   /**
    * 空IS NOT NULL操作符时的处理
@@ -25,12 +20,7 @@ class CalculatorFactory {
    * @return true 表示给定的值不为空
    */
   isNotNullValue(leftValue, operator) {
-    return (
-      leftValue !== undefined &&
-      leftValue !== null &&
-      leftValue + '' !== '' &&
-      operator === 'IS_NOT_NULL'
-    )
+    return leftValue !== undefined && leftValue !== null && leftValue + '' !== '' && operator === 'IS_NOT_NULL'
   }
   /**
    * 空值时相等的处理
@@ -42,9 +32,7 @@ class CalculatorFactory {
   isEQEmptyValue(leftVale, operator, rightValue) {
     return (
       (leftVale === undefined || leftVale === null || leftVale + '' === '') &&
-      (rightValue === undefined ||
-        rightValue === null ||
-        rightValue + '' === '') &&
+      (rightValue === undefined || rightValue === null || rightValue + '' === '') &&
       (operator === 'EQ' || operator === 'CONTAIN')
     )
   }
@@ -81,9 +69,7 @@ class NumberCalculator extends CalculatorFactory {
       } else if (operator === 'IS_NOT_NULL') {
         this.result = leftVale !== undefined && leftVale !== null
       } else {
-        throw new Error(
-          '表达式不合法:' + leftVale + ' ' + operator + ' ' + rightValue
-        )
+        throw new Error('表达式不合法:' + leftVale + ' ' + operator + ' ' + rightValue)
       }
     }
   }
@@ -98,26 +84,28 @@ class TextCalculator extends CalculatorFactory {
     } else if (this.isNotNullValue(leftVale, operator)) {
       this.result = true
     } else if (leftVale === undefined || leftVale === null) {
-      this.result = false
+      if (operator === 'NET') {
+        this.result = leftVale + '' !== rightValue + ''
+      } else if (operator === 'EQ') {
+        this.result = leftVale + '' === rightValue + ''
+      } else {
+        this.result = false
+      }
     } else {
       if (operator === 'NET') {
-        this.result = (leftVale+'') !== (rightValue+'')
+        this.result = leftVale + '' !== rightValue + ''
       } else if (operator === 'EQ') {
-        this.result = (leftVale+'') === (rightValue+'')
+        this.result = leftVale + '' === rightValue + ''
       } else if (operator === 'NOT_CONTAIN') {
-        this.result = !(leftVale+'').includes(rightValue+'')
+        this.result = !(leftVale + '').includes(rightValue + '')
       } else if (operator === 'CONTAIN') {
-        this.result = (leftVale+'').includes(rightValue+'')
+        this.result = (leftVale + '').includes(rightValue + '')
       } else if (operator === 'IS_NULL') {
-        this.result =
-          leftVale === undefined || leftVale === null || leftVale === ''
+        this.result = leftVale === undefined || leftVale === null || leftVale === ''
       } else if (operator === 'IS_NOT_NULL') {
-        this.result =
-          leftVale !== undefined && leftVale !== null && leftVale !== ''
+        this.result = leftVale !== undefined && leftVale !== null && leftVale !== ''
       } else {
-        throw new Error(
-          '表达式不合法:' + leftVale + ' ' + operator + ' ' + rightValue
-        )
+        throw new Error('表达式不合法:' + leftVale + ' ' + operator + ' ' + rightValue)
       }
     }
   }

package/src/utils/common-util.js

@@ -1,6 +1,6 @@
 import * as Vue from 'vue'
 import authApi from './auth-api'
-import { getToken, getLanguage, getAllLanguages, setAllLanguages } from './auth'
+import { getToken, getLanguage, getAllLanguages, setAllLanguages, removeToken } from './auth'
 import { v4 as uuidv4 } from 'uuid'
 import { getCookieCache } from './auth'
 import i18nUtil from './i18n-util'
@@ -672,3 +672,25 @@ export function getCurrentSystemCode() {
     return window.$vueApp.config.globalProperties.systemCode
   }
 }
+
+export function isLogoutTimeout(event) {
+  let isTimeout = false
+  if (
+    event &&
+    typeof event.data === 'string' &&
+    event.data.indexOf('loginTimeout') >= 0
+  ) {
+    if (
+      event &&
+      typeof event.data === 'string' &&
+      event.data.indexOf('loginTimeout') >= 0
+    ) {
+      // removeToken()
+      // this.$router.replace({
+      //   path: '/login'
+      // })
+      isTimeout = true
+    }
+  }
+  return isTimeout
+}

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

@@ -6,11 +6,7 @@
           :index="resolvePath(item.code, item.path, item.pageType, item.newPage)"
           :class="{ 'submenu-title-noDropdown': !isNest }"
         >
-          <item
-            :icon="item.iconName"
-            :title="getI18nName(item)"
-            :is-root="true"
-          />
+          <item :icon="item.iconName" :title="getI18nName(item)" :is-root="true" />
         </el-menu-item>
       </app-link>
     </template>
@@ -38,9 +34,7 @@
           class="nest-menu"
         />
         <app-link v-else :to="toPath(child)" @click="clickMenu(toPath(child))">
-          <el-menu-item
-            :index="resolvePath(child.code, child.path, child.pageType, child.newPage)"
-          >
+          <el-menu-item :index="resolvePath(child.code, child.path, child.pageType, child.newPage)">
             <item :icon="child.iconName" :title="getI18nName(child)" />
           </el-menu-item>
         </app-link>
@@ -64,12 +58,12 @@ export default {
     // route object
     item: {
       type: Object,
-      required: true,
+      required: true
     },
     isNest: {
       type: Boolean,
-      default: false,
-    },
+      default: false
+    }
     // basePath: {
     //   type: String,
     //   default: ''
@@ -77,7 +71,7 @@ export default {
   },
   data() {
     return {
-      onlyOneChild: null,
+      onlyOneChild: null
     }
   },
   methods: {
@@ -115,12 +109,11 @@ export default {
         toPathObj.path = '/dsc-index/iframe-page'
         toPathObj.tabPath = '/dsc/iframe-page'
         toPathObj.query = {}
-        toPathObj.query.isNewPage=menu.newPage
+        toPathObj.query.isNewPage = menu.newPage
         toPathObj.query.src = routePath
         toPathObj.isExternal = true
         // 如果路径中没有拼系统编码，才需要把系统编码放到参数中
-        toPathObj.query.customSystem =
-          window.$vueApp.config.globalProperties.customSystem
+        toPathObj.query.customSystem = window.$vueApp.config.globalProperties.customSystem
         toPathObj.query._menuCode = menu.code
         toPathObj.query._menuName = getI18nName(menu)
       } else {
@@ -129,9 +122,8 @@ export default {
         toPathObj.tabPath = '/dsc/page'
         toPathObj.query = {}
         toPathObj.query.pageCode = pageCode
-        toPathObj.query.isNewPage= menu.newPage
-        toPathObj.query.customSystem =
-          window.$vueApp.config.globalProperties.customSystem
+        toPathObj.query.isNewPage = menu.newPage
+        toPathObj.query.customSystem = window.$vueApp.config.globalProperties.customSystem
         toPathObj.query._menuCode = menu.code
         toPathObj.query._menuName = getI18nName(menu)
       }
@@ -154,53 +146,32 @@ export default {
     },
     clickMenu(toPathObj) {
       // console.log('clickMenu----toPathObj=', toPathObj)
-      if (
-        toPathObj.openWay &&
-        toPathObj.openWay === 'NEW_PAGE_OPEN' &&
-        toPathObj.query
-      ) {
+      if (toPathObj.openWay && toPathObj.openWay === 'NEW_PAGE_OPEN' && toPathObj.query) {
         // 新页签打开菜单
         let url = toPathObj.query.src
-        if (url && url.indexOf('?') > 0) {
-          url += '&'
-        } else {
-          url += '?'
-        }
-        if (toPathObj.query.customSystem) {
-          url += 'customSystem=' + toPathObj.query.customSystem
-        }
-        if (url && url.indexOf('?') > 0) {
-          url += '&'
-        } else {
-          url += '?'
-        }
-        if (toPathObj.query._menuCode) {
-          url += '_menuCode=' + toPathObj.query._menuCode
-        }
-        if (url && url.indexOf('?') > 0) {
-          url += '&'
-        } else {
-          url += '?'
-        }
-        if (toPathObj.query._menuCode) {
-          url += '_menuName=' + toPathObj.query._menuName
-        }
-        if (url && url.indexOf('?') > 0) {
-          url += '&'
+        if (url) {
+          if (!toPathObj.isExternal) {
+            if (url.indexOf('?') > 0) {
+              url += '&'
+            } else {
+              url += '?'
+            }
+          }
         } else {
-          url += '?'
-        }
-        if (toPathObj.query.isNewPage) {
-          url += 'isNewPage=' + toPathObj.query.isNewPage
+          url = '#' + toPathObj.tabPath + '?'
+          if (toPathObj.query) {
+            for (const key in toPathObj.query) {
+              url += key + '=' + toPathObj.query[key] + '&'
+            }
+          }
+          if (url && url.length > 0 && url.lastIndexOf('&') === url.length - 1) {
+            url = url.substring(0, url.lastIndexOf('&'))
+          }
         }
-        window.open(url, toPathObj.query._menuCode)
+        window.open(url, toPathObj.query._menuName)
       } else {
         // 刷新页签打开菜单
-        this.addTabs(
-          toPathObj.query,
-          this.$store.state.tabContent.openTab,
-          toPathObj.tabPath
-        )
+        this.addTabs(toPathObj.query, this.$store.state.tabContent.openTab, toPathObj.tabPath)
       }
     },
     isExternalLink(pageType) {
@@ -211,7 +182,7 @@ export default {
     },
     getI18nName(menu) {
       return getI18nName(menu)
-    },
-  },
+    }
+  }
 }
 </script>

package/vite.config.js

@@ -7,10 +7,6 @@ export default defineConfig({
   plugins: [
     vue(),  
     terser({
-      compress: {
-        drop_console: true,
-        drop_debugger: true
-      },
       output: {
         // 对于console.error，不做任何处理
         comments: (node, comment) => comment.type === 'error'