agilebuilder-ui 1.0.621 → 1.0.962

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

@@ -4,57 +4,13 @@
 
   $table-cell-font-color: #313233;
 
-  // 表头背景颜色 包括组合表头 已经当表头有空白列表头
-  .el-table th {
-    background-color: $th-cell-background !important;
-  }
-
-  .el-table__header-wrapper {
+  .el-table__header tr{
     background-color: $th-cell-background;
+    color: #333333;
   }
-
-  // .el-table th.el-table__cell {
-  //   background-color: $th-cell-background;
-  // }
-
-  // .el-table thead.is-group th.el-table__cell {
-  //   background-color: $th-cell-background;
-  // }
-
-  .el-table .el-table__cell {
-    color: $table-cell-font-color;
-    padding: 0;
-  }
-
-  // 表头字体样式
-  .el-table th.el-table__cell>.cell {
-    // color: $table-cell-font-color;  不能在这里设置，不然会覆盖header-cell-style事件 传递的样式
-    font-family: Source Han Sans CN;
-    font-weight: medium;
-    font-size: 14px;
-    line-height: 22px;
-    letter-spacing: 0px;
-    // text-align: left;
-  }
-
-  // 表格内容颜色
-  .el-table .cell {
-    font-family: Source Han Sans CN;
-    font-weight: regular;
-    font-size: 14px;
-    line-height: 22px;
-    letter-spacing: 0px;
-    // text-align: left;
-
-  }
-
-  .el-button--text {
-    color: $--color-primary;
-    font-family: Source Han Sans CN;
-    font-weight: regular;
-    font-size: 14px;
-    line-height: 22px;
-    letter-spacing: 0px;
-    text-align: center;
-  }
-}
+  //.el-button--text {
+  //  color: $--color-primary;
+  //  font-size: 16px;
+  //  text-align: center;
+  //}
+}

package/src/styles/theme/green/button.scss

@@ -111,10 +111,10 @@
   }
   //page-runtime 头部按钮样式
   .page-runtime-header-btn{
-    margin-bottom: 20px;
+    margin-bottom: 10px;
     display: inline-block;
   }
   .page-runtime-header-btn + .page-runtime-header-btn{
-    margin-left: 10px;
+    margin-left: 5px;
   }
 }

package/src/styles/theme/green/green.scss

@@ -19,4 +19,4 @@ $--select-font-color: $--color-primary;
 $--card-header-color: $--color-card;
 
 $--menu-hove-background-color: $--color-primary;
-$th-cell-background: #F0F8FE;
+$th-cell-background: #EDEDED;

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

@@ -100,7 +100,7 @@
   .app-container {
     // padding: 20px;
     // padding: 0px;
-    padding: 20px 24px;
+    padding: 10px 12px;
     background: #FFFFFF;
     border-radius: 6px;
     box-shadow: 0px 1px 8px 0px #00000019;

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

@@ -284,14 +284,25 @@
   .router-link-active >.is-active{
     color: $--menu-dont-color;
   }
+
   .el-menu-item{
     color: #FFFFFF;
   }
+
   .el-menu-item:hover{
     background-color: $--menu-hove-background-color;
     color: #FFFFFF;
   }
 
+  .el-menu-item.is-active {
+    color: $--menu-dont-color;
+  }
+
+  .el-menu-item.is-active:hover {
+    background-color: $--menu-hove-background-color;
+    color: #FFFFFF;
+  }
+
   .el-sub-menu .el-sub-menu__title{
     color: #FFFFFF;
   }
@@ -309,4 +320,13 @@
     color: #FFFFFF;
     background-color: $--menu-hove-background-color;
   }
+  运行时工具栏样式
+  .amb-widget-tools-parent{
+    margin-bottom: 20px;
+  }
+  .amb-widget-container-tool{
+    display: flex;
+    overflow-x: auto;
+    padding: 10px 0;
+  }
 }

