agilebuilder-ui 1.1.43 → 1.1.45-ai1

package/packages/json-view/json-view.vue

@@ -0,0 +1,126 @@
+<template>
+  <div
+    :style="{
+      width: '100%'
+    }"
+    ref="cfCodemirrorJsonViewRef"
+    id="cf-codemirror-view-json"
+  ></div>
+</template>
+<script lang="ts" setup>
+import { ref, defineProps, defineOptions, watch, nextTick, onMounted } from 'vue'
+defineOptions({
+  name: 'JsonView',
+  inheritAttrs: false
+})
+import { basicSetup, EditorView } from 'codemirror'
+import { jsonLanguage } from '@codemirror/lang-json'
+import { EditorState, Facet } from '@codemirror/state'
+
+const props = defineProps({
+  jsonObject: {
+    type: Object,
+    default: () => {}
+  },
+  height: {
+    type: Number,
+    default: 0
+  },
+  theme: {
+    type: String,
+    default: null
+  }
+})
+const editor = ref<any>(null)
+const cfCodemirrorJsonViewRef = ref()
+const codemirrorHeight = ref('400px')
+watch(
+  () => props.jsonObject,
+  (newVal) => {
+    if (editor.value) {
+      // 更新 CodeMirror 中的值
+      loadEditor()
+    }
+  },
+  { deep: true }
+)
+onMounted(() => {
+  nextTick(() => {
+    loadEditor()
+  })
+})
+
+function loadEditor() {
+  if (editor.value) {
+    editor.value.destroy()
+  }
+  const jsonStr = props.jsonObject ? JSON.stringify(props.jsonObject, null, 2) : ''
+  if (props.height) {
+    codemirrorHeight.value = props.height + 'px'
+  } else {
+    if (cfCodemirrorJsonViewRef.value) {
+      const rect = cfCodemirrorJsonViewRef.value.getBoundingClientRect()
+      if (rect.y || rect.y === 0) {
+        console.log('window.innerHeight - rect.y', window.innerHeight, rect.y)
+        codemirrorHeight.value = window.innerHeight - rect.y - 100 + 'px'
+      }
+    }
+  }
+  const state = getEditorState(jsonStr)
+  let element: Element | null = document.getElementById('cf-codemirror-view-json')
+  if (element) {
+    editor.value = new EditorView({
+      state,
+      parent: element
+    })
+  }
+}
+// 获取编辑器状态
+function getEditorState(jsonStr: string) {
+  // 获取主题
+  const mytheme = getTheme()
+  // 基本主题样式，主要设置字体大小和高度
+  const baseTheme = EditorView.theme({
+    '.cm-content, .cm-gutter': { minHeight: codemirrorHeight.value },
+    '&': {
+      height: codemirrorHeight.value,
+      maxHeight: codemirrorHeight.value,
+      fontSize: '12px'
+    }
+  })
+  return EditorState.create({
+    doc: jsonStr,
+    extensions: [
+      EditorState.tabSize.of(16),
+      basicSetup,
+      jsonLanguage,
+      mytheme,
+      baseTheme,
+      readOnlyFacet.of(true),
+      preventChanges
+    ]
+  })
+}
+
+// 创建一个新的 Facet
+const readOnlyFacet = Facet.define<boolean, boolean>({ combine: (values) => values.some((a) => a) })
+
+// 创建一个新的 StateField 来监听更改
+const preventChanges = EditorState.transactionFilter.of((tr: any) => {
+  if (tr.isUserEvent && tr.docChanged && tr.state.facet(readOnlyFacet)) {
+    return {
+      changes: {
+        from: tr.changes.from,
+        to: tr.changes.to,
+        insert: tr.startState.doc.sliceString(tr.changes.from, tr.changes.to)
+      }
+    }
+  }
+  return tr
+})
+
+function getTheme() {
+  return EditorView.theme({})
+}
+</script>
+<style scoped></style>

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,
@@ -460,7 +460,7 @@ export default {
     // 限制高度最低值
     hasMaxHeight() {
       if (this.maxHeight) {
-        return this.maxHeight <= 100 ? 100 : this.maxHeight + this.heightOffset
+        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
+        return this.tableHeight <= 100 ? 100 : this.tableHeight + (this.heightOffset!==0?this.heightOffset:30)
       }
       return undefined
     },
@@ -523,6 +523,8 @@ export default {
               // 表示不显示“序号”列
               return false
             }
+            // 存储有默认值的字段集合
+            this.storeHasDefaultValueColumns(column, gridParams)
             let isVisible
             if (column.show === undefined || column.show) {
               isVisible = true
@@ -547,8 +549,6 @@ export default {
             } else {
               isVisible = false
             }
-            // 存储有默认值的字段集合
-            this.storeHasDefaultValueColumns(column, gridParams)
             return isVisible
           })
         )
@@ -924,6 +924,16 @@ export default {
           deep: true
         }
       )
