agilebuilder-ui 1.1.46 → 1.1.48

package/packages/index.js

@@ -1,8 +1,8 @@
 import '../src/utils/insert_css' // 公共样式库
 // 依次导入组件库的各个组件
 import { resizeDirective } from '../src/utils/resize'
-import '../src/utils/iframe-communicator';
-import store from '../src/store';
+import '../src/utils/iframe-communicator'
+import store from '../src/store'
 import Breadcrumb from './breadcrumb'
 import DepartmentTree from './department-tree'
 import Hamburger from './hamburger'
@@ -44,8 +44,9 @@ import FsUploadNew from './fs-upload-new'
 import ScanCodeInputBrowser from './scan-code-input-browser'
 import WorkgroupTreeMobile from './workgroup-tree-mobile'
 import RowForm from './row-form'
-import * as ElementPlusIconsVue from "@element-plus/icons-vue"
-import YxAffix from '../src/components/Affix';
+import * as ElementPlusIconsVue from '@element-plus/icons-vue'
+import YxAffix from '../src/components/Affix'
+import ChatEmbed from './chat-embed'
 // 将所有组件都存储起来,方便后续统一注册
 const components = [
   YxAffix,
@@ -81,11 +82,12 @@ const components = [
   IntervalSelection,
   DepartmentTreeMobile,
   DepartmentUserTreeMobile,
-	SuperIcon,
-	FsUploadNew,
+  SuperIcon,
+  FsUploadNew,
   ScanCodeInputBrowser,
   WorkgroupTreeMobile,
-  RowForm
+  RowForm,
+  ChatEmbed
 ]
 
 // 定义 install 方法，接收 Vue 作为参数。如果使用 use 注册插件，则所有的组件都将被注册
@@ -106,8 +108,8 @@ const install = function (Vue) {
     Vue.component(key, component)
   }
   // store挂载到Vue原型
-  Vue.provide('$agilebuilderUIStore', store);
-  if(Vue.config.globalProperties) Vue.config.globalProperties.$agilebuilderUIStore = store;
+  Vue.provide('$agilebuilderUIStore', store)
+  if (Vue.config.globalProperties) Vue.config.globalProperties.$agilebuilderUIStore = store
 }
 
 //  判断是否是直接引入vue的js文件，即全局引用可自动安装所有组件
@@ -146,16 +148,17 @@ export {
   SecretInfo,
   DepartmentTreeMobile,
   DepartmentUserTreeMobile,
-	SuperIcon,
-	FsUploadNew,
+  SuperIcon,
+  FsUploadNew,
   ScanCodeInputBrowser,
   WorkgroupTreeMobile,
-  RowForm
+  RowForm,
+  ChatEmbed
 }
 
 export default {
   // 导出的对象必须具有 install，才能被 Vue.use() 方法安装
   install,
   store,
-  ...components,
+  ...components
 }

package/packages/json-view/index.ts

@@ -0,0 +1,3 @@
+import JsonView from './json-view.vue'
+import JsonViewDialog from './json-view-dialog.vue'
+export { JsonView, JsonViewDialog }

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

@@ -0,0 +1,53 @@
+<template>
+  <el-dialog
+    append-to-body
+    v-model="showJsonVisible"
+    :append-to-body="appendToBody"
+    :title="title"
+    width="600"
+    @close="close"
+  >
+    <json-view :jsonObject="jsonObject" />
+  </el-dialog>
+</template>
+<script lang="ts" setup>
+import { ref, defineEmits, defineProps, defineOptions, watch } from 'vue'
+defineOptions({
+  name: 'JsonViewDialog',
+  inheritAttrs: false
+})
+import JsonView from './json-view.vue'
+const props = defineProps({
+  jsonObject: {
+    type: Object,
+    default: () => {}
+  },
+  appendToBody: {
+    type: Boolean,
+    default: false
+  },
+  modelValue: {
+    type: Boolean,
+    default: false
+  },
+  title: {
+    type: String,
+    default: 'JSON 预览'
+  }
+})
+const emits = defineEmits(['update:modelValue'])
+const showJsonVisible = ref(false)
+watch(
+  () => props.modelValue,
+  (newVal) => {
+    if (newVal) {
+      showJsonVisible.value = true
+    }
+  }
+)
+const close = () => {
+  showJsonVisible.value = false
+  emits('update:modelValue', false)
+}
+</script>
+<style scoped></style>

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/custom-formatter.js

@@ -1,5 +1,5 @@
 import { $emit } from '../../utils/gogocodeTransfer'
-import { doFormat } from './formatter'
+import { doFormat, formatDateTime } from './formatter'
 import store from './store'
 import { initialization, jumpToPage } from '../../../src/utils/jump-page-utils'
 import { analysisFileSetObj, otherFilesToStandard } from './utils'
