agilebuilder-ui 1.1.54-sit2 → 1.1.54-sit4

package/lib/{tab-content-iframe-index-3aad43de.js → tab-content-iframe-index-e43fb46a.js}

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

package/lib/{tab-content-index-304c8405.js → tab-content-index-f3ee662d.js}

@@ -1,4 +1,4 @@
-import { a8 as f, aa as x, ab as _, ac as P, ad as h, ae as O, af as I, ag as M } from "./index-37902e74.js";
+import { a8 as f, aa as x, ab as _, ac as P, ad as h, ae as O, af as I, ag as M } from "./index-ab7c154d.js";
 import { resolveComponent as u, openBlock as d, 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-d63f0ebf.js → tache-subprocess-history-39b6545e.js}

@@ -1,5 +1,5 @@
 import { resolveComponent as t, openBlock as l, createElementBlock as s, createElementVNode as y, createVNode as a, withCtx as r, createTextVNode as n, toDisplayString as p, createCommentVNode as c, createBlock as h } from "vue";
-import { a8 as I } from "./index-37902e74.js";
+import { a8 as I } from "./index-ab7c154d.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/lib/{timeline-definition-MYPXXCX6-gLqnWxDu-5a0d9750.js → timeline-definition-MYPXXCX6-gLqnWxDu-0ec53542.js}

