agilebuilder-ui 1.1.46 → 1.1.48-rc1

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/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/auth.js

@@ -1,5 +1,6 @@
 import authApi from './auth-api'
 import { removeAllSystemPermissions } from './permissionAuth'
+import { removeGlobalPropCache } from './global-prop'
 
 export function getToken() {
   return authApi.getToken()
@@ -85,13 +86,12 @@ function removeAllLanguages() {
   authApi.removeAllLanguages()
 }
 
-
 export function getTheme() {
   return authApi.getTheme()
 }
 
 export function setTheme(theme) {
-  if(theme) {
+  if (theme) {
     authApi.setTheme(theme)
   } else {
     removeTheme()
@@ -122,9 +122,9 @@ function removePublishControl() {
  */
 export function removeDevpPermissions() {
   let devpJWTKey = '_devpJWT'
-let currentRoleKey = '_CURRENT_ROLE'
-authApi.removeSessionCache(devpJWTKey)
-authApi.removeSessionCache(currentRoleKey)
+  let currentRoleKey = '_CURRENT_ROLE'
+  authApi.removeSessionCache(devpJWTKey)
+  authApi.removeSessionCache(currentRoleKey)
 }
 
 export function isDevpSystem() {
@@ -149,7 +149,7 @@ export function removeSystemCacheUrl() {
 
 export function getRunCurrentRole() {
   let runCurrentRoleKey = '_RUN_CURRENT_ROLE'
-  if(!isDevpSystem()){
+  if (!isDevpSystem()) {
     return authApi.getSessionCache(runCurrentRoleKey)
   }
 }
@@ -165,4 +165,7 @@ export function clearPermission() {
   removeAllSystemPermissions()
   removePublishControl()
   removeSystemCacheUrl()
-}
+
+  // 清除系统参数设置的全局属性缓存
+  removeGlobalPropCache()
+}

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(pageContext, info) {
+  try {
+    if (pageContext && window.top.ChatAiStore) {
+      window.top.ChatAiStore.setPageInfoToChatStore(pageContext.menuCode, info)
+    }
+  } catch (error) {
+    console.error('ChatAiStore not found', error)
+  }
+}
+
+export { setPageDataToChatAiStore, setActiveMenuToChatAiStore, setPageInfoToChatStore }

package/src/utils/common-util.js

@@ -8,6 +8,9 @@ import i18nUtil from './i18n-util'
  * 获得相对地址
  */
 export function getRelativeBaseUrl(originalBaseUrl) {
+  if(!originalBaseUrl){
+    return originalBaseUrl
+  }
   if (
     window.$vueApp.config.globalProperties.projectModel === undefined ||
     window.$vueApp.config.globalProperties.projectModel !== 'developing.model'
@@ -231,8 +234,12 @@ export function isPlateSys(systemCode) {
 export function getServerConfigUtil(http) {
   return new Promise((resolve, reject) => {
     let timestamp = '1'
-    if(__BUILD_TIME__) {
-      timestamp = __BUILD_TIME__
+    try {
+      if(__BUILD_TIME__) {
+        timestamp = __BUILD_TIME__
+      }
+    } catch (error) {
+      console.log('__BUILD_TIME__ not define')
     }
     http.get('./server-config.json?t='+timestamp).then((result) => {
       const config = result
@@ -247,16 +254,60 @@ export function getServerConfigUtil(http) {
       )
       localStorage.setItem('_baseAPI_', window.$vueApp.config.globalProperties.baseAPI)
       localStorage.setItem('_amb_projectModel_', window.$vueApp.config.globalProperties.projectModel)
-      if (config.fontIconAddress && window.insertCssFile) {
-        window.insertCssFile(`${config.fontIconAddress}/iconfont.css?t=${timestamp}`)
-      }
-      if (config.fontIconAddress && window.insertCssFile) {
-        window.insertCssFile(`${config.fontIconAddress}-color/iconfont.css?t=${timestamp}`)
-      }
+      // 插入图标css样式文件
+      insertFontIconCss(config)
+      // 第3方集成js
+      insertThirdLoginJs(config)
       resolve()
     })
   })
 }
+
+export function insertFontIconCss(config){
+  if(!window.insertCssFile){
+      return
+    }
+  if(!config){
+    config = window.$vueApp.config.globalProperties
+  }
+  let timestamp = '1'
+  try {
+    if(__BUILD_TIME__) {
+      timestamp = __BUILD_TIME__
+    }
+  } catch (error) {
+    console.log('__BUILD_TIME__ not define')
+  }
+  if (config.fontIconAddress && window.insertCssFile) {
+    window.insertCssFile(`${config.fontIconAddress}/iconfont.css?t=${timestamp}`)
+  }
+  if (config.fontIconAddress && window.insertCssFile) {
+    window.insertCssFile(`${config.fontIconAddress}-color/iconfont.css?t=${timestamp}`)
+  }
+}
+
+export function insertThirdLoginJs(config){
+    if(!window.insertJsFile ){
+      return
+    }
+    if(!config){
+      config = window.$vueApp.config.globalProperties
+    }
+    if(!config  || (config.systemCode !== 'portal' && config.systemCode !== 'devp')){
+      return
+    }
+    // 只有portal和devp需要动态添加这些js
+    // userName,dingtalk,feishu,qiwei
+    if (!config.loginMethod || config.loginMethod.indexOf('dingtalk')>=0) {
+      window.insertJsFile(`https://g.alicdn.com/dingding/h5-dingtalk-login/0.21.0/ddlogin.js`)
+    }
+    if (!config.loginMethod || config.loginMethod.indexOf('feishu')>=0) {
+      window.insertJsFile(`https://lf-package-cn.feishucdn.com/obj/feishu-static/lark/passport/qrcode/LarkSSOSDKWebQRCode-1.0.3.js`)
+    }
+    if (!config.loginMethod || config.loginMethod.indexOf('qiwei')>=0) {
+      window.insertJsFile(`https://wwcdn.weixin.qq.com/node/open/js/wecom-jssdk-2.3.1.js`)
+    }
+}
 /**
  * postmessage跨域传message时获得orign路径使用
  * @returns orign路径
@@ -748,3 +799,22 @@ export function cacheSystemUrl() {
 export function getAuthSource() {
   return window.localStorage.getItem('auth_source')
 }
+/**
+ * 把路径中的参数转为对象
+ * @param {*} fullPath 全路径。例如：hash路径：http://xx:8090/#/sss/dd?p1=1&p2=2 或 普通路径：http://xx:8090/sss/dd?p1=1&p2=2
+ * @returns 
+ */
+export function getURLSearchParamObj(fullPath) {
+  try{
+    // 提取hash部分 
+    const hash = fullPath.includes('#') ? fullPath.split('#')[1] : fullPath; 
+    // 提取查询参数 
+    const queryString = hash.includes('?') ? hash.split('?')[1] : hash; 
+    // 解析参数 
+    const params = new URLSearchParams(queryString); 
+    // 转换为普通对象
+    return Object.fromEntries(params)
+  }catch(error){
+    console.error('error===',error)
+  }
+}

package/src/utils/global-prop.js

@@ -0,0 +1,17 @@
+const canShowOrgTree = 'CAN_SHOW_ORG_TREE'
+
+export function removeGlobalPropCache() {
+  localStorage.removeItem(canShowOrgTree)
+}
+
+export function getCanShowOrgTree() {
+  return localStorage.getItem(canShowOrgTree)
+}
+
+export function cacheCanShowOrgTree(value) {
+  localStorage.setItem(canShowOrgTree, value)
+}
+
+export function removeCanShowOrgTree() {
+  localStorage.removeItem(canShowOrgTree)
+}

package/src/utils/insert_css.js

@@ -15,7 +15,6 @@ if (!window.insertCssFile) {
         if (!cssUrl || window.insertedCssFiles.has(cssUrl)) {
             return;
         }
-        const timestamp = new Date().getTime();
         const link = document.createElement('link');
         link.rel = 'stylesheet';
         link.href = cssUrl;
@@ -29,6 +28,20 @@ if (!window.insertCssFile) {
     }
 }
 
+
+if (!window.insertJsFile) {
+    window.insertJsFile = (jsUrl) => {
+        if (!jsUrl || window.insertedCssFiles.has(jsUrl)) {
+            return;
+        }
+        const link = document.createElement('script');
+        link.src = jsUrl;
+        link.onload = function () {
+            window.insertedCssFiles.add(jsUrl);
+        };
+        document.head.appendChild(link);
+    }
+}
 // if (window.insertCssFile) {
 //     window.insertCssFile(window.defaultCssUrl);
 // }

package/src/utils/jump-page-utils.js

@@ -73,6 +73,7 @@ export function initialization(
           if (jumpPageResult && jumpPageResult.visible) {
             const res = { ...jumpPageResult }
             res.jumpPageSetting = JSON.stringify(jumpPageItem.jumpPageSetting)
+            res.jumpPageItem = jumpPageItem
             return res
           }
         }
@@ -228,7 +229,10 @@ export function jumpToPage(
     }
     getSystem(system, jumpPageSetting.jumpPageUrl, jumpPageSetting.isNewPage, jumpPageSetting)
       .then((system) => {
-        if ((jumpPageSetting.jumpPageAdditional && jumpPageSetting.jumpPageAdditional.length > 0) || (jumpPageSetting.jumpPageTitle && jumpPageSetting.jumpPageTitle.indexOf('${')>=0)) {
+        if (
+          (jumpPageSetting.jumpPageAdditional && jumpPageSetting.jumpPageAdditional.length > 0) ||
+          (jumpPageSetting.jumpPageTitle && jumpPageSetting.jumpPageTitle.indexOf('${') >= 0)
+        ) {
           // 发送请求，获取附加参数，并存入缓存
           const paramPath =
             window.$vueApp.config.globalProperties.baseAPI + '/component/super-pages/parsing-additional-parameters'
@@ -242,7 +246,7 @@ export function jumpToPage(
           if (!pageData) {
             pageData = {}
           }
-          if(!additionalParamMap){
+          if (!additionalParamMap) {
             additionalParamMap = {}
           }
           Object.assign(additionalParamMap, pageData)
@@ -593,11 +597,11 @@ function jumpWithSuperPage(jumpPageUrl, system, dataId, jumpPageSetting, ids, bu
       // 移动端时，获得移动端打开方式
       jumpMode = jumpPageSetting.jumpPageMobileOpenMode
     }
-    if(!jumpMode && jumpPageSetting) {
+    if (!jumpMode && jumpPageSetting) {
       // 移动端没有配置则以 打开方式为准
       jumpMode = jumpPageSetting.jumpPageOpenMode
     }
-    if(!jumpMode){
+    if (!jumpMode) {
       // 默认是刷新页面
       jumpMode = 'refresh'
     }

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

@@ -53,6 +53,7 @@ import AppLink from './Link.vue'
 import * as Vue from 'vue'
 import tabJs from '../../../api/tab'
 import { getI18nName } from '../../../utils/menu'
+import { getRelativeBaseUrl, getURLSearchParamObj } from '../../../utils/common-util'
 // import { SidebarItemChild } from './SidebarItemChild.vue'
 export default {
   name: 'SidebarItem',
@@ -171,6 +172,11 @@ export default {
             url = url.substring(0, url.lastIndexOf('&'))
           }
         }
+        const paramObj = getURLSearchParamObj(url)
+        if(paramObj && paramObj._isThird && paramObj._isThird === 'false') {
+          // 表示不是第3方系统，需要替换域名，内网外网部署时需要使用
+          url = getRelativeBaseUrl(url)
+        }
         window.open(url, toPathObj.query._menuName)
       } else {
         // 刷新页签打开菜单

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

@@ -35,6 +35,7 @@
 <script>
 import * as Vue from 'vue'
 import { mapGetters } from 'vuex'
+import { getRelativeBaseUrl, getURLSearchParamObj } from '../../../utils/common-util'
 export default {
   name: 'TabContent',
   data() {
@@ -158,6 +159,11 @@ export default {
       ) {
         path = path.substring(0, path.lastIndexOf('&'))
       }
+      const paramObj = getURLSearchParamObj(path)
+      if(paramObj && paramObj._isThird && paramObj._isThird === 'false') {
+        // 表示不是第3方系统，需要替换域名，内网外网部署时需要使用
+        path = getRelativeBaseUrl(path)
+      }
       return path
     },
     recieveMessage(event) {