+      if (!this.isFormSubTable) {
+        setPageInfoToChatStore(this.pageContext.menuCode, {
+          listRefs: [
+            {
+              ref: this
+            }
+          ],
+          pageType: 'list'
+        })
+      }
     })
   },
   beforeDestroy() {
@@ -1288,7 +1298,11 @@ export default {
         if (gridParams.defaultValueColumns === undefined || gridParams.defaultValueColumns === null) {
           gridParams.defaultValueColumns = []
         }
-        gridParams.defaultValueColumns.push(column)
+        // 放到defaultValueColumns前要根据column.prop判断是否已经存在
+        const hasColumn = gridParams.defaultValueColumns.find((item) => item.prop === column.prop)
+        if (!hasColumn) {
+          gridParams.defaultValueColumns.push(column)
+        }
       }
     },
     // 判断是不是表单子表的使用
@@ -3218,6 +3232,9 @@ export default {
         //   this.$refs.superGrid?.toggleRowSelection(newSelection[newSelection.length - 1], false)
         // }
       }
+      if (!this.isFormSubTable) {
+        setPageDataToChatAiStore(newSelection)
+      }
       this.selectionChange(newSelection)
     },
     // 显示移动端查询区域
@@ -3402,11 +3419,17 @@ export default {
       this.$refs.superGrid.setCurrentRow(this.tableDatas[rowIndex])
     },
     getSuperGridRef() {
+      return this
+    },
+    getSuperGridTableRef() {
       return this.$refs.superGrid
     },
     getColumns() {
       return this.columns
     },
