agilebuilder-ui 1.0.13 → 1.0.15

package/package.json

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

package/packages/fs-upload-list/src/fs-upload-list.vue

@@ -244,6 +244,13 @@ export default {
 				// 返回false停止上传
 				return false
 			}
+			const beforeUpload = this.fileSetObj.beforeUpload
+			if(beforeUpload) {
+				const result = beforeUpload.call(this, {pageContext: this.fileSetObj.pageContext, configureObj: this.fileSetObj.configureObj, file: file})
+				if(result!==undefined && result!==null && result !== true){
+					return false
+				}
+			}
 		},
 		// 上传成功
 		uploadOnSuccess(response, file) {
@@ -378,9 +385,7 @@ export default {
 		'delete-success',
 		'delete',
 		'update:value',
-		,
 		'close',
-		,
 		'update:value',
 	],
 }

package/packages/organization-input/src/organization-input.vue

@@ -21,6 +21,7 @@
 		      :size="size"
 		      type="text"
 		      @click="showOrganizationTree(false)"
+			  @change="changeEvent"
       >
         <template v-slot:append>
           <el-icon class="el-input__icon" @click="showOrganizationTree(false)"><el-icon-search/></el-icon>
@@ -98,7 +99,6 @@
 
 <script>
 import {Delete as ElIconDelete, Search as ElIconSearch,} from '@element-plus/icons-vue'
-import {$emit} from '../../utils/gogocodeTransfer'
 // import Vue from 'vue'
 import {getPropNameWhenJoinTable, setEntityFieldValue,} from '../../../src/utils/util'
 