package/src/styles/theme/green/table.scss

@@ -4,57 +4,13 @@
 
   $table-cell-font-color: #313233;
 
-  // 表头背景颜色 包括组合表头 已经当表头有空白列表头
-  .el-table th {
-    background-color: $th-cell-background !important;
-  }
-
-  .el-table__header-wrapper {
+  .el-table__header tr{
     background-color: $th-cell-background;
+    color: #333333;
   }
-
-  // .el-table th.el-table__cell {
-  //   background-color: $th-cell-background;
-  // }
-
-  // .el-table thead.is-group th.el-table__cell {
-  //   background-color: $th-cell-background;
-  // }
-
-  .el-table .el-table__cell {
-    color: $table-cell-font-color;
-    padding: 0;
-  }
-
-  // 表头字体样式
-  .el-table th.el-table__cell>.cell {
-    color: $table-cell-font-color;
-    font-family: Source Han Sans CN;
-    font-weight: medium;
-    font-size: 14px;
-    line-height: 22px;
-    letter-spacing: 0px;
-    // text-align: left;
-  }
-
-  // 表格内容颜色
-  .el-table .cell {
-    font-family: Source Han Sans CN;
-    font-weight: regular;
-    font-size: 14px;
-    line-height: 22px;
-    letter-spacing: 0px;
-    // text-align: left;
-
-  }
-
-  .el-button--text {
-    color: $--color-primary;
-    font-family: Source Han Sans CN;
-    font-weight: regular;
-    font-size: 14px;
-    line-height: 22px;
-    letter-spacing: 0px;
-    text-align: center;
-  }
+  //.el-button--text {
+  //  color: $--color-primary;
+  //  font-size: 16px;
+  //  text-align: center;
+  //}
 }

package/src/styles/theme/ocean-blue/button.scss

@@ -112,10 +112,10 @@
 
   //page-runtime 头部按钮样式
   .page-runtime-header-btn{
-    margin-bottom: 20px;
+    margin-bottom: 10px;
     display: inline-block;
   }
   .page-runtime-header-btn + .page-runtime-header-btn{
-    margin-left: 10px;
+    margin-left: 5px;
   }
 }

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

@@ -100,7 +100,7 @@
   .app-container {
     // padding: 20px;
     // padding: 0px;
-    padding: 20px 24px;
+    padding: 10px 12px;
     background: #FFFFFF;
     border-radius: 6px;
     box-shadow: 0px 1px 8px 0px #00000019;

package/src/styles/theme/ocean-blue/ocean-blue.scss

@@ -18,4 +18,4 @@ $--select-font-color: $--color-primary;
 $--card-header-color: $--color-card;
 
 $--menu-hove-background-color: $--color-hover;
-$th-cell-background: #F0F8FE;
+$th-cell-background: #EDEDED;

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

@@ -276,4 +276,14 @@
   .el-sub-menu__title:hover{
     background-color: $--menu-hove-background-color;
   }
+
+  运行时工具栏样式
+  .amb-widget-tools-parent{
+    margin-bottom: 20px;
+  }
+  .amb-widget-container-tool{
+    display: flex;
+    overflow-x: auto;
+    padding: 10px 0;
+  }
 }

package/src/styles/theme/ocean-blue/table.scss

