agilebuilder-ui 1.1.46-sit1 → 1.1.46-sit3

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

@@ -112,7 +112,7 @@ import {
 import {$emit} from '../../utils/gogocodeTransfer'
 import Cookies from 'js-cookie'
 import seeBigPicture from './see-big-picture.vue'
-import {getSystemFrontendUrl, isPlateSys,} from '../../../src/utils/common-util.js'
+import {getRelativeBaseUrl, getSystemFrontendUrl, isPlateSys,} from '../../../src/utils/common-util.js'
 import {getToken} from '../../../src/utils/auth'
 
 export default {
@@ -194,10 +194,11 @@ export default {
 		data: {
 			type: Array,
 			default: null,
+			baseURL: null
 		},
 	},
 	created() {
-		this.baseURL = window.$vueApp.config.globalProperties.baseURL
+		this.baseURL = getRelativeBaseUrl(window.$vueApp.config.globalProperties.baseURL)
 		if (this.data) {
 			this.unifiedEnclosure = this.data[0]
 		}
@@ -260,7 +261,7 @@ export default {
 				const http = this.$http
 				http
 						.post(
-								window.$vueApp.config.globalProperties.baseURL +
+								this.baseURL +
 								'/common/fs-upload/des-encrypt',
 								map
 						)
@@ -294,9 +295,9 @@ export default {
 				} else {
 					const myShowName = this.unifiedEnclosure.fileName
 					const uuid = this.unifiedEnclosure.uuid
-					let baseUrl = window.$vueApp.config.globalProperties.baseURL
+					let baseUrl = this.baseURL
 					if (isPlateSys(window.$vueApp.config.globalProperties.systemCode)) {
-						baseUrl = window.$vueApp.config.globalProperties.baseAPI
+						baseUrl = getRelativeBaseUrl(window.$vueApp.config.globalProperties.baseAPI)
 					}
 					let previewUrl
 					if (window.$vueApp.config.globalProperties.kkFileViewUrl) {
@@ -335,7 +336,7 @@ export default {
 			}
 			http
 					.post(
-							window.$vueApp.config.globalProperties.baseURL +
+							this.baseURL +
 							'/common/fs-upload/upload-template/' +
 							this.systemCode,
 							param,

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

@@ -38,6 +38,7 @@ import { $on, $off, $once, $emit } from '../../utils/gogocodeTransfer'
 import fsUploadMulti from './fs-upload-multi.vue'
 import fsUploadSingle from './fs-upload-single.vue'
 import * as Vue from 'vue'
+import { getRelativeBaseUrl } from '../../../src/utils/common-util'
 export default {
   name: 'FsUpload',
   components: {
@@ -175,9 +176,10 @@ export default {
     deleteFile(deleteUuid) {
       const http = this.$http
       const list = [deleteUuid]
+      const baseURL = getRelativeBaseUrl(window.$vueApp.config.globalProperties.baseURL)
       http
         .delete(
-          window.$vueApp.config.globalProperties.baseURL + '/common/fs-upload',
+          baseURL + '/common/fs-upload',
           { data: list }
         )
         .then((data) => {})

package/packages/fs-upload/src/see-big-picture.vue

@@ -42,6 +42,7 @@
 </template>
 
 <script>
+import { getRelativeBaseUrl } from '../../../src/utils/common-util'
 export default {
   props: {
     unifiedEnclosures: {
@@ -56,9 +57,11 @@ export default {
   data() {
     return {
       displayIndex: 0,
+      baseURL: null
     }
   },
   created() {
+    this.baseURL = getRelativeBaseUrl(window.$vueApp.config.globalProperties.baseURL)
     this.displayIndex = this.showIndex
   },
   methods: {},

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

@@ -74,7 +74,7 @@ import { $emit } from '../../utils/gogocodeTransfer'
 
 import { getToken } from '../../../src/utils/auth'
 import { isImage } from '../../../src/utils/util'
-import { getSystemFrontendUrl, isPlateSys, isMobileBrowser } from '../../../src/utils/common-util'
+import { getSystemFrontendUrl, isPlateSys, isMobileBrowser, getRelativeBaseUrl } from '../../../src/utils/common-util'
 import FsPreview from '../../fs-preview/src/fs-preview.vue'
 import { packageFile } from '../../super-grid/src/utils'
 import FileUploadInputMobile from '../../fs-upload-new/src/file-upload-mobile/file-upload-input.vue'
@@ -160,6 +160,7 @@ export default {
     if (isPlateSys(window.$vueApp.config.globalProperties.systemCode)) {
       defaultAction = window.$vueApp.config.globalProperties.baseAPI + '/component/super-form/uploads'
     }
+    defaultAction = getRelativeBaseUrl(defaultAction)
     const isMobile = isMobileBrowser()
     const systemCode = this.pageContext && this.pageContext.systemCode ? this.pageContext.systemCode : null
     return {

package/packages/fs-upload-new/src/fs-button-upload.vue

@@ -42,7 +42,7 @@
 
 <script setup lang="ts">
 import { ref, defineProps, defineEmits } from 'vue'
-import { getSystemFrontendUrl, isPlateSys } from '../../../src/utils/common-util'
+import { getRelativeBaseUrl, getSystemFrontendUrl, isPlateSys } from '../../../src/utils/common-util'
 import { getToken } from '../../../src/utils/auth'
 import type { UploadFile, UploadFiles } from 'element-plus'
 import fsPreviewNew from './fs-preview-new.vue'
@@ -141,8 +141,8 @@ const props = defineProps({
     default: 0
   }
 })
-const baseURL = window.$vueApp.config.globalProperties.baseURL
-const baseAPI = window.$vueApp.config.globalProperties.baseAPI
+const baseURL = getRelativeBaseUrl(window.$vueApp.config.globalProperties.baseURL)
+const baseAPI = getRelativeBaseUrl(window.$vueApp.config.globalProperties.baseAPI)
 const defaultAction = ref<string>('')
 const buttonUploadRef = ref()
 const innerLimitFileSize = ref(props.limitFileSize)

package/packages/fs-upload-new/src/fs-drag-upload.vue

@@ -40,7 +40,7 @@
 <script setup lang="ts">
 import { UploadFilled } from '@element-plus/icons-vue'
 import { ref, defineProps, defineEmits } from 'vue'
-import { getSystemFrontendUrl, isPlateSys } from '../../../src/utils/common-util'
+import { getRelativeBaseUrl, getSystemFrontendUrl, isPlateSys } from '../../../src/utils/common-util'
 import { getToken } from '../../../src/utils/auth'
 import type { UploadFile, UploadFiles } from 'element-plus'
 import fsPreviewNew from './fs-preview-new.vue'
@@ -139,8 +139,8 @@ const props = defineProps({
     default: 0
   }
 })
-const baseURL = window.$vueApp.config.globalProperties.baseURL
-const baseAPI = window.$vueApp.config.globalProperties.baseAPI
+const baseURL = getRelativeBaseUrl(window.$vueApp.config.globalProperties.baseURL)
+const baseAPI = getRelativeBaseUrl(window.$vueApp.config.globalProperties.baseAPI)
 const defaultAction = ref<string>('')
 const innerLimitFileSize = ref(props.limitFileSize)
 if (props.action) {

package/packages/fs-upload-new/src/fs-preview-new.vue

@@ -61,7 +61,7 @@
 <script setup lang="ts">
 import { Close, Paperclip, Download } from '@element-plus/icons-vue'
 import { ref, defineProps } from 'vue'
-import { getSystemFrontendUrl, isPlateSys, isMobileBrowser, getReplaceUrlDomain } from '../../../src/utils/common-util'
+import { getSystemFrontendUrl, isPlateSys, isMobileBrowser, getReplaceUrlDomain, getRelativeBaseUrl } from '../../../src/utils/common-util'
 import { getToken } from '../../../src/utils/auth'
 import { isImage } from '../../../src/utils/util'
 import { Base64 } from 'js-base64'
@@ -125,8 +125,10 @@ const props = defineProps({
     default: false
   }
 })
-const baseURL = props.baseURL ? props.baseURL : window.$vueApp.config.globalProperties.baseURL
-const baseAPI = window.$vueApp.config.globalProperties.baseAPI
+let baseURL = props.baseURL ? props.baseURL : window.$vueApp.config.globalProperties.baseURL
+let baseAPI = window.$vueApp.config.globalProperties.baseAPI
+baseURL = getRelativeBaseUrl(baseURL)
+baseAPI = getRelativeBaseUrl(baseAPI)
 
 const dialogVisible = ref<boolean>(false)
 const previewImageInfo = ref<any>({})
@@ -233,9 +235,9 @@ const previweDoc = (showName: string, serverPath: string) => {
       showName
     )
   } else {
-    let baseUrl = window.$vueApp.config.globalProperties.baseURL
+    let baseUrl = baseURL
     if (isPlateSys(window.$vueApp.config.globalProperties.systemCode)) {
-      baseUrl = window.$vueApp.config.globalProperties.baseAPI
+      baseUrl = baseAPI
     }
     let previewUrl
     if (window.$vueApp.config.globalProperties.kkFileViewUrl) {
@@ -258,6 +260,7 @@ const previweDoc = (showName: string, serverPath: string) => {
       previewUrl = baseUrl + '/common/fs-upload/preview?jwt=' + token
       previewUrl = previewUrl + '&showName=' + encodeURI(showName) + '&serverPath=' + serverPath
     }
+    previewUrl = getRelativeBaseUrl(previewUrl)
     window.open(previewUrl, showName)
   }
 }

package/packages/plugins/export-data-new.js

@@ -4,6 +4,7 @@ import store from '../super-grid/src/store'
 import {getExtraParam} from '../super-grid/src/utils'
 import nineGridStore from '../super-nine-grid/src/store'
 import {packageEnumAndBeanColumnValueSets} from '../utils/value-set'
+import { getRelativeBaseUrl } from '../../src/utils/common-util'
 
 /**
  *
@@ -327,6 +328,7 @@ function exportListData(
       if(!baseUrl){
         baseUrl = window.$vueApp.config.globalProperties.baseURL
       }
+      baseUrl = getRelativeBaseUrl(baseUrl)
       window.$vueApp.config.globalProperties.$http
         .post(
           baseUrl +

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

@@ -3,11 +3,12 @@
     <span v-if="formatConfig.isTag">
       <el-tag
         v-if="displayText"
-        :type="customStyle.type"
+        :type="customStyle.type || formatConfig.tagType"
         :color="customStyle.color"
-        :effect="formatConfig.effect"
+        :effect="formatConfig.tagEffect"
         :size="formatConfig.size"
         :hit="formatConfig.hit"
+        :round="customStyle.round || formatConfig.round"
       >
         {{ displayText }}
       </el-tag>
@@ -144,7 +145,9 @@ export default {
             this.customStyle = result
           })
         } else {
-          this.customStyle = customEventResult
+          if (customEventResult) {
+            this.customStyle = customEventResult
+          }
         }
       }
     }

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

@@ -34,7 +34,7 @@
       @change-required="changeRequired"
       @open-page="openPageEvent"
     />
-    <div v-else class="column-text-main">
+    <div v-else :class=" (options?.configureObj?.props?.base?.columnEditable ?? false) ? 'column-text-main' : ''">
       <div
         v-if="
           lineEdit.editable &&

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!==0?this.heightOffset:30)
+        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!==0?this.heightOffset:30)
+        return this.tableHeight <= 100 ? 100 : this.tableHeight + (this.heightOffset !== 0 ? this.heightOffset : 30)
       }
       return undefined
     },
@@ -925,7 +925,7 @@ export default {
         }
       )
       if (!this.isFormSubTable) {
-        setPageInfoToChatStore(this.pageContext.menuCode, {
+        setPageInfoToChatStore(this.pageContext, {
           listRefs: [
             {
               ref: this
@@ -1666,7 +1666,7 @@ export default {
           // const subTableData = JSON.parse(JSON.stringify(this.subTableData))
           this.pagination.total = subTableData.length
           // 当前是第几页
-          let newCurrentPage = currentPage!== undefined && currentPage !== null ?currentPage: this.currentPage
+          let newCurrentPage = currentPage !== undefined && currentPage !== null ? currentPage : this.currentPage
           if (newCurrentPage === undefined || newCurrentPage === null) {
             newCurrentPage = 1
           }

package/packages/utils/utils.js

@@ -6,25 +6,25 @@ const utils = {
     return [
       {
         value: 'name',
-        label: i18n.t('departmentUserTree.searchFieldUserName'),
+        label: i18n.t('departmentUserTree.searchFieldUserName')
       },
       {
         value: 'loginName',
-        label: i18n.t('departmentUserTree.searchFieldLoginName'),
+        label: i18n.t('departmentUserTree.searchFieldLoginName')
       },
       { value: 'email', label: i18n.t('departmentUserTree.searchFieldEmail') },
       {
         value: 'telephone',
-        label: i18n.t('departmentUserTree.searchFieldTelephone'),
+        label: i18n.t('departmentUserTree.searchFieldTelephone')
       },
       {
         value: 'jobNumber',
-        label: i18n.t('departmentUserTree.searchFieldJobNumber'),
+        label: i18n.t('departmentUserTree.searchFieldJobNumber')
       },
       {
         value: 'honorificName',
-        label: i18n.t('departmentUserTree.searchFieldHonorificName'),
-      },
+        label: i18n.t('departmentUserTree.searchFieldHonorificName')
+      }
     ]
   },
   removeRow(arr, row) {
@@ -70,9 +70,7 @@ const utils = {
   },
   createFilter(queryString) {
     return (restaurant) => {
-      return (
-        restaurant.value.toLowerCase().indexOf(queryString.toLowerCase()) === 0
-      )
+      return restaurant.value.toLowerCase().indexOf(queryString.toLowerCase()) === 0
     }
   },
   handleSelectUtil(item, localStorage) {
@@ -176,5 +174,24 @@ const utils = {
       }
     })
   },
+  canShowOrgTree() {
+    return new Promise((resolve, reject) => {
+      const cacheShowOrgTree = localStorage.getItem('canShowOrgTree')
+      if (cacheShowOrgTree === 'false' || cacheShowOrgTree === 'true') {
+        let showOrgTree = cacheShowOrgTree === 'true'
+        resolve(showOrgTree)
+      } else {
+        window.$http
+          .get(window.$vueApp.config.globalProperties.baseAPI + '/component/organization-trees/show-org-tree')
+          .then((canshow) => {
+            localStorage.setItem('canShowOrgTree', canshow)
+            resolve(canshow)
+          })
+          .catch((error) => {
+            resolve(false)
+          })
+      }
+    })
+  }
 }
 export default utils

package/packages/workgroup-tree-inline/src/workgroup-tree-inline.vue

@@ -3,7 +3,7 @@
     <el-container style="height: 395px">
       <el-aside width="430px">
         <el-container style="height: 390px">
-          <el-header style="text-align: right; font-size: 12px">
+          <el-header style="text-align: right; font-size: 12px; height: 35px">
             <el-autocomplete
               v-model="filterText"
               :fetch-suggestions="querySearch"
@@ -20,44 +20,48 @@
             </el-autocomplete>
           </el-header>
           <el-main>
-            <div
-              v-if="!searchValue"
-              style="padding-top: 5px; overflow: auto; width: auto; display: inline-block !important"
-            >
-              <el-tree
-                ref="workgroupTree"
-                :filter-node-method="filterNode"
-                :load="loadNode"
-                :props="defaultProps"
-                :show-checkbox="multiple"
-                lazy
-                node-key="id"
-                @check="handleCheckNode"
-                @node-click="handleNodeClick"
+            <template v-if="!searchValue">
+              <div
+                v-if="canShowOrgTree"
+                style="padding-top: 5px; overflow: auto; width: auto; display: inline-block !important"
               >
-                <template #default="{ node, data }">
-                  <span>
-                    <el-icon>
-                      <Menu v-if="node.data.id === -1" />
-                      <Calendar v-else />
-                    </el-icon>
-                    <span
-                      :class="
-                        data.nodeType &&
-                        data.nodeType === 'WORKGROUP' &&
-                        searchValue &&
-                        data.name.indexOf(searchValue) > -1
-                          ? 'searchResult'
-                          : ''
-                      "
-                      :title="node.label"
-                    >
-                      {{ node.label }}
+                <el-tree
+                  ref="workgroupTree"
+                  :filter-node-method="filterNode"
+                  :load="loadNode"
+                  :props="defaultProps"
+                  :show-checkbox="multiple"
+                  lazy
+                  node-key="id"
+                  @check="handleCheckNode"
+                  @node-click="handleNodeClick"
+                >
+                  <template #default="{ node, data }">
+                    <span>
+                      <el-icon>
+                        <Menu v-if="node.data.id === -1" />
+                        <Calendar v-else />
+                      </el-icon>
+                      <span
+                        :class="
+                          data.nodeType &&
+                          data.nodeType === 'WORKGROUP' &&
+                          searchValue &&
+                          data.name.indexOf(searchValue) > -1
+                            ? 'searchResult'
+                            : ''
+                        "
+                        :title="node.label"
+                      >
+                        {{ node.label }}
+                      </span>
                     </span>
-                  </span>
-                </template>
-              </el-tree>
-            </div>
+                  </template>
+                </el-tree>
+              </div>
+              <!-- 暂无信息 -->
+              <EmptyState v-else style="width: 100%; height: 100%" />
+            </template>
             <div v-if="searchValue && searchValue.length > 0" style="height: 100%; overflow: hidden">
               <workgroup-result
                 ref="workgroupResult"
@@ -116,7 +120,7 @@ import localStorage from '../../../src/utils/local-storage'
 import utils from '../../utils/utils'
 import workgroupTreeService from './workgroup-tree-service'
 import WorkgroupResult from './search-result.vue'
-
+import EmptyState from '../../empty-state/index.vue'
 export default {
   data() {
     return {
@@ -145,12 +149,14 @@ export default {
       selectWorkgroupData: null,
       // 公司根节点信息
       tenantInfo: {},
-      ElIconSearch
+      ElIconSearch,
+      canShowOrgTree: false
     }
   },
   name: 'InlineWorkgroupTree',
   components: {
-    WorkgroupResult
+    WorkgroupResult,
+    EmptyState
   },
   props: {
     // 是否是多选树，默认是true
@@ -195,6 +201,9 @@ export default {
     }
   },
   created() {
+    utils.canShowOrgTree().then((showOrgTree) => {
+      this.canShowOrgTree = showOrgTree
+    })
     if (this.multiple) {
       this.initSelectGroups(this.searchField, this.selectGroupInfo, this.separator).then((selectGroups) => {
         if (selectGroups) {
@@ -537,7 +546,7 @@ export default {
 }
 </script>
 
-<style>
+<style scoped>
 .searchResult {
   color: red;
 }

package/packages/workgroup-user-tree-inline/src/workgroup-tree-inline-service.js

@@ -132,27 +132,29 @@ const workgroupTreeInlineService = {
       .then((data) => {
         resolve(data)
         // 更新当前点击的节点的子节点
-        this.$refs.workgroupUserTree.updateKeyChildren(parentNodeId, data)
-        if (parentId === 0) {
-          // 初始化树时，展开公司节点
-          const tenantData = data[0].data
-          this.tenantInfo = JSON.parse(tenantData)
-          this.containBranch = data[0].containBranch
-          // 加载整个组织结构树时，展开公司节点
-          this.loadWorkgroup(this.tenantNodeId, this.tenantNodeId + '')
-        }
-        if (this.isClickNode) {
-          // 表示点击工作组节点选中时展开
-          this.isClickNode = false
-          this.checkedNode(node.data)
-        } else {
-          // 表示是点击三角展开节点时
-          if (checkedKeys && checkedKeys.indexOf(parentNodeId) > -1) {
-            // 点击公司名称前的三角标识展开节点时，保持当前节点的选中状态
-            // 表示当前展开的节点是选中状态，则应保持其选中状态，并选中其子节点
-            this.checkedNode(node.data)
+          if (this.$refs.workgroupUserTree) {
+            this.$refs.workgroupUserTree.updateKeyChildren(parentNodeId, data)
+            if (parentId === 0) {
+              // 初始化树时，展开公司节点
+              const tenantData = data[0].data
+              this.tenantInfo = JSON.parse(tenantData)
+              this.containBranch = data[0].containBranch
+              // 加载整个组织结构树时，展开公司节点
+              this.loadWorkgroup(this.tenantNodeId, this.tenantNodeId + '')
+            }
+            if (this.isClickNode) {
+              // 表示点击工作组节点选中时展开
+              this.isClickNode = false
+              this.checkedNode(node.data)
+            } else {
+              // 表示是点击三角展开节点时
+              if (checkedKeys && checkedKeys.indexOf(parentNodeId) > -1) {
+                // 点击公司名称前的三角标识展开节点时，保持当前节点的选中状态
+                // 表示当前展开的节点是选中状态，则应保持其选中状态，并选中其子节点
+                this.checkedNode(node.data)
+              }
+            }
           }
-        }
       })
   },
   // 加载当前节点的子节点
@@ -164,9 +166,11 @@ const workgroupTreeInlineService = {
     this.$http
       .post(window.$vueApp.config.globalProperties.baseAPI + '/component/organization-trees/workgroup-users', param)
       .then((children) => {
-        this.$refs.workgroupUserTree.updateKeyChildren(parentNodeId, children)
-        if (this.$refs.workgroupUserTree.store.nodesMap[parentNodeId]) {
-          this.$refs.workgroupUserTree.store.nodesMap[parentNodeId].expanded = true
+        if(this.$refs.workgroupUserTree) {
+          this.$refs.workgroupUserTree.updateKeyChildren(parentNodeId, children)
+          if (this.$refs.workgroupUserTree.store.nodesMap[parentNodeId]) {
+            this.$refs.workgroupUserTree.store.nodesMap[parentNodeId].expanded = true
+          }
         }
         if (isSearch) {
           // 查询时处理
@@ -176,7 +180,9 @@ const workgroupTreeInlineService = {
           }
           if (this.allExpandNodeIds.length === this.allSearchNodeIds.length) {
             // 表示所有节点已展开，执行树的过滤方法
-            this.$refs.workgroupUserTree.filter(searchValue)
+            if(this.$refs.workgroupUserTree) {
+                this.$refs.workgroupUserTree.filter(searchValue)
+            }
             this.allExpandNodeIds = []
             this.allSearchNodeIds = []
           }