agilebuilder-ui 1.1.42 → 1.1.43-sit1

package/lib/{tab-content-iframe-index-16207fb9.js → tab-content-iframe-index-650e3a4e.js}

@@ -1,5 +1,5 @@
 import { openBlock as r, createElementBlock as t, createCommentVNode as o } from "vue";
-import { _ as s } from "./index-50fdf8ae.js";
+import { _ as s } from "./index-619c9fa7.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-8ae8c396.js → tab-content-index-711afda9.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-50fdf8ae.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-619c9fa7.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-110e29f2.js → tache-subprocess-history-cac20dae.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-50fdf8ae.js";
+import { _ as I } from "./index-619c9fa7.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.42",
+  "version": "1.1.43-sit1",
   "type": "module",
   "private": false,
   "main": "./lib/super-ui.js",

package/packages/super-grid/src/custom-formatter.js

@@ -281,7 +281,7 @@ const customFormatter = {
     if (gridParams.options.extraParam && gridParams.options.extraParam.entityMap) {
       parentFormData = gridParams.options.extraParam.entityMap
     }
-    if (gridParams.isSubTableShowPage && jumpPageSetting.jumpPageAdditional?.length > 0) {
+    if (gridParams.options.isFormSubTable && jumpPageSetting.jumpPageAdditional?.length > 0) {
       // 如果是子表，则需要把配置的 ${data.字段} 改成 ${parent.字段}
       jumpPageSetting.jumpPageAdditional.forEach((item, index) => {
         if (item && item.paramValue) {

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

@@ -487,7 +487,7 @@
       :multiple="isMultiTree"
       :table-name="tableName"
       :tree-type="
-        deptManTree ? 'DeptUserTree' : deptTree ? 'DeptTree' : wgManTree ? 'WgTree' : wgTree ? 'WgUserTree' : null
+        deptManTree ? 'DeptUserTree' : deptTree ? 'DeptTree' : wgManTree ? 'WgUserTree' : wgTree ? 'WgTree' : null
       "
       :value="innerValue"
       @append="appendOrganizationInputEvent"

package/packages/super-grid/src/normal-column-content.vue

@@ -107,6 +107,7 @@
             :is-show="operation.isShow"
             :label="operation.props.label ? operation.props.label : row[column.prop]"
             :on-click="operation.onClick"
+            :operation="operation"
             :operation-index="operationIndex"
             :operation-setting="operation.props"
             :event-name="operation.eventName"

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

@@ -1,10 +1,10 @@
 <template>
   <!--将@click改为@mousedown.native是因为操作列保存按钮时事件和input等组件的@blur冲突，导致保存需要保存两次，因为
       @blur先于@click执行的，所以只会执行@blur，@click就失效了，@mousedown是先于@blur执行的-->
-  <span :style="myStyle">
+  <span class="table-operation-row-btn" :style="myStyle">
     <template v-if="isShowButton()">
       <el-tooltip :disabled="tooltipDisabled" :content="label" placement="top">
-        <template v-if="operationSettingData.permission">
+        <template v-if="operationSettingData?.permission">
           <component
             v-bind="operationSettingData"
             :is="isElementType"
@@ -77,9 +77,13 @@ export default {
       type: String,
       default: null,
     },
+    operation: {
+      type: Object,
+      default: () => ({}),
+    },
     operationSetting: {
       type: Object,
-      default: null,
+      default: () => ({}),
     },
     operationIndex: {
       type: Number,
@@ -148,16 +152,16 @@ export default {
     },
     // 后置图标
     suffixIcon() {
-      if(['right'].includes(this.operationSettingData.iconPosition)) return this.operationSetting.iconValue
+      if(['right'].includes(this.operationSetting.iconPosition)) return this.operationSetting.iconValue
       return undefined
     },
     // 是否显示文字按钮 > 图标模式
     isTextIcon() {
       if (this.isTableBtnLinkShow) {
-        if (this.operationSettingData.isTextIcon === undefined) {
+        if (this.operationSetting.isTextIcon === undefined) {
           return this.isSaveRow || this.isDeleteRow || this.isEditRow || this.isRestoreRow
         }
-        return this.operationSettingData.isTextIcon
+        return this.operationSetting.isTextIcon
       } else {
         return false
       }
@@ -172,14 +176,14 @@ export default {
     },
     // 是否自动开启表格 按钮 转 文字按钮
     isTableBtnLinkShow() {
-      if (this.operationSetting.text) return true
+      if (this.operationSetting?.text) return true
       if (this.isTableBtnLink && this.elementType === 'el-button') {
-        return [this.operationSetting.text, this.operationSetting.plain, this.operationSetting.round].every(v => v === undefined)
+        return [this.operationSetting?.text, this.operationSetting?.plain, this.operationSetting?.round].every(v => v === undefined)
       }
       return false
     },
     operationSettingData() {
-      const dataList = { ...this.operationSetting }
+      const dataList = { ...(this.operationSetting ?? {}) }
       if (this.isTableBtnLinkShow) {
         dataList.underline = false
         delete dataList.text

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/packages/super-nine-grid/src/search-form.vue

@@ -14,12 +14,16 @@
         v-for="n of getColumnNumPerRow(r, searchableColumns.length)"
         :key="n"
         :span="6"
-        style="margin-bottom: 5px"
+        style="margin-bottom: 10px"
       >
         <el-form-item
           :prop="searchableColumns[fieldNum * (r - 1) + (n - 1)].prop"
-          style="margin-left: 10px"
-          label-width="100px"
+          :label-width="
+            searchableColumns[fieldNum * (r - 1) + (n - 1)].label.replace(/\\n/g, '</br>')?.length > 4
+              ? '100px'
+              : '80px'
+          "
+          style="width: 90%"
         >
           <template v-slot:label>
             <span

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

@@ -311,7 +311,7 @@ export default {
       slotBefore: 'before',
       titleWidth,
       slotState: 'bottom',
-	  isShowBottom: true
+      isShowBottom: true
     }
   },
   computed: {},

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/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',
               {