+    getTableData() {
+      return this.tableDatas
+    },
     handRowKeyToUpperCase(row) {
       // 把row对象的所有key都转成大写
       if (row) {

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: {},
@@ -299,6 +299,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: {
@@ -298,6 +298,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

@@ -227,6 +227,23 @@ body .el-table colgroup.gutter {
   flex-direction: column
 }
 
+.amb-chart-container {
+  display: flex;
+  flex-direction: column;
+  height: 100%;
+}
+
+.amb-chart-header {
+  flex-shrink: 0;
+}
+
+.amb-chart-content {
+  /* 图表区域占据剩余空间 */
+  flex: 1;
+  /* 允许内容缩小 */
+  min-height: 0;
+}
+
 .amb-widget-chart-header {
   border-bottom: 1px solid var(--el-card-border-color);
   padding: 6px 10px;

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

@@ -1,6 +1,5 @@
 import * as Vue from 'vue'
-import authApi from './auth-api'
-import { getToken, getLanguage, getAllLanguages, setAllLanguages, removeToken } from './auth'
+import { getToken, getLanguage, getAllLanguages, setAllLanguages } from './auth'
 import { v4 as uuidv4 } from 'uuid'
 import { getCookieCache } from './auth'
 import i18nUtil from './i18n-util'
@@ -231,7 +230,11 @@ export function isPlateSys(systemCode) {
 
 export function getServerConfigUtil(http) {
   return new Promise((resolve, reject) => {
-    http.get('./server-config.json').then((result) => {
+    let timestamp = '1'
+    if(__BUILD_TIME__) {
+      timestamp = __BUILD_TIME__
+    }
+    http.get('./server-config.json?t='+timestamp).then((result) => {
       const config = result
       for (const key in config) {
         window.$vueApp.config.globalProperties[key] = config[key]
@@ -245,10 +248,10 @@ 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`)
+        window.insertCssFile(`${config.fontIconAddress}/iconfont.css?t=${timestamp}`)
       }
       if (config.fontIconAddress && window.insertCssFile) {
-        window.insertCssFile(`${config.fontIconAddress}-color/iconfont.css`)
+        window.insertCssFile(`${config.fontIconAddress}-color/iconfont.css?t=${timestamp}`)
       }
       resolve()
     })
@@ -557,27 +560,49 @@ async function handlePlateSysLang(currentLanguage) {
     }
   }
 }
+// 缓存项目设值信息
+export function cacheProjectSetting() {
+  return new Promise((resolve,reject)=>{
+    const projectSettingCache = localStorage.getItem('PROJECT_SETTINGS')
+    let projectSettings = null
+    if(projectSettingCache && projectSettingCache === '_EMPTY_VALUE') {
+       resolve(projectSettings)
+    } else if (projectSettingCache) {
+      projectSettings = JSON.parse(projectSettingCache)
+      setBrowserFavicon(projectSettings)
+      resolve(projectSettings)
+    } else {
+      window.$vueApp.config.globalProperties.$http.get(window.$vueApp.config.globalProperties.baseAPI + '/cfg/project-settings').then((data) => {
+        if(data){
+          localStorage.setItem('PROJECT_SETTINGS', JSON.stringify(data))
+          projectSettings = data
+          setBrowserFavicon(projectSettings)
+        } else {
+          localStorage.setItem('PROJECT_SETTINGS', '_EMPTY_VALUE')
+        }
+        resolve(projectSettings)
+      }).catch((error)=>{
+        reject(error)
+      })
+    }
+  })
+}
 
-// export function setProjectSetting() {
-//   const projectSettingCache = Cookies.get('PROJECT_SETTINGS')
-//   let projectSettings = null
-//   if (projectSettingCache) {
-//     projectSettings = JSON.parse(projectSettingCache)
-//    // TODO:工具方法中没有this，这个代码会报错，先注释该方法，没找到调用它的地方
-//     this.setLogoUrl(projectSettings)
-//   } else {
-//     window.$vueApp.config.globalProperties.$http.get(window.$vueApp.config.globalProperties.baseAPI + '/cfg/project-settings').then((data) => {
-//       Cookies.set('PROJECT_SETTINGS', JSON.stringify(data))
-//       projectSettings = data
-//     })
-//   }
-//   if (projectSettings.browserImageUuid) {
-//     const linkElement = document.getElementById('ambBrowserIcon')
-//     if (linkElement) {
-//       linkElement.href = window.$vueApp.config.globalProperties.baseAPI + '/cfg/project/icon/browserIcon'
-//     }
-//   }
-// }
+function setBrowserFavicon(projectSettings){
+  const linkElement = document.getElementById('ambBrowserIcon')
+  if(!linkElement){
+    return
+  }
+  if (projectSettings) {
+    const browserIconUrl = window.$vueApp.config.globalProperties.baseAPI + '/cfg/project/icon/browserIcon?t='+__BUILD_TIME__
+    if(projectSettings.browserImageUuid && (!linkElement.href || linkElement.href !== browserIconUrl) ){
+      linkElement.href = browserIconUrl
+    }
+  }
+  if(!linkElement.href) {
+    linkElement.href = 'favicon.svg?t='+__BUILD_TIME__
+  }
+}
 
 // 动态加载css
 export function loadCSS() {

package/src/utils/util.js

@@ -259,15 +259,30 @@ function parseCondition(
         // 再获取属于那张表
         const propDbNameArr = propDbName.split('_+_')
         propDbName = propDbNameArr[1]
-        leftValue = getValue(parentFormData, propDbName, isSql)
+         if (pageContext && propDbName && propDbName.indexOf('${')>=0) {
+          leftValue = getPropValueNew(propDbName, pageContext, entity)
+        } else {
+          leftValue = getValue(parentFormData, propDbName, isSql)
+        }
+        // leftValue = getValue(parentFormData, propDbName, isSql)
       } else {
-        leftValue = getValue(entity, propDbName, isSql)
+         if (pageContext && propDbName  && propDbName.indexOf('${')>=0) {
+          leftValue = getPropValueNew(propDbName, pageContext, entity)
+        } else {
+          leftValue = getValue(entity, propDbName, isSql)
+        }
+        // leftValue = getValue(entity, propDbName, isSql)
       }
       if (leftValue === undefined || leftValue === null) {
         if (tableName && propDbName.toLowerCase().startsWith(tableName.toLowerCase() + '.')) {
           // 表示是当前表的字段
           const myProp = propDbName.substring(propDbName.indexOf('.'))
-          leftValue = getValue(entity, myProp, isSql)
+         if (pageContext && myProp  && myProp.indexOf('${')>=0) {
+            leftValue = getPropValueNew(myProp, pageContext, entity)
+          } else {
+            leftValue = getValue(entity, myProp, isSql)
+          }
+          // leftValue = getValue(entity, myProp, isSql)
         }
       }
     } else {
@@ -275,12 +290,27 @@ function parseCondition(
         propName = propName.replace('parent_+_', '')
         const propNameArr = propName.split('_+_')
         propName = propNameArr[1]
-        leftValue = getValue(parentFormData, propName, isSql)
+         if (pageContext && propName && propName.indexOf('${')>=0) {
+          leftValue = getPropValueNew(propName, pageContext, entity)
+        } else {
+          leftValue =getValue(parentFormData, propName, isSql)
+        }
+        // leftValue = getValue(parentFormData, propName, isSql)
       } else {
-        leftValue = getValue(entity, propName, isSql)
+         if (pageContext && propName && propName.indexOf('${')>=0) {
+          leftValue = getPropValueNew(propName, pageContext, entity)
+        } else {
+          leftValue = getValue(entity, propName, isSql)
+        }
+        // leftValue = getValue(entity, propName, isSql)
       }
       if (propDbName && (leftValue === undefined || leftValue === null)) {
-        leftValue = getValue(entity, propDbName, isSql)
+         if (pageContext && propDbName && propDbName.indexOf('${')>=0) {
+          leftValue = getPropValueNew(propDbName, pageContext, entity)
+        } else {
+          leftValue = getValue(entity, propDbName, isSql)
+        }
+        // leftValue = getValue(entity, propDbName, isSql)
       }
     }
     const operator = condition.operator
@@ -291,7 +321,7 @@ function parseCondition(
     // 判断value类型
     let value
     if (pageContext) {
-      value = getPropValueNew(propValue, pageContext)
+      value = getPropValueNew(propValue, pageContext, entity)
     } else {
       value = getPropValue(propValue, entity, additionalParamMap, contextParameterMap)
     }

package/src/views/layout/components/Menubar/Item.vue

@@ -83,7 +83,7 @@ export default defineComponent({
       } else {
         // 有子菜单时
         vnodes.push(
-          h('div', { class: ['smb-sidebar-menu-item-title'] }, [
+          h('div', { class: titleClass }, [
             h(
               'div',
               {