@@ -1,60 +1,15 @@
 @import "./ocean-blue.scss";
 
 .ocean-blue {
-
   $table-cell-font-color: #313233;
 
-  // 表头背景颜色 包括组合表头 已经当表头有空白列表头
-  .el-table th {
-    background-color: $th-cell-background !important;
-  }
-
-  .el-table__header-wrapper {
+  .el-table__header tr{
     background-color: $th-cell-background;
+    color: #333333;
   }
-
-  // .el-table th.el-table__cell {
-  //   background-color: $th-cell-background;
-  // }
-
-  // .el-table thead.is-group th.el-table__cell {
-  //   background-color: $th-cell-background;
-  // }
-
-  .el-table .el-table__cell {
-    color: $table-cell-font-color;
-    padding: 0;
-  }
-
-  // 表头字体样式
-  .el-table th.el-table__cell>.cell {
-    color: $table-cell-font-color;
-    font-family: Source Han Sans CN;
-    font-weight: medium;
-    font-size: 14px;
-    line-height: 22px;
-    letter-spacing: 0px;
-    // text-align: left;
-  }
-
-  // 表格内容颜色
-  .el-table .cell {
-    font-family: Source Han Sans CN;
-    font-weight: regular;
-    font-size: 14px;
-    line-height: 22px;
-    letter-spacing: 0px;
-    // text-align: left;
-
-  }
-
-  .el-button--text {
-    color: $--color-primary;
-    font-family: Source Han Sans CN;
-    font-weight: regular;
-    font-size: 14px;
-    line-height: 22px;
-    letter-spacing: 0px;
-    text-align: center;
-  }
+  //.el-button--text {
+  //  color: $--color-primary;
+  //  font-size: 16px;
+  //  text-align: center;
+  //}
 }

package/src/utils/auth.js

@@ -1,4 +1,5 @@
 import authApi from './auth-api'
+import { removeAllSystemPermissions } from './permissionAuth'
 
 export function getToken() {
   return authApi.getToken()
@@ -68,7 +69,7 @@ export function setLanguage(language) {
   authApi.setLanguage(language)
 }
 
-export function removeLanguage() {
+function removeLanguage() {
   authApi.removeLanguage()
 }
 
@@ -80,7 +81,7 @@ export function setAllLanguages(langs) {
   authApi.setAllLanguages(langs)
 }
 
-export function removeAllLanguages() {
+function removeAllLanguages() {
   authApi.removeAllLanguages()
 }
 
@@ -113,7 +114,7 @@ export function removeAllThemes() {
   authApi.removeAllThemes()
 }
 
-export function removePublishControl() {
+function removePublishControl() {
   authApi.removePublishControl()
 }
 /**
@@ -140,4 +141,23 @@ export function removeProjectSettings() {
 
 export function removeProjectCode() {
   authApi.removeCookieCache('_PROJECT_CDOE')
+}
+
+export function getRunCurrentRole() {
+  let runCurrentRoleKey = '_RUN_CURRENT_ROLE'
+  if(!isDevpSystem()){
+    return authApi.getSessionCache(runCurrentRoleKey)
+  }
+}
+// 清空token时需要清除的缓存信息
+export function clearPermission() {
+  removeToken()
+  removeLanguage()
+  removeAllLanguages()
+
+  removeUsername()
+  removeCurrentUser()
+
+  removeAllSystemPermissions()
+  removePublishControl()
 }

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

@@ -101,13 +101,13 @@ class TextCalculator extends CalculatorFactory {
       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 === ''

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

@@ -3,6 +3,20 @@ import { getAbstractUserFactoryWf } from './calculator-factory-wf'
 import { getPropValue, getEntityFieldValue } from '../util'
 export function executeExpression(leftValue, operator, rightValue, dataType) {
   const Calculator = getAbstractUserFactory(dataType)
+  if (dataType === 'DATE' || dataType === 'TIME') {
+    return executeDateExpression(leftValue, operator, rightValue, Calculator)
+  }
+  const calculatorObj = new Calculator(leftValue, operator, rightValue)
+  return calculatorObj.result
+}
+
+function executeDateExpression(leftValue, operator, rightValue, Calculator) {
+  if (rightValue && typeof (rightValue) === 'string') {
+    rightValue = new Date(rightValue).getTime()
+  }
+  if (leftValue && typeof (leftValue) === 'string') {
+    leftValue = new Date(leftValue).getTime()
+  }
   const calculatorObj = new Calculator(leftValue, operator, rightValue)
   return calculatorObj.result
 }