agilebuilder-ui 1.1.43 → 1.1.45

package/lib/{tab-content-iframe-index-ecc72989.js → tab-content-iframe-index-39745d49.js}

@@ -1,5 +1,5 @@
 import { openBlock as r, createElementBlock as t, createCommentVNode as o } from "vue";
-import { _ as s } from "./index-9787409e.js";
+import { _ as s } from "./index-465b0d69.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-6a314fc4.js → tab-content-index-65696e56.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-9787409e.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-465b0d69.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 C, renderList as T, 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-4a760e68.js → tache-subprocess-history-ef943f95.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-9787409e.js";
+import { _ as I } from "./index-465b0d69.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,6 +1,6 @@
 {
   "name": "agilebuilder-ui",
-  "version": "1.1.43",
+  "version": "1.1.45",
   "type": "module",
   "private": false,
   "main": "./lib/super-ui.js",

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

@@ -460,7 +460,7 @@ export default {
     // 限制高度最低值
     hasMaxHeight() {
       if (this.maxHeight) {
-        return this.maxHeight <= 100 ? 100 : this.maxHeight + this.heightOffset
+        return this.maxHeight <= 100 ? 100 : this.maxHeight + (this.heightOffset!==0?this.heightOffset:30)
       }
       return undefined
     },
@@ -468,7 +468,7 @@ export default {
     // 是指固定高度最低值
     hasTableHeight() {
       if (this.tableHeight) {
-        return this.tableHeight <= 100 ? 100 : this.tableHeight + this.heightOffset
+        return this.tableHeight <= 100 ? 100 : this.tableHeight + (this.heightOffset!==0?this.heightOffset:30)
       }
       return undefined
     },
@@ -523,6 +523,8 @@ export default {
               // 表示不显示“序号”列
               return false
             }
+            // 存储有默认值的字段集合
+            this.storeHasDefaultValueColumns(column, gridParams)
             let isVisible
             if (column.show === undefined || column.show) {
               isVisible = true
@@ -547,8 +549,6 @@ export default {
             } else {
               isVisible = false
             }
-            // 存储有默认值的字段集合
-            this.storeHasDefaultValueColumns(column, gridParams)
             return isVisible
           })
         )
@@ -1288,7 +1288,11 @@ export default {
         if (gridParams.defaultValueColumns === undefined || gridParams.defaultValueColumns === null) {
           gridParams.defaultValueColumns = []
         }
-        gridParams.defaultValueColumns.push(column)
+        // 放到defaultValueColumns前要根据column.prop判断是否已经存在
+        const hasColumn = gridParams.defaultValueColumns.find((item) => item.prop === column.prop)
+        if (!hasColumn) {
+          gridParams.defaultValueColumns.push(column)
+        }
       }
     },
     // 判断是不是表单子表的使用
@@ -3402,11 +3406,17 @@ export default {
       this.$refs.superGrid.setCurrentRow(this.tableDatas[rowIndex])
     },
     getSuperGridRef() {
+      return this
+    },
+    getSuperGridTableRef() {
       return this.$refs.superGrid
     },
     getColumns() {
       return this.columns
     },