@@ -198,9 +198,10 @@ const customFormatter = {
       jumpPageJson = column.formatter.options.format
     }
     if (jumpPageJson && jumpPageJson !== '') {
+      const jumpPageJsonObject = JSON.parse(jumpPageJson)
       // 解析是否需要显示该超链接
       const result = initialization(
-        JSON.parse(jumpPageJson),
+        jumpPageJsonObject,
         row,
         isSql,
         additionalParamerter,
@@ -227,6 +228,18 @@ const customFormatter = {
       hyperLinkResult.label = this.objectPropValueTwo(row, column)
       hyperLinkResult.title = hyperLinkResult.label
     }
+    if (hyperLinkResult.jumpPageItem) {
+      const jumpSetting = hyperLinkResult.jumpPageItem.jumpPageSetting
+      if (jumpSetting && jumpSetting.displayTextFormatType && jumpSetting.displayTextFormat) {
+        const formatValue = formatDateTime(
+          jumpSetting.displayTextFormatType,
+          hyperLinkResult.label,
+          jumpSetting.displayTextFormat
+        )
+        hyperLinkResult.label = formatValue
+        hyperLinkResult.title = formatValue
+      }
+    }
     return hyperLinkResult
   },
   // 点击超链接

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

@@ -1,7 +1,9 @@
 <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 +28,12 @@
       @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'"
@@ -293,6 +300,7 @@
       @delete="deleteFile"
       @delete-success="deleteSuccess"
       @upload-success="uploadOnSuccess"
+      @on-error="onError"
     />
     <multipart-upload
       v-else-if="type === 'multipartUpload'"
@@ -713,7 +721,6 @@ export default {
       newValue: null,
       // disabled, // 当前用户是否禁止编辑该字段/ 是否新增行
       componentName: '',
-      validateErrorField: '', // 保存行记录时，验证失败的字段名
       annexUploadFlag: false,
       defaultAction,
       fileMultiple: false, // 文件是否多选
@@ -768,7 +775,8 @@ export default {
       colConfigure, // v10字段配置原信息
       designProperty, // 字段配置
       myCustomParams: {},
-      systemCode
+      systemCode,
+      isFormSubTable: false // 是否是表单子表
     }
   },
   computed: {},
@@ -816,6 +824,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 +1122,7 @@ export default {
           val = null
         }
         $emit(this, 'update:value', val)
+        this.clearValidateErrorField()
         isInputVal = true
         // 在callCustomEvent方法中使用了innerValue属性
         this.innerValue = val
@@ -1127,9 +1139,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 +1151,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 +1208,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'
@@ -2075,6 +2097,26 @@ export default {
       } else {
         this.departmentInfo = []
       }
+    },
+    onError(error) {
+      console.error('Upload error:', error)
+      if (error.message) {
+        let message = JSON.parse(error.message)
+        if (message && message.message) {
+          message = JSON.parse(message.message)
+        }
+        this.$message({
+          type: 'error',
+          message: message,
+          showClose: true
+        })
+      } else {
+        this.$message({
+          type: 'error',
+          message: this.$t('fsUpload.uploadFailed'),
+          showClose: true
+        })
+      }
     }
   }
 }

package/packages/super-grid/src/formatter.js

@@ -179,7 +179,7 @@ export function doFormatWithValueSet(column, value) {
           label.push(item[0].label)
         }
       })
-      if(label.length > 0){
+      if (label.length > 0) {
         value = label.join(',')
       }
     } else {
@@ -194,3 +194,7 @@ export function doFormatWithValueSet(column, value) {
   }
   return value
 }
+
+export function formatDateTime(type, value, format) {
+  return formatter[type](value, { format: format })
+}

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

@@ -147,7 +147,7 @@
           columnFormatter.options.format &&
           columnFormatter.options.format !== ''
         "
-        :class="isShowForm ? '' : 'cell--span'"
+        :class="textOverflow === 'newline' ? 'wrap-text' : 'ellipsis cell--span'"
       >
         <!--:key="column.prop+'_'+rowIndex+'_'+currentPage" 为了解决子表分页时，新增自动跳转到下一页，第一条记录的自定义控件被复用，导致业务逻辑没执行 -->
         <component
@@ -172,7 +172,7 @@
           :component-id="componentId"
           :additional-settings="additionalSettings"
           :page-context="options?.pageContext"
-          :custom-params="controlConfig ? controlConfig.customParams : null"
+          :custom-params="getCustomParams()"
           @prohibitToEdit="prohibitToEdit"
           @refresh-list="refreshList"
       /></span>
@@ -221,12 +221,7 @@
             @click="clickHyperLink(column, row, listCode, rowIndex)"
         > -->
         <el-link
-          v-else-if="
-            columnFormatter !== undefined &&
-            columnFormatter.type !== undefined &&
-            columnFormatter.type === 'hyperlinks' &&
-            getMyHyperLinkSetting(row, rowIndex).visible === true
-          "
+          v-else-if="columnFormatter?.type === 'hyperlinks' && linkObject.visible === true"
           :type="getLinkType(row)"
           @click="clickHyperLink(column, row, listCode, rowIndex)"
         >
