agilebuilder-ui 1.1.45 → 1.1.46-sit2

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-user-tree-inline.vue

@@ -21,41 +21,45 @@
             </el-autocomplete>
           </el-header>
           <el-main style="padding: 10px">
-            <div
-              v-if="!searchValue"
-              style="padding-top: 5px; overflow: auto; width: auto; display: inline-block !important"
-            >
-              <el-tree
-                ref="workgroupUserTree"
-                :filter-node-method="filterNode"
-                :load="loadNode"
-                :props="defaultProps"
-                :show-checkbox="multiple"
-                lazy
-                node-key="nodeId"
-                @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 === 'USER' && searchValue && filterUserVal(data, searchValue)
-                          ? 'searchResult'
-                          : ''
-                      "
-                      :title="node.label"
-                    >
-                      {{ node.label }}
+                <el-tree
+                  ref="workgroupUserTree"
+                  :filter-node-method="filterNode"
+                  :load="loadNode"
+                  :props="defaultProps"
+                  :show-checkbox="multiple"
+                  lazy
+                  node-key="nodeId"
+                  @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 === 'USER' && searchValue && filterUserVal(data, searchValue)
+                            ? '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-user-result
                 ref="workgroupUserResult"
@@ -114,7 +118,7 @@ import localStorage from '../../../src/utils/local-storage'
 import utils from '../../utils/utils'
 import workgroupTreeInlineService from './workgroup-tree-inline-service'
 import WorkgroupUserResult from './search-result.vue'
