agilebuilder-ui 1.1.45 → 1.1.47

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

@@ -1460,6 +1460,17 @@ const apis = {
   },
   getCustomFunc(funcName) {
     window.$PageUtil.getCustomFunc(this.pageContext, funcName)
+  },
+  addRequiredClass(fieldName,listCode, rowIndex, pageNum) {
+    const gridParams = store.get(listCode)
+    if (this.isFormSubTable && this.isSubTableShowPage){
+      rowIndex = rowIndex - 1
+      if(pageNum !== this.currentPage){
+        this.currentPage = pageNum
+        this.changePage(pageNum)
+      }
+    }
+    gridParams.gridData[rowIndex]['validateErrorField'] = fieldName
   }
 }
 export default apis

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

@@ -1,7 +1,7 @@
 <template>
   <div
     v-if="type && type.indexOf('custom:') >= 0 && componentName != ''"
-    :style="row.validateErrorField && row.validateErrorField === column.prop ? 'border:1px solid red' : ''"
+    :class="!this.isFormSubTable && row.validateErrorField && row.validateErrorField === column.prop ?'required_bg':''"
   >
     <component
       :is="componentName"
@@ -26,7 +26,7 @@
       @input="cellEvent('input', $event)"
     />
   </div>
-  <div v-else :style="row.validateErrorField && row.validateErrorField === column.prop ? 'border:1px solid red' : ''">
+  <div v-else :class="!this.isFormSubTable && row.validateErrorField && row.validateErrorField === column.prop ?'required_bg':''">
     <!--必须有@input ,否则无法输入值-->
     <el-date-picker
       v-if="type === 'year' || type === 'month' || type === 'week'"
@@ -713,7 +713,6 @@ export default {
       newValue: null,
       // disabled, // 当前用户是否禁止编辑该字段/ 是否新增行
       componentName: '',
-      validateErrorField: '', // 保存行记录时，验证失败的字段名
       annexUploadFlag: false,
       defaultAction,
       fileMultiple: false, // 文件是否多选
@@ -768,7 +767,8 @@ export default {
       colConfigure, // v10字段配置原信息
       designProperty, // 字段配置
       myCustomParams: {},
-      systemCode
+      systemCode,
+      isFormSubTable: false  // 是否是表单子表
     }
   },
   computed: {},
@@ -816,6 +816,9 @@ export default {
   },
   created() {
     const gridParams = store.get(this.listCode)
+    if (gridParams && gridParams.options && gridParams.options.isFormSubTable) {
+      this.isFormSubTable = gridParams.options.isFormSubTable
+    }
     if (this.controlConfig?.customParams) {
       if (!this.pageContext) {
         this.pageContext = gridParams.options.pageContext
@@ -1111,6 +1114,7 @@ export default {
           val = null
         }
         $emit(this, 'update:value', val)
+        this.clearValidateErrorField()
         isInputVal = true
         // 在callCustomEvent方法中使用了innerValue属性
         this.innerValue = val
@@ -1127,9 +1131,11 @@ export default {
           if (this.innerValue.indexOf(saveAll) < 0) {
             // 不包含“全选”时才走input，全选是在multiselectchange中特殊处理的
             $emit(this, 'update:value', this.innerValue.join(','))
+            this.clearValidateErrorField()
           }
         } else {
           $emit(this, 'update:value', this.innerValue)
+          this.clearValidateErrorField()
         }
         isInputVal = true
       } else if (eventName === 'input' && isInputEventUpdateValue !== undefined && isInputEventUpdateValue === true) {
@@ -1137,6 +1143,7 @@ export default {
         // 在callCustomEvent方法中使用了innerValue属性
         this.innerValue = event
         $emit(this, 'update:value', event)
+       this.clearValidateErrorField()
         isInputVal = true
       } else if (eventName === 'blur' && !this.isSelectControll()) {
         // 为了使输入时流畅，所以在blur时调用input，更改组件的数据
@@ -1193,9 +1200,16 @@ export default {
       }
       // 必须这样调用input事件 ,否则组件无法输入值
       $emit(this, 'update:value', this.innerValue) // 现在的用法
+      this.clearValidateErrorField()
       // 扫描组件时监控值变化
       this.watchScanValueChange(this.innerValue)
     },
+    // 清空单元格必填样式
+    clearValidateErrorField(){
+      if(this.row.validateErrorField){
+        this.row.validateErrorField = undefined
+      }
+    },
     // 是否是输入框
     isInputControl() {
       return this.type === 'input' || this.type === 'textarea'

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

@@ -49,6 +49,8 @@
         :row-index="scope.$index"
         :line-edit="lineEdit"
         :custom-format="customFormat"
+        :class="isValidateError(scope.row,scope.$index)?'required_bg required-corner':''"
+        :style="isValidateError(scope.row,scope.$index)?'display:block;':''"
         @open-page="openPageEvent"
         @refresData="refresData"
         @refresh-list="refreshList"
@@ -60,7 +62,6 @@
     </template>
   </el-table-column>
 </template>
-
 <script>
 import { CirclePlus, ZoomIn as ElIconZoomIn } from '@element-plus/icons-vue'
 import { $emit, $off, $on } from '../../utils/gogocodeTransfer'
@@ -77,6 +78,7 @@ import RichEditorViewer from '../../rich-editor/viewer.vue'
 import GridIcon from './components/grid-icon.vue'
 import NormalColumnContent from './normal-column-content.vue'
 import eventBus from './eventBus'
+// border:1px solid red;padding: 10px; 
 export default {
   components: {
     DynamicInput,
@@ -359,6 +361,11 @@ export default {
     openPageEvent(openPageParams) {
       console.log('normalColumn----openPageEvent----', openPageParams)
       this.$emit('open-page', openPageParams)
+    },
+    isValidateError(row,rowIndex) {
+      // const gridParams = store.get(this.listCode)
+      console.log('row.validateErrorField-----',row)
+      return this.isFormSubTable && row && row['validateErrorField'] && row['validateErrorField'] === this.column.prop
     }
   },
   emits: ['refresData', 'refresPortData', 'refresPortsData', 'refresMainTableFields', 'prohibitToEdit']

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: {},
@@ -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/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,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 }