@@ -234,20 +229,14 @@
             v-if="isShowOverflowTooltip"
             :id="column.prop + 'DomData' + rowIndex"
             :style="textOverflow === 'newline' ? {} : { width: cellWidth + 'px' }"
-            :title="getMyHyperLinkSetting(row, rowIndex).title"
+            :title="linkObject.title"
             :class="textOverflow === 'newline' ? 'wrap-text' : 'ellipsis cell--span'"
-            >{{ getMyHyperLinkSetting(row, rowIndex).label }}
-            <SuperIcon
-              v-if="getMyHyperLinkSetting(row, rowIndex).icon"
-              :iconValue="getMyHyperLinkSetting(row, rowIndex).icon"
-            ></SuperIcon>
+            >{{ linkObject.label }}
+            <SuperIcon v-if="linkObject.icon" :iconValue="linkObject.icon"></SuperIcon>
           </span>
           <span v-else :id="column.prop + 'DomData' + rowIndex" :class="isShowForm ? '' : 'cell--span'"
-            >{{ getMyHyperLinkSetting(row, rowIndex).label }}
-            <SuperIcon
-              v-if="getMyHyperLinkSetting(row, rowIndex).icon"
-              :iconValue="getMyHyperLinkSetting(row, rowIndex).icon"
-            ></SuperIcon>
+            >{{ linkObject.label }}
+            <SuperIcon v-if="linkObject.icon" :iconValue="linkObject.icon"></SuperIcon>
           </span>
         </el-link>
         <span
@@ -307,12 +296,7 @@
         </span>
         <!-- 超链接 -->
         <el-link
-          v-else-if="
-            columnFormatter !== undefined &&
-            columnFormatter.type !== undefined &&
-            columnFormatter.type === 'hyperlinks' &&
-            getMyHyperLinkSetting(row, rowIndex).visible === true
-          "
+          v-else-if="columnFormatter?.type === 'hyperlinks' && linkObject.visible"
           type="primary"
           @click="clickHyperLink(column, row, listCode, rowIndex)"
         >
@@ -320,20 +304,14 @@
             v-if="isShowOverflowTooltip"
             :id="column.prop + 'DomData' + rowIndex"
             :style="textOverflow === 'newline' ? {} : { width: cellWidth + 'px' }"
-            :title="$escapeHtml(getMyHyperLinkSetting(row, rowIndex).title)"
+            :title="$escapeHtml(linkObject.title)"
             :class="textOverflow === 'newline' ? 'wrap-text' : 'ellipsis cell--span'"
-            >{{ $escapeHtml(getMyHyperLinkSetting(row, rowIndex).label) }}
-            <SuperIcon
-              v-if="getMyHyperLinkSetting(row, rowIndex).icon"
-              :iconValue="getMyHyperLinkSetting(row, rowIndex).icon"
-            ></SuperIcon>
+            >{{ $escapeHtml(linkObject.label) }}
+            <SuperIcon v-if="linkObject.icon" :iconValue="linkObject.icon"></SuperIcon>
           </span>
           <span v-else :id="column.prop + 'DomData' + rowIndex" :class="isShowForm ? '' : 'cell--span'"
-            >{{ $escapeHtml(getMyHyperLinkSetting(row, rowIndex).label) }}
-            <SuperIcon
-              v-if="getMyHyperLinkSetting(row, rowIndex).icon"
-              :iconValue="getMyHyperLinkSetting(row, rowIndex).icon"
-            ></SuperIcon>
+            >{{ $escapeHtml(linkObject.label) }}
+            <SuperIcon v-if="linkObject.icon" :iconValue="linkObject.icon"></SuperIcon>
           </span>
         </el-link>
         <!-- 富文本 -->
@@ -554,7 +532,8 @@ export default {
       requiredClass: '',
       lineEdit,
       options,
-      textOverflow
+      textOverflow,
+      linkObject: {}
     }
   },
   computed: {
@@ -707,6 +686,9 @@ export default {
     }
     this.setScanRuleSets()
     this.requiredClass = this.isRequired(this.row.$editing) ? 'm-requried column-text-main' : ''
+    if (this.columnFormatter?.type === 'hyperlinks') {
+      this.linkObject = this.getMyHyperLinkSetting(this.row, this.rowIndex)
+    }
   },
   mounted() {
     if (this.controlConfig) {
@@ -1280,6 +1262,16 @@ export default {
         }
       }
       return true
+    },
+    getCustomParams() {
+      if (this.column.formatter.type === 'customControl') {
+        if (this.column.formatter?.options?.controlConfig) {
+          const controlConfig = JSON.parse(this.column.formatter.options.controlConfig)
+          if (controlConfig && controlConfig.customParams) {
+            return formatCustomParams(controlConfig.customParams, this.options?.pageContext, this.row)
+          }
+        }
+      }
     }
   },
   emits: ['refresData', 'refresPortData', 'refresPortsData', 'refresMainTableFields', 'prohibitToEdit']

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