@@ -1,6 +1,6 @@
-import { _ as a, D as yt, ag as gt, z as ft, d as G, c as mt, l as S, ac as xt, ad as bt, ae as _t, af as kt } from "./mermaid.core-CAqkCmS1-7a15448d.js";
-import { d as K } from "./arc-Js_tyW10-3cf5d360.js";
-import "./index-37902e74.js";
+import { _ as a, D as yt, ag as gt, z as ft, d as G, c as mt, l as S, ac as xt, ad as bt, ae as _t, af as kt } from "./mermaid.core-CAqkCmS1-3b4e287a.js";
+import { d as K } from "./arc-Js_tyW10-592a34e0.js";
+import "./index-ab7c154d.js";
 import "vue";
 var q = function() {
   var n = a(function(s, d, l, h) {

package/lib/treemap-75Q7IDZK-B2atdfMH-92ba8a13.js

@@ -0,0 +1,11 @@
+import { T as s, h as T } from "./mermaid-parser.core-CH9ryA1K-92dc9438.js";
+import "./index-ab7c154d.js";
+import "vue";
+import "./mermaid.core-CAqkCmS1-3b4e287a.js";
+import "./_baseUniq-BXtq6_NW-66632fbc.js";
+import "./min-BngCxx8g-5b0b4efe.js";
+import "./clone-CEJtuQzg-258da07e.js";
+export {
+  s as TreemapModule,
+  T as createTreemapServices
+};

package/lib/{xychartDiagram-H2YORKM3-Whqa4ezL-14e4d9a2.js → xychartDiagram-H2YORKM3-Whqa4ezL-34b64f4c.js}

@@ -1,8 +1,8 @@
-import { _ as n, a1 as hi, G as gt, F as Bt, H as oi, aD as ri, l as zt, a9 as kt, i as li, t as Ot, b as ci, a as gi, q as ui, g as xi, s as di, z as pi, K as fi, e as mi } from "./mermaid.core-CAqkCmS1-7a15448d.js";
+import { _ as n, a1 as hi, G as gt, F as Bt, H as oi, aD as ri, l as zt, a9 as kt, i as li, t as Ot, b as ci, a as gi, q as ui, g as xi, s as di, z as pi, K as fi, e as mi } from "./mermaid.core-CAqkCmS1-3b4e287a.js";
 import { i as yi } from "./init-ZxktEp_H-731b6c9b.js";
 import { o as bi } from "./ordinal-DSZU4PqD-57a34423.js";
-import { l as _t } from "./linear-DqgVh5FN-36f1abec.js";
-import "./index-37902e74.js";
+import { l as _t } from "./linear-DqgVh5FN-988c12f0.js";
+import "./index-ab7c154d.js";
 import "vue";
 import "./defaultLocale-DVr69WTU-dbb4acef.js";
 var Tt, Rt, Dt, Lt, Pt, vt, Et, Mt, It, $t;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "agilebuilder-ui",
-  "version": "1.1.54-sit2",
+  "version": "1.1.54-sit4",
   "type": "module",
   "private": false,
   "main": "./lib/super-ui.js",

package/packages/chat-embed/src/chat-sender.vue

@@ -56,10 +56,9 @@
       </div>
     </template>
     <template #action-list>
-      <div style="display: flex; align-items: center">
+      <div style="display: flex; align-items: center; gap: 16px">
         <el-tooltip content="上传附件" v-if="showUploadFileTag">
           <el-upload
-            style="margin-right: 12px"
             ref="uploadRef"
             :action="uploadFileAction"
             :multiple="true"
@@ -78,8 +77,9 @@
         </el-tooltip>
         <el-tooltip content="语音">
           <!-- @answer="createAnswerMessage" -->
-          <VoiceButton @userMessage="handleSubmit" />
+          <VoiceButton @userMessage="handleSubmit" class="send-icon" />
         </el-tooltip>
+        <el-divider direction="vertical" />
         <el-tooltip v-if="loading" content="取消">
           <el-button type="primary" style="border-radius: 10px" plain round v-loading="loading" @click="handleCancel">
             取消
@@ -564,7 +564,6 @@ h4 {
   font-weight: 400;
   font-size: 16px;
   color: #bbbbbb;
-  line-height: 21px;
   text-align: left;
   font-style: normal;
   text-transform: none;
@@ -606,4 +605,7 @@ h4 {
 .send-icon {
   cursor: pointer;
 }
+.el-divider--vertical {
+  margin: 0 0;
+}
 </style>

package/packages/chat-embed/src/voice/voice.vue

@@ -1,11 +1,13 @@
 <template>
   <span v-if="isShowVoiceBtn">
-    <el-button v-if="btnStatus === 'UNDEFINED' || btnStatus === 'CLOSED'" text circle round>
-      <el-icon color="#409EFF" @click="onclick"><Microphone /></el-icon>
-    </el-button>
-    <el-button v-else text circle round>
-      <el-icon color="red"><Mute /></el-icon>
-    </el-button>
+    <!-- <el-button v-if="btnStatus === 'UNDEFINED' || btnStatus === 'CLOSED'" text circle round> -->
+    <el-icon v-if="btnStatus === 'UNDEFINED' || btnStatus === 'CLOSED'" color="#409EFF" @click="onclick"
+      ><Microphone
+    /></el-icon>
+    <!-- </el-button> -->
+    <!-- <el-button v-else text circle round> -->
+    <el-icon class="send-icon" v-else color="red"><Mute /></el-icon>
+    <!-- </el-button> -->
   </span>
 </template>
 <script setup>

package/packages/department-user-tree-inline/src/department-user-multiple-tree-inline.vue

@@ -640,9 +640,13 @@ export default {
           selectNodeInfo.subCompanyCode.push(userData.subCompanyCode)
           if (userData.divisionManager && userData.divisionManager !== '') {
             selectNodeInfo.divisionManager.push(userData.divisionManager)
+          } else if (userData.user?.divisionManager) {
+            selectNodeInfo.divisionManager.push(userData.user.divisionManager)
           }
           if (userData.divisionManagerName && userData.divisionManagerName !== '') {
             selectNodeInfo.divisionManagerName.push(userData.divisionManagerName)
+          } else if (userData.user?.divisionManagerName) {
+            selectNodeInfo.divisionManagerName.push(userData.user.divisionManagerName)
           }
           if (userData.email && userData.email !== '') {
             selectNodeInfo.emails.push(userData.email)

package/packages/row-form/index.vue

@@ -29,32 +29,34 @@
       <el-form label-width="auto">
         <template v-for="(column, index) in columns" >
           <el-form-item  :key="index" v-if="column.prop != '$index' && column.prop != '$selection'  && column.prop != 'operation'" :label="getMyHeaderLable(column)" >
-            <NormalColumnContent
-            :ref="column.prop"
-            :is-sql="isSql"
-            :column="column"
-            :list-code="listCode"
-            :drag-column-prop="dragColumnProp"
-            :right-click-menu-arr="options.rightClickMenuArr"
-            :table-name="tableName"
-            :page-code="pageCode"
-            :list-toolbar-form-data="listToolbarFormData"
-            :list-name="listName"
-            :options="options"
-            :current-page="currentPage"
-            :grid-data="gridData"
-            :page-grid-data="pageGridData"
-            :row="gridData[realEditIndex]"
-            :row-index="realEditIndex"
-            :is-show-form="true"
-            @open-page="openPageEvent"
-            @refresData="refresData"
-            @refresh-list="refreshList"
-            @refresPortData="refresPortData"
-            @refresPortsData="refresPortsData"
-            @refresMainTableFields="refresMainTableFields"
-            @prohibitToEdit="prohibitToEdit"
-          />
+            <div class="row-form-item">
+              <NormalColumnContent
+              :ref="column.prop"
+              :is-sql="isSql"
+              :column="column"
+              :list-code="listCode"
+              :drag-column-prop="dragColumnProp"
+              :right-click-menu-arr="options.rightClickMenuArr"
+              :table-name="tableName"
+              :page-code="pageCode"
+              :list-toolbar-form-data="listToolbarFormData"
+              :list-name="listName"
+              :options="options"
+              :current-page="currentPage"
+              :grid-data="gridData"
+              :page-grid-data="pageGridData"
+              :row="gridData[realEditIndex]"
+              :row-index="realEditIndex"
+              :is-show-form="true"
+              @open-page="openPageEvent"
+              @refresData="refresData"
+              @refresh-list="refreshList"
+              @refresPortData="refresPortData"
+              @refresPortsData="refresPortsData"
+              @refresMainTableFields="refresMainTableFields"
+              @prohibitToEdit="prohibitToEdit"
+            />
+            </div>
           </el-form-item>
         </template>
 
@@ -273,3 +275,10 @@ function afterClickBtn(params) {
   })
 }
 </script>
+
+<style lang="scss" scoped>
+// 必须加这个width，否则会导致展开的子表的下拉框组件没有宽度，无法显示内容
+.row-form-item {
+  width: 50%;
+}
+</style>

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

@@ -31,6 +31,7 @@
 				:data="columns"
 				class="custom-config-elTable"
 				max-height="450"
+				row-key="prop"
 		>
 			<el-table-column
 					:label="$t('superGrid.label')"
@@ -239,8 +240,13 @@ export default {
 						message: this.$t('superGrid.resetSuccessful'),
 						showClose: true,
 					})
+					this.hasLoaded = false
 					this.listAllColumns().then((columns) => {
 						this.columns = columns
+						this.hasLoaded = true
+						this.$nextTick(() => {
+							this.dragColumnDisplayOrder()
+						})
 						$emit(this, 'reset', true)
 					})
 				})
@@ -275,56 +281,6 @@ export default {
 		clearWidth(row) {
 			row.widthType = 'default'
 		},
-		// 移动完成后的displayOrder设置
-		indexAfterTheChangeUpdateDisplayOrder(dataList, oldIndex, newIndex, prop) {
-			if (dataList && dataList.length > 0) {
-				if (oldIndex != null && oldIndex !== undefined && oldIndex !== -1) {
-					if (newIndex !== null && newIndex !== undefined && newIndex !== -1) {
-						if (prop && prop !== '') {
-							const selectCol = dataList[newIndex]
-							selectCol.displayOrderType = 'custom'
-							if (newIndex > oldIndex) {
-								// 表示向后移动
-								// 位置已经移动，所以参数要赋值给原始位置的下一个
-								const afProp = dataList[newIndex - 1][prop]
-								const arr = dataList.slice(oldIndex, newIndex)
-								if (arr && arr.length > 0) {
-									for (let i = arr.length - 1; i > -1; i--) {
-										const col = arr[i]
-										col.displayOrderType = 'custom'
-										if (i === 0) {
-											// 紧靠原始位置的上一个
-											col[prop] = selectCol[prop]
-										} else {
-											col[prop] = arr[i - 1][prop]
-										}
-									}
-								}
-								selectCol[prop] = afProp
-							} else {
-								const befProp = dataList[newIndex + 1][prop]
-								// 表示向前移动
-								// 位置已经移动，所以参数要赋值给原始位置的上一个
-								const arr = dataList.slice(newIndex + 1, oldIndex + 1)
-								if (arr && arr.length > 0) {
-									for (let i = 0; i < arr.length; i++) {
-										const col = arr[i]
-										col.displayOrderType = 'custom'
-										if (i === arr.length - 1) {
-											// 紧靠原始位置的上一个
-											col[prop] = selectCol[prop]
-										} else {
-											col[prop] = arr[i + 1][prop]
-										}
-									}
-								}
-								selectCol[prop] = befProp
-							}
-						}
-					}
-				}
-			}
-		},
 		// 拖动列顺序
 		dragColumnDisplayOrder() {
 			if (!this.isDragColumn) {
@@ -346,69 +302,22 @@ export default {
 									newIndex !== undefined &&
 									newIndex !== -1
 							) {
-								if (oldIndex > newIndex) {
-									// 从后往前
-									if (vm.columns && vm.columns.length > 0) {
-										const item = vm.columns[oldIndex]
-										for (var i = oldIndex - 1; i >= newIndex; i--) {
-											const col = vm.columns[i]
-											col.displayOrderType = 'custom'
-											vm.columns[i + 1] = col
-										}
-										vm.columns[newIndex] = item
-									}
-								} else {
-									// 从前往后
-									if (vm.columns && vm.columns.length > 0) {
-										const item = vm.columns[oldIndex]
-										for (var k = oldIndex + 1; k <= newIndex; k++) {
-											const col = vm.columns[k]
-											col.displayOrderType = 'custom'
-											vm.columns[k - 1] = col
-										}
-										vm.columns[newIndex] = item
-									}
-								}
+								
+								const dragColumn = JSON.parse(JSON.stringify(vm.columns[oldIndex]))
+								// 将拖动的元素删除
+								vm.columns.splice(oldIndex, 1)
+								// 将拖动的元素插入到新位置
+								vm.columns.splice(newIndex, 0, dragColumn)
+							}
+							// 重置列顺序
+							for(let i=0;i<vm.columns.length;i++){
+								let column = vm.columns[i]
+								column.displayOrderType = 'custom'
+								column.displayOrder = i+1
 							}
 							console.log('config拖动字段', vm.columns)
 							console.log('config拖动字段oldIndex', oldIndex)
 							console.log('config拖动字段newIndex', newIndex)
-							vm.hasLoaded = false
-							setTimeout(function () {
-								vm.hasLoaded = true
-								vm.$nextTick(() => {
-									vm.indexAfterTheChangeUpdateDisplayOrder(
-											vm.columns,
-											oldIndex,
-											newIndex,
-											'displayOrder'
-									)
-									vm.dragColumnDisplayOrder()
-								})
-							}, 100)
-
-							// vm.hasLoaded = false
-							// // 添加setTimeout是解决拖动顺序后数组columns值改变了，但是列表没有重新渲染问题
-							// setTimeout(function() {
-							//   vm.hasLoaded = true
-							//   vm.$nextTick(() => {
-							//     vm.dragColumnDisplayOrder()
-							//   })
-							//   const currentColumn = vm.columns[oldIndex]
-							//   const targetColumn = vm.columns[newIndex]
-							//   const currentDisplayOrder = currentColumn.displayOrder
-							//   const targetDisplayOrder = targetColumn.displayOrder
-							//   vm.columns.splice(oldIndex, 1)
-							//   vm.columns.splice(newIndex, 0, currentColumn)
-							//   vm.$set(currentColumn, 'displayOrder', targetDisplayOrder)
-							//   vm.$set(currentColumn, 'displayOrderType', 'custom')
-							//   vm.$set(targetColumn, 'displayOrder', currentDisplayOrder)
-							//   vm.$set(targetColumn, 'displayOrderType', 'custom')
-							//   vm.hasLoaded = true
-							//   vm.$nextTick(() => {
-							//     vm.dragColumnDisplayOrder()
-							//   })
-							// }, 100)
 						},
 					})
 				}

package/lib/architecture-O4VJ6CD3-ZoZ2IAk2-e4f19a1e.js

@@ -1,11 +0,0 @@
-import { A as a, e as s } from "./mermaid-parser.core-CH9ryA1K-cb113dbd.js";
-import "./index-37902e74.js";
-import "vue";
-import "./mermaid.core-CAqkCmS1-7a15448d.js";
-import "./_baseUniq-BXtq6_NW-0dd20adb.js";
-import "./min-BngCxx8g-bab26a8b.js";
-import "./clone-CEJtuQzg-f58fe871.js";
-export {
-  a as ArchitectureModule,
-  s as createArchitectureServices
-};

package/lib/gitGraph-ZV4HHKMB-BSmtVGRu-11b55c26.js

@@ -1,11 +0,0 @@
-import { G, f as s } from "./mermaid-parser.core-CH9ryA1K-cb113dbd.js";
-import "./index-37902e74.js";
-import "vue";
-import "./mermaid.core-CAqkCmS1-7a15448d.js";
-import "./_baseUniq-BXtq6_NW-0dd20adb.js";
-import "./min-BngCxx8g-bab26a8b.js";
-import "./clone-CEJtuQzg-f58fe871.js";
-export {
-  G as GitGraphModule,
-  s as createGitGraphServices
-};

package/lib/info-63CPKGFF-C8sYWczU-5e8818fa.js

@@ -1,11 +0,0 @@
-import { I as c, c as f } from "./mermaid-parser.core-CH9ryA1K-cb113dbd.js";
-import "./index-37902e74.js";
-import "vue";
-import "./mermaid.core-CAqkCmS1-7a15448d.js";
-import "./_baseUniq-BXtq6_NW-0dd20adb.js";
-import "./min-BngCxx8g-bab26a8b.js";
-import "./clone-CEJtuQzg-f58fe871.js";
-export {
-  c as InfoModule,
-  f as createInfoServices
-};

package/lib/packet-HUATNLJX-bfFWFja0-9e9dc623.js

@@ -1,11 +0,0 @@
-import { P as c, a as s } from "./mermaid-parser.core-CH9ryA1K-cb113dbd.js";
-import "./index-37902e74.js";
-import "vue";
-import "./mermaid.core-CAqkCmS1-7a15448d.js";
-import "./_baseUniq-BXtq6_NW-0dd20adb.js";
-import "./min-BngCxx8g-bab26a8b.js";
-import "./clone-CEJtuQzg-f58fe871.js";
-export {
-  c as PacketModule,
-  s as createPacketServices
-};

package/lib/pie-WTHONI2E-QPrWs3SR-cae2aaa0.js

@@ -1,11 +0,0 @@
-import { b as s, d as c } from "./mermaid-parser.core-CH9ryA1K-cb113dbd.js";
-import "./index-37902e74.js";
-import "vue";
-import "./mermaid.core-CAqkCmS1-7a15448d.js";
-import "./_baseUniq-BXtq6_NW-0dd20adb.js";
-import "./min-BngCxx8g-bab26a8b.js";
-import "./clone-CEJtuQzg-f58fe871.js";
-export {
-  s as PieModule,
-  c as createPieServices
-};

package/lib/radar-NJJJXTRR-BnUCJhQL-947228ad.js

@@ -1,11 +0,0 @@
-import { R as d, g as s } from "./mermaid-parser.core-CH9ryA1K-cb113dbd.js";
-import "./index-37902e74.js";
-import "vue";
-import "./mermaid.core-CAqkCmS1-7a15448d.js";
-import "./_baseUniq-BXtq6_NW-0dd20adb.js";
-import "./min-BngCxx8g-bab26a8b.js";
-import "./clone-CEJtuQzg-f58fe871.js";
-export {
-  d as RadarModule,
-  s as createRadarServices
-};

package/lib/treemap-75Q7IDZK-B2atdfMH-727e384d.js

@@ -1,11 +0,0 @@
-import { T as s, h as T } from "./mermaid-parser.core-CH9ryA1K-cb113dbd.js";
-import "./index-37902e74.js";
-import "vue";
-import "./mermaid.core-CAqkCmS1-7a15448d.js";
-import "./_baseUniq-BXtq6_NW-0dd20adb.js";
-import "./min-BngCxx8g-bab26a8b.js";
-import "./clone-CEJtuQzg-f58fe871.js";
-export {
-  s as TreemapModule,
-  T as createTreemapServices
-};