agilebuilder-ui 1.1.46 → 1.1.48

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

@@ -226,7 +226,7 @@ import { checkPermission } from '../../../src/utils/permission'
 import { getGuId } from '../../../src/utils/guid.js'
 // import resizeMixin from '../../../src/mixins/resizeMixin.js';
 import storeVuex from '../../../src/store'
-
+import { setPageDataToChatAiStore, setPageInfoToChatStore } from '../../../src/utils/chat-ai-util.ts'
 export default {
   components: {
     IndexColumn,
@@ -924,6 +924,16 @@ export default {
           deep: true
         }
       )
+      if (!this.isFormSubTable) {
+        setPageInfoToChatStore(this.pageContext.menuCode, {
+          listRefs: [
+            {
+              ref: this
+            }
+          ],
+          pageType: 'list'
+        })
+      }
     })
   },
   beforeDestroy() {
@@ -1649,16 +1659,16 @@ export default {
       }
       return isCanRefreshTableData
     },
-    getSubTableGridData(subTableData) {
+    getSubTableGridData(subTableData, currentPage) {
       let gridData = subTableData
       if (this.isSubTableShowPage === true) {
         if (subTableData && subTableData.length > 0) {
           // const subTableData = JSON.parse(JSON.stringify(this.subTableData))
           this.pagination.total = subTableData.length
           // 当前是第几页
-          let currentPage = this.currentPage
-          if (currentPage === undefined || currentPage === null) {
-            currentPage = 1
+          let newCurrentPage = currentPage!== undefined && currentPage !== null ?currentPage: this.currentPage
+          if (newCurrentPage === undefined || newCurrentPage === null) {
+            newCurrentPage = 1
           }
           // 每页显示多少条记录
           let pageSize = this.pageSize
@@ -1669,7 +1679,7 @@ export default {
             pageSize = 20
           }
           // 当前页的第一条记录的数组下标
-          const startRowIndex = (currentPage - 1) * pageSize
+          const startRowIndex = (newCurrentPage - 1) * pageSize
           // 当前页的最后一条记录的数组下标
           let lastRowIndex = startRowIndex + pageSize
           if (subTableData.length > startRowIndex) {
@@ -2380,13 +2390,13 @@ export default {
         this.changePage()
       }
     },
-    changePage() {
+    changePage(currentPage) {
       console.log('点击了分页')
       // 翻页操作会导致筛选项发生变化，所以需要清空已有的
       this.$refs.superGrid?.clearFilter()
       // TODO: 把当前页数、每页条数、查询条件、排序信息传回后台
       if (this.isSubTableShowPage) {
-        this.gridData = this.getSubTableGridData(this.subTableData)
+        this.gridData = this.getSubTableGridData(this.subTableData, currentPage)
         const gridParams = store.get(this.code)
         gridParams.gridData = this.gridData
         // 完成深拷贝，复制一份对象，行编辑时使用
@@ -3222,6 +3232,9 @@ export default {
         //   this.$refs.superGrid?.toggleRowSelection(newSelection[newSelection.length - 1], false)
         // }
       }
+      if (!this.isFormSubTable) {
+        setPageDataToChatAiStore(newSelection)
+      }
       this.selectionChange(newSelection)
     },
     // 显示移动端查询区域

package/src/i18n/langs/cn.js

@@ -84,7 +84,7 @@ const cn = {
     uploadFileTip: '上传的文件不超过{fileSize}M',
     asyncExportJumpMsg: '或点击我跳转到下载页面',
     mustFill: '{label} 必须填写',
-    filePathNotFound: '文件UUID未找到，请检查配置',
+    filePathNotFound: '文件UUID未找到，请检查配置'
   },
   // 列表组件
   superGrid: {
@@ -136,7 +136,7 @@ const cn = {
     prevRow: '上一行',
     nextRow: '下一行',
     detail: '详情',
-    searchEmpty:'查询空值'
+    searchEmpty: '查询空值'
   },
   // 部门树组件
   departmentTree: {},
@@ -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

@@ -136,7 +136,7 @@ const en = {
     prevRow: 'Prev Row',
     nextRow: 'Next Row',
     detail: 'Detail',
-    searchEmpty:'Search Empty'
+    searchEmpty: 'Search Empty'
   },
   departmentTree: {},
   departmentTreeInline: {
@@ -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,23 @@ 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;
 }

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 }

package/src/utils/common-util.js

@@ -231,8 +231,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 +251,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路径

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'
     }