+    getTableData() {
+      return this.tableDatas
+    },
     handRowKeyToUpperCase(row) {
       // 把row对象的所有key都转成大写
       if (row) {

package/src/styles/index.scss

@@ -227,6 +227,23 @@ body .el-table colgroup.gutter {
   flex-direction: column
 }
 
+.amb-chart-container {
+  display: flex;
+  flex-direction: column;
+  height: 100%;
+}
+
+.amb-chart-header {
+  flex-shrink: 0;
+}
+
+.amb-chart-content {
+  /* 图表区域占据剩余空间 */
+  flex: 1;
+  /* 允许内容缩小 */
+  min-height: 0;
+}
+
 .amb-widget-chart-header {
   border-bottom: 1px solid var(--el-card-border-color);
   padding: 6px 10px;

package/src/utils/common-util.js

@@ -1,6 +1,5 @@
 import * as Vue from 'vue'
-import authApi from './auth-api'
-import { getToken, getLanguage, getAllLanguages, setAllLanguages, removeToken } from './auth'
+import { getToken, getLanguage, getAllLanguages, setAllLanguages } from './auth'
 import { v4 as uuidv4 } from 'uuid'
 import { getCookieCache } from './auth'
 import i18nUtil from './i18n-util'
@@ -231,7 +230,11 @@ export function isPlateSys(systemCode) {
 
 export function getServerConfigUtil(http) {
   return new Promise((resolve, reject) => {
-    http.get('./server-config.json').then((result) => {
+    let timestamp = '1'
+    if(__BUILD_TIME__) {
+      timestamp = __BUILD_TIME__
+    }
+    http.get('./server-config.json?t='+timestamp).then((result) => {
       const config = result
       for (const key in config) {
         window.$vueApp.config.globalProperties[key] = config[key]
@@ -245,10 +248,10 @@ export function getServerConfigUtil(http) {
       localStorage.setItem('_baseAPI_', window.$vueApp.config.globalProperties.baseAPI)
       localStorage.setItem('_amb_projectModel_', window.$vueApp.config.globalProperties.projectModel)
       if (config.fontIconAddress && window.insertCssFile) {
-        window.insertCssFile(`${config.fontIconAddress}/iconfont.css`)
+        window.insertCssFile(`${config.fontIconAddress}/iconfont.css?t=${timestamp}`)
       }
       if (config.fontIconAddress && window.insertCssFile) {
-        window.insertCssFile(`${config.fontIconAddress}-color/iconfont.css`)
+        window.insertCssFile(`${config.fontIconAddress}-color/iconfont.css?t=${timestamp}`)
       }
       resolve()
     })
@@ -557,27 +560,49 @@ async function handlePlateSysLang(currentLanguage) {
     }
   }
 }
+// 缓存项目设值信息
+export function cacheProjectSetting() {
+  return new Promise((resolve,reject)=>{
+    const projectSettingCache = localStorage.getItem('PROJECT_SETTINGS')
+    let projectSettings = null
+    if(projectSettingCache && projectSettingCache === '_EMPTY_VALUE') {
+       resolve(projectSettings)
+    } else if (projectSettingCache) {
+      projectSettings = JSON.parse(projectSettingCache)
+      setBrowserFavicon(projectSettings)
+      resolve(projectSettings)
+    } else {
+      window.$vueApp.config.globalProperties.$http.get(window.$vueApp.config.globalProperties.baseAPI + '/cfg/project-settings').then((data) => {
+        if(data){
+          localStorage.setItem('PROJECT_SETTINGS', JSON.stringify(data))
+          projectSettings = data
+          setBrowserFavicon(projectSettings)
+        } else {
+          localStorage.setItem('PROJECT_SETTINGS', '_EMPTY_VALUE')
+        }
+        resolve(projectSettings)
+      }).catch((error)=>{
+        reject(error)
+      })
+    }
+  })
+}
 
-// export function setProjectSetting() {
-//   const projectSettingCache = Cookies.get('PROJECT_SETTINGS')
-//   let projectSettings = null
-//   if (projectSettingCache) {
-//     projectSettings = JSON.parse(projectSettingCache)
-//    // TODO:工具方法中没有this，这个代码会报错，先注释该方法，没找到调用它的地方
-//     this.setLogoUrl(projectSettings)
-//   } else {
-//     window.$vueApp.config.globalProperties.$http.get(window.$vueApp.config.globalProperties.baseAPI + '/cfg/project-settings').then((data) => {
-//       Cookies.set('PROJECT_SETTINGS', JSON.stringify(data))
-//       projectSettings = data
-//     })
-//   }
-//   if (projectSettings.browserImageUuid) {
-//     const linkElement = document.getElementById('ambBrowserIcon')
-//     if (linkElement) {
-//       linkElement.href = window.$vueApp.config.globalProperties.baseAPI + '/cfg/project/icon/browserIcon'
-//     }
-//   }
-// }
+function setBrowserFavicon(projectSettings){
+  const linkElement = document.getElementById('ambBrowserIcon')
+  if(!linkElement){
+    return
+  }
+  if (projectSettings) {
+    const browserIconUrl = window.$vueApp.config.globalProperties.baseAPI + '/cfg/project/icon/browserIcon?t='+__BUILD_TIME__
+    if(projectSettings.browserImageUuid && (!linkElement.href || linkElement.href !== browserIconUrl) ){
+      linkElement.href = browserIconUrl
+    }
+  }
+  if(!linkElement.href) {
+    linkElement.href = 'favicon.svg?t='+__BUILD_TIME__
+  }
+}
 
 // 动态加载css
 export function loadCSS() {

package/src/utils/util.js

@@ -259,15 +259,30 @@ function parseCondition(
         // 再获取属于那张表
         const propDbNameArr = propDbName.split('_+_')
         propDbName = propDbNameArr[1]
-        leftValue = getValue(parentFormData, propDbName, isSql)
+         if (pageContext && propDbName && propDbName.indexOf('${')>=0) {
+          leftValue = getPropValueNew(propDbName, pageContext, entity)
+        } else {
+          leftValue = getValue(parentFormData, propDbName, isSql)
+        }
+        // leftValue = getValue(parentFormData, propDbName, isSql)
       } else {
-        leftValue = getValue(entity, propDbName, isSql)
+         if (pageContext && propDbName  && propDbName.indexOf('${')>=0) {
+          leftValue = getPropValueNew(propDbName, pageContext, entity)
+        } else {
+          leftValue = getValue(entity, propDbName, isSql)
+        }
+        // leftValue = getValue(entity, propDbName, isSql)
       }
       if (leftValue === undefined || leftValue === null) {
         if (tableName && propDbName.toLowerCase().startsWith(tableName.toLowerCase() + '.')) {
           // 表示是当前表的字段
           const myProp = propDbName.substring(propDbName.indexOf('.'))
-          leftValue = getValue(entity, myProp, isSql)
+         if (pageContext && myProp  && myProp.indexOf('${')>=0) {
+            leftValue = getPropValueNew(myProp, pageContext, entity)
+          } else {
+            leftValue = getValue(entity, myProp, isSql)
+          }
+          // leftValue = getValue(entity, myProp, isSql)
         }
       }
     } else {
@@ -275,12 +290,27 @@ function parseCondition(
         propName = propName.replace('parent_+_', '')
         const propNameArr = propName.split('_+_')
         propName = propNameArr[1]
-        leftValue = getValue(parentFormData, propName, isSql)
+         if (pageContext && propName && propName.indexOf('${')>=0) {
+          leftValue = getPropValueNew(propName, pageContext, entity)
+        } else {
+          leftValue =getValue(parentFormData, propName, isSql)
+        }
+        // leftValue = getValue(parentFormData, propName, isSql)
       } else {
-        leftValue = getValue(entity, propName, isSql)
+         if (pageContext && propName && propName.indexOf('${')>=0) {
+          leftValue = getPropValueNew(propName, pageContext, entity)
+        } else {
+          leftValue = getValue(entity, propName, isSql)
+        }
+        // leftValue = getValue(entity, propName, isSql)
       }
       if (propDbName && (leftValue === undefined || leftValue === null)) {
-        leftValue = getValue(entity, propDbName, isSql)
+         if (pageContext && propDbName && propDbName.indexOf('${')>=0) {
+          leftValue = getPropValueNew(propDbName, pageContext, entity)
+        } else {
+          leftValue = getValue(entity, propDbName, isSql)
+        }
+        // leftValue = getValue(entity, propDbName, isSql)
       }
     }
     const operator = condition.operator
@@ -291,7 +321,7 @@ function parseCondition(
     // 判断value类型
     let value
     if (pageContext) {
-      value = getPropValueNew(propValue, pageContext)
+      value = getPropValueNew(propValue, pageContext, entity)
     } else {
       value = getPropValue(propValue, entity, additionalParamMap, contextParameterMap)
     }

package/src/views/layout/components/Menubar/Item.vue

@@ -83,7 +83,7 @@ export default defineComponent({
       } else {
         // 有子菜单时
         vnodes.push(
-          h('div', { class: ['smb-sidebar-menu-item-title'] }, [
+          h('div', { class: titleClass }, [
             h(
               'div',
               {