-
+import EmptyState from '../../empty-state/index.vue'
 export default {
   data() {
     return {
@@ -153,12 +157,14 @@ export default {
       selectNodeInfo: null,
       // 公司根节点信息
       tenantInfo: {},
-      ElIconSearch
+      ElIconSearch,
+      canShowOrgTree: false
     }
   },
   name: 'InlineWorkgroupUserTree',
   components: {
-    WorkgroupUserResult
+    WorkgroupUserResult,
+    EmptyState
   },
   props: {
     // 是否是多选树，默认是true
@@ -198,6 +204,9 @@ export default {
     }
   },
   created() {
+    utils.canShowOrgTree().then((showOrgTree) => {
+      this.canShowOrgTree = showOrgTree
+    })
     if (this.multiple) {
       this.initSelectUsers(this.searchField, this.selectUserInfo, this.separator).then((users) => {
         if (users) {

package/src/i18n/langs/cn.js

@@ -56,7 +56,7 @@ const cn = {
     pleaseRemoveallpersonnelBeforeSelectingSpecificPersonnel: '请先移除所有人员，再选择具体人员',
     queryResultIsEmpty: '查询结果为空',
     pleaseSelectATeam: '请选择工作组',
-    pleaseEnterTeamName: '请输入工作组名称',
+    pleaseEnterTeamName: '请输入工作组信息筛选',
     validationFailed: '验证失败',
     selectionDate: '选择日期',
     selectTime: '选择时间',
@@ -84,7 +84,7 @@ const cn = {
     uploadFileTip: '上传的文件不超过{fileSize}M',
     asyncExportJumpMsg: '或点击我跳转到下载页面',
     mustFill: '{label} 必须填写',
-    filePathNotFound: '文件UUID未找到，请检查配置',
+    filePathNotFound: '文件UUID未找到，请检查配置'
   },
   // 列表组件
   superGrid: {
@@ -136,13 +136,13 @@ const cn = {
     prevRow: '上一行',
     nextRow: '下一行',
     detail: '详情',
-    searchEmpty:'查询空值'
+    searchEmpty: '查询空值'
   },
   // 部门树组件
   departmentTree: {},
   // 嵌入部门树组件
   departmentTreeInline: {
-    pleaseEnterDepartmentName: '请输入部门名称',
+    pleaseEnterDepartmentName: '请输入部门信息筛选',
     name: '部门名称',
     code: '部门编码',
     removeDepartment: '移除部门',
@@ -156,7 +156,7 @@ const cn = {
   },
   // 用户树
   departmentUserTree: {
-    pleaseEnterUserInformation: '请输入用户信息',
+    pleaseEnterUserInformation: '请输入用户信息筛选',
     selectedPeople: '已选人员',
     searchFieldUserName: '姓名',
     searchFieldLoginName: '登录名',
@@ -284,7 +284,9 @@ const cn = {
     theNumberOfUploadsExceedsTheLimitTheLimitIs: '上传数量超过限制,限制数量为',
     image: '图片',
     video: '视频',
-    updateSuccess: '更新成功'
+    updateSuccess: '更新成功',
+    more: '更多',
+    uploadFailed: '上传失败！'
   },
   messageVideo: {
     attemptingToIdentify: '正在尝试识别....',
@@ -299,6 +301,18 @@ const cn = {
   },
   imatrixUIPromptMessage: {
     NoContent: '暂无内容'
+  },
+  chatEmbed: {
+    name: '小助手',
+    history: '历史记录',
+    minimize: '缩小',
+    fullscreen: '全屏',
+    close: '关闭',
+    regenerate: '重新生成',
+    copy: '复制',
+    newChat: '新建会话',
+    copySuccess: '复制成功',
+    requestFailed: '请求会话失败！'
   }
 }
 export default cn

package/src/i18n/langs/en.js

@@ -57,7 +57,7 @@ const en = {
       'Please Remove All Personnel Before Selecting Specific Personnel',
     queryResultIsEmpty: 'Query Result Is Empty',
     pleaseSelectATeam: 'Please Select A Team',
-    pleaseEnterTeamName: 'Please Enter Team Name',
+    pleaseEnterTeamName: 'Please Enter Team Info Filter',
     validationFailed: 'Validation Failed',
     selectionDate: 'Selection Date',
     selectTime: 'Select Time',
@@ -136,11 +136,11 @@ const en = {
     prevRow: 'Prev Row',
     nextRow: 'Next Row',
     detail: 'Detail',
-    searchEmpty:'Search Empty'
+    searchEmpty: 'Search Empty'
   },
   departmentTree: {},
   departmentTreeInline: {
-    pleaseEnterDepartmentName: 'Please Enter Department Name',
+    pleaseEnterDepartmentName: 'Please Enter Department Info Filter',
     name: 'Department Name',
     code: 'Department Code',
     removeDepartment: 'Remove Department',
@@ -154,7 +154,7 @@ const en = {
   },
   // 用户树
   departmentUserTree: {
-    pleaseEnterUserInformation: 'Please Enter User Information',
+    pleaseEnterUserInformation: 'Please Enter User Information Filter',
     selectedPeople: 'Selected People',
     searchFieldUserName: 'Name',
     searchFieldLoginName: 'Login Name',
@@ -283,7 +283,9 @@ const en = {
     theNumberOfUploadsExceedsTheLimitTheLimitIs: 'The number of uploads exceeds the limit. The limit is',
     image: 'Image',
     video: 'Video',
-    updateSuccess: 'Update success'
+    updateSuccess: 'Update success',
+    more: 'More',
+    uploadFailed: 'Upload failed!'
   },
   messageVideo: {
     attemptingToIdentify: 'Attempting to identify',
@@ -298,6 +300,18 @@ const en = {
   },
   imatrixUIPromptMessage: {
     NoContent: 'No content'
+  },
+  chatEmbed: {
+    name: 'Assistant',
+    history: 'History',
+    minimize: 'Minimize',
+    fullscreen: 'Full Screen',
+    close: 'Close',
+    regenerate: 'Regenerate',
+    copy: 'Copy',
+    newChat: 'New Chat',
+    copySuccess: 'Copy successful',
+    requestFailed: 'Request failed!'
   }
 }
 export default en

package/src/store/modules/chat-ai-store.ts

@@ -0,0 +1,78 @@
+import { ref, computed, reactive } from 'vue'
+import { defineStore } from 'pinia'
+
+type Menu = {
+  menuCode: string
+  menuName: string
+}
+
+export default defineStore('ChatAiStore', () => {
+  const currentTabName = ref('chat')
+  const activeMenu = ref<Menu>({
+    menuCode: '',
+    menuName: ''
+  })
+  const pageInfo = ref<any>({})
+
+  // 最后操作的表格实例
+  const pageRef = ref<any>(null)
+  const pageData = ref<any[]>([])
+
+  function setCurrentTabName(name: string) {
+    currentTabName.value = name
+  }
+
+  function getCurrentTabName() {
+    return currentTabName.value
+  }
+
+  function setPageInfoToChatStore(menuCode: string, info: any) {
+    pageInfo.value[menuCode] = info
+  }
+
+  function getPageInfo(menuCode: string) {
+    return pageInfo.value[menuCode] || null
+  }
+
+  function getActiveMenuPageInfo() {
+    return pageInfo.value[activeMenu.value.menuCode] || null
+  }
+
+  function setPageData(newSelection: any[]) {
+    pageData.value = JSON.parse(JSON.stringify(newSelection))
+  }
+
+  function getPageData() {
+    return pageData.value
+  }
+
+  function clearPageData() {
+    pageData.value = []
+  }
+
+  function setActiveMenu(menu: any) {
+    activeMenu.value = menu
+  }
+
+  function getActiveMenu() {
+    return activeMenu.value
+  }
+
+  function getPageType() {}
+
+  return {
+    setCurrentTabName,
+    getCurrentTabName,
+    setPageData,
+    getPageData,
+    clearPageData,
+    getActiveMenu,
+    setActiveMenu,
+    getPageType,
+    setPageInfoToChatStore,
+    getPageInfo,
+    getActiveMenuPageInfo,
+    pageData,
+    activeMenu
+  }
+})

package/src/store/modules/tab-content.js

@@ -1,7 +1,8 @@
+import { setActiveMenuToChatAiStore } from '../../utils/chat-ai-util.ts'
 const tabContent = {
   state: {
     openTab: [], // 所有打开的路由
-    activeIndex: null, // 激活状态
+    activeIndex: null // 激活状态
   },
   mutations: {
     // 添加tabs
@@ -21,6 +22,11 @@ const tabContent = {
     },
     // 设置当前激活的tab
     set_active_index(state, index) {
+      const activeTab = state.openTab.find((item) => item.code === index)
+      setActiveMenuToChatAiStore({
+        menuCode: index,
+        menuName: activeTab?.name || ''
+      })
       state.activeIndex = index
     },
     // 清空tabs
@@ -28,9 +34,9 @@ const tabContent = {
       if (state.openTab.length > 0) {
         state.openTab.splice(0, state.openTab.length)
       }
-    },
+    }
   },
-  actions: {},
+  actions: {}
 }
 
 export default tabContent

package/src/styles/element-ui.scss

@@ -9,13 +9,14 @@
   display: none;
 }
 
-//暂时性解决diolag 问题 https://github.com/ElemeFE/element/issues/2461
-.el-dialog {
-  transform: none;
-  left: 0;
-  position: relative;
-  margin: 0 auto;
-}
+//暂时性解决diolag 问题 https://github.com/ElemeFE/element/issues/2461 Dialog内select tree等组件在点击箭头时有虚晃
+// 去掉这个配置是因为margin: 0 auto;影响弹框位置，紧贴浏览器顶部，没有间距。例如：权限系统/授权管理/分支字段权限管理/新建按钮弹框
+// .el-dialog {
+//   transform: none;
+//   left: 0;
+//   position: relative;
+//   margin: 0 auto;
+// }
 
 //element ui upload
 .upload-container {

package/src/styles/index.scss

@@ -303,4 +303,49 @@ body .el-table colgroup.gutter {
 
 .dec-page-main {
   padding: var(--dec-page-main-padding, 15px);
+}
+
+// 必填背景色
+.required_bg {
+  background-color: #fff3e0 !important;
+  border-left: 4px solid #ff9800 !important;
+  padding: 10px;
+  display: block;
+}
+
+// 必填时右上角标样式
+.required-corner::after {
+  content: "*";
+  color: #e74c3c;
+  font-size: 18px;
+  font-weight: bold;
+  position: absolute;
+  top: 3px;
+  right: 5px;
+}
+
+
+// "暂无更多" 样式
+.empty_center_area {
+  width: 100%;
+  position: relative;
+
+  .empty_notAvailable {
+    background-image: url('../assets/nonemessage.png');
+    background-size: 100%;
+    position: absolute;
+    top: 30%;
+    left: 50%;
+    transform: translate(-50%, -50%);
+
+    .empty_notAvailable_text {
+      position: absolute;
+      bottom: 0;
+      left: 50%;
+      transform: translate(-50%, 100%);
+      color: #313233;
+      font-weight: regular;
+      font-size: 14px;
+    }
+  }
 }

package/src/utils/chat-ai-util.ts

@@ -0,0 +1,31 @@
+function setPageDataToChatAiStore(ref, newSelection, type = 'list') {
+  try {
+    if (window.top.ChatAiStore) {
+      window.top.ChatAiStore.setPageData(ref, newSelection, type)
+    }
+  } catch (error) {
+    console.error('ChatAiStore not found', error)
+  }
+}
+
+function setActiveMenuToChatAiStore(activeMenu) {
+  try {
+    if (window.top.ChatAiStore) {
+      window.top.ChatAiStore.setActiveMenu(activeMenu)
+    }
+  } catch (error) {
+    console.error('ChatAiStore not found', error)
+  }
+}
+
+function setPageInfoToChatStore(menuCode, info) {
+  try {
+    if (window.top.ChatAiStore) {
+      window.top.ChatAiStore.setPageInfoToChatStore(menuCode, info)
+    }
+  } catch (error) {
+    console.error('ChatAiStore not found', error)
+  }
+}
+
+export { setPageDataToChatAiStore, setActiveMenuToChatAiStore, setPageInfoToChatStore }