@@ -188,6 +188,10 @@ export default {
 	created() {
 	},
 	methods: {
+		// change事件
+		changeEvent(value) {
+			this.$emit('change', value)
+		},
 		// 打开组织树
 		showOrganizationTree() {
 			let isMulti = this.multiple
@@ -200,6 +204,7 @@ export default {
 			}
 			this.$emit('focus')
 			this.showOrganizationTreeFlag = true
+			this.$emit('show-tree')
 		},
 		getPropName(prop, isJoinTable, tableName) {
 			return getPropNameWhenJoinTable(prop, isJoinTable, tableName)

package/packages/workflow-history-list/src/workflow-history-list.vue

@@ -193,14 +193,20 @@ export default {
     return {}
   },
 	created() {
-		this.getI18nSet().then((processI18n) => {
-			this.processI18n = processI18n
-			if (!this.histories || this.histories === null) {
-				this.getData()
-			} else {
-				this.loaded = true
-			}
-		})
+    console.log('historyList---workflowId==', this.workflowId)
+    if(this.workflowId !== undefined && this.workflowId !== null){
+      this.getI18nSet().then((processI18n) => {
+        this.processI18n = processI18n
+        if (!this.histories || this.histories === null) {
+          this.getData()
+        } else {
+          this.loaded = true
+        }
+      })
+    } else {
+        // 页面设计器预览页面时会用该方法
+        this.initTableData()
+    }
 	},
 	mounted() {
 		this.$nextTick(() => {
@@ -210,34 +216,41 @@ export default {
 	methods: {
 		...ApiJs,
 		getData() {
-			this.$http
-					.get(
-							window.$vueApp.config.globalProperties.baseAPI +
-							'/wf-editor/instance-histories/' +
-							this.workflowId
-					)
-					.then((data) => {
-          this.histories = data.histories
-          if (data && data.currentTasks) {
-            this.histories = this.histories.concat(data.currentTasks)
-          }
-          this.loaded = true
-          if (this.maxHeight) {
-            this.tableMaxHeight = Number(this.maxHeight)
-          } else {
-            if (this.$parent.$el.offsetHeight) {
-              this.tableMaxHeight = this.$parent.$el.offsetHeight
-						}
-						if (!this.tableMaxHeight) {
-           	 	this.tableMaxHeight = window.innerHeight - 120
-         		}
-          }
+      this.$http
+          .get(
+              window.$vueApp.config.globalProperties.baseAPI +
+              '/wf-editor/instance-histories/' +
+              this.workflowId
+          )
+          .then((data) => {
+            this.initTableData(data)
         })
         .catch((error) => {
           console.log(error)
           this.loaded = true
         })
     },
+    initTableData(data) {
+      if(data) {
+        this.histories = data.histories
+        if (data && data.currentTasks) {
+          this.histories = this.histories.concat(data.currentTasks)
+        }
+      } else {
+        this.histories = []
+      }
+      this.loaded = true
+      if (this.maxHeight) {
+        this.tableMaxHeight = Number(this.maxHeight)
+      } else {
+        if (this.$parent.$el.offsetHeight) {
+          this.tableMaxHeight = this.$parent.$el.offsetHeight
+        }
+        if (!this.tableMaxHeight) {
+          this.tableMaxHeight = window.innerHeight - 120
+        }
+      }
+    },
     getI18nSet() {
       return new Promise((resolve, reject) => {
         if (this.allProcessI18n) {

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

@@ -112,12 +112,12 @@ export default {
 		getDefaultActive() {
 			if (this.firstLeafMenu && this.firstLeafMenu.pageType !== 'iframe') {
 				const pageCode = this.firstLeafMenu.path
-				return '/dsc/' + this.firstLeafMenu.code + '~~' + pageCode
+				return '/dsc/' + this.firstLeafMenu.code + '~~' + pageCode + '~~' + this.firstLeafMenu.newPage
 			} else if (
 					this.firstLeafMenu &&
 					this.firstLeafMenu.pageType === 'iframe'
 			) {
-				return '/dsc/' + this.firstLeafMenu.code + '~~'
+				return '/dsc/' + this.firstLeafMenu.code + '~~pageCode' + '~~' + this.firstLeafMenu.newPage
 			} else {
 				return ''
 			}

package/src/views/dsc-component/tabs/tab-content.vue

@@ -44,7 +44,7 @@ export default {
     let defaultPageTip = window.$vueApp.config.globalProperties.defaultPageTip
     if (!defaultPageTip) {
       defaultPageTip =
-        '欢迎访问质量管理系统/Welcome to Quality Management System'
+        '欢迎访问Agile Builder/Welcome to Agile Builder'
     }
     let defaultPageTipCn = defaultPageTip
     let defaultPageTipEn

package/src/views/layout/components/tabs/tab-content.vue

@@ -44,7 +44,7 @@ export default {
     let defaultPageTip = window.$vueApp.config.globalProperties.defaultPageTip
     if (!defaultPageTip) {
       defaultPageTip =
-        '欢迎访问质量管理系统/Welcome to Quality Management System'
+        '欢迎访问Agile Builder/Welcome to Agile Builder'
     }
     let defaultPageTipCn = defaultPageTip
     let defaultPageTipEn
@@ -77,7 +77,23 @@ export default {
     // 登录超时，给父iframe发送信号
     window.addEventListener('message', this.recieveMessage)
   },
-  methods: {
+	mounted() {
+		// 监听菜单管理切换应用功能，刷新页面
+		window.addEventListener('message', function(event) {
+			if (event.data === 'refreshTabContent') { // 确保消息来源可信
+				window.location.reload();
+			}
+		});
+	},
+	unmounted() {
+		// 移除监听
+		window.removeEventListener('message', function(event) {
+			if (event.data === "refreshTabContent") { // 确保消息来源可信
+				console.log("Received message:", event.data);
+			}
+		});
+	},
+	methods: {
     closeSelectedTag(tagName) {
       const index = this.$store.state.tabContent.openTab.findIndex(
         (item) => item.code === tagName
@@ -128,7 +144,7 @@ export default {
       } else {
         // 表示页面跳转
         if(tag.routePath.indexOf('http:') < 0 && tag.routePath.indexOf('https:') < 0 ) {
-          path = '#' 
+          path = '#'
         }
         if(tag.routePath.indexOf('?') >= 0) {
           path = path + tag.routePath + '&'