agilebuilder-ui 1.1.50-rc1 → 1.1.50-rc2

package/packages/super-grid/src/search-form-item.vue

@@ -157,7 +157,7 @@
     >
       <dynamic-source-select
         v-model:value="searchForm[column.prop]"
-        :allow-create="true"
+        :allow-create="dataSourceOptions?.controlConfig?.allowCreate"
         :base-props="{
           multiple: column.componentType === 'multiselect' ? true : false
         }"
@@ -166,7 +166,7 @@
         :is-join-table="isJoinTable"
         :list-code="code"
         :list-toolbar-form-data="listToolbarFormData"
-        :options="getDynamicDataSourceOptions(column)"
+        :options="dataSourceOptions"
         :table-name="tableName"
         @change="multiselectChange"
       />
@@ -289,7 +289,8 @@ export default {
       moduleConfig: {},
       dateVal: this.getFormItemValue(this.column.prop),
       controlConfig: getControlConfig(this.column),
-      isShowEmtptyFlag: false
+      isShowEmtptyFlag: false,
+      dataSourceOptions: {}
       // checkedEmpty: false,
     }
   },
@@ -323,6 +324,14 @@ export default {
     if (this.column.valueSetOptions) {
       this.moduleConfig = JSON.parse(this.column.valueSetOptions)
     }
+    const componentType = this.column.componentType
+    if (
+      componentType &&
+      (componentType === 'multiselect' || componentType === 'select') &&
+      this.isDynamicDataSourceSource(this.column)
+    ) {
+      this.dataSourceOptions = this.getDynamicDataSourceOptions(this.column)
+    }
     console.log('searchitem页面', this.column)
   },
   mounted() {
@@ -346,12 +355,7 @@ export default {
       return isDynamicDataSourceSource(column)
     },
     setValueToModelProp(prop, value, componentName, index) {
-      console.log('setValueToModelProp',
-        prop,
-        value,
-        componentName,
-        index
-      )
+      console.log('setValueToModelProp', prop, value, componentName, index)
       if (prop && prop.indexOf('.') > 0) {
         const parentOjbect = this.getParentObject(prop)
         // 嵌套属性中的最后一个属性是属于这个中间父对象的，所有要通过中间父对象来赋值
@@ -497,10 +501,10 @@ export default {
           return ['00:00:00']
         }
       } else {
-        const now = new Date();
-        const year = now.getFullYear(); // e.g., 2023
-        const month = now.getMonth() + 1; // Months are 0-indexed, so add 1
-        const day = now.getDate(); // Day of the month        
+        const now = new Date()
+        const year = now.getFullYear() // e.g., 2023
+        const month = now.getMonth() + 1 // Months are 0-indexed, so add 1
+        const day = now.getDate() // Day of the month
         return [`${year}-${month}-${day} 00:00:00`, `${year}-${month}-${day} 23:59:59`]
       }
     },

package/packages/super-grid/src/search-methods.js

@@ -7,140 +7,7 @@ const searchMethods = {
       this.searchType === undefined ||
       this.searchType === ''
     ) {
-      const searchParams = []
-      this.searchableColumns.forEach((column) => {
-        const param = { leftBracket: '', rightBracket: '', joinSign: 'and' }
-        // 布尔型字段时prop中去掉了is字符，查询时返回带有is的属性字段，
-        // 否则会导致查询布尔型报500错误
-        let orgProp = column.orgProp
-        // sql查询时，会把点“.”改为两个下划线"__"
-        const replaceDot = '__'
-        if (orgProp && orgProp.indexOf(replaceDot) > 0) {
-          // 表示包括点“.”，需要把两个下划线"__"重新改为点“.”,否则会导致查询报500错误
-          orgProp = orgProp.replace(replaceDot, '.')
-        }
-        param.propName = orgProp
-        param.enumName = column.enumName
-        param.operator = this.getOperator(column)
-        param.dataType = column.dataType
-        param.matchingType = column.queryMatching
-        param.formatter = column.formatter ? JSON.parse(JSON.stringify(column.formatter)) : column.formatter
-        param.isEmptyValue = column._emptyValue && column._emptyValue === '#blank#' ? true : false
-        const values = this.getFormItemValue(column.prop)
-        if (column.dataType === 'DATE' || column.dataType === 'TIME') {
-          // 日期 或 时间类型
-          // console.log('values==', values, column.prop)
-          if (values && values.length === 2 && values[0] !== null && values[1] !== null) {
-            const format = this.getDateTimeSearchFormatter(column, column.dataType, column.formatter)
-            if (format) {
-              if (!param.formatter) {
-                param.formatter = {}
-                param.formatter.options = {}
-              } else if (!param.formatter.options) {
-                param.formatter.options = {}
-              }
-              param.formatter.options.format = format
-            }
-            param.startValue = this.getDateTimeMillsByDateStr(values[0], format)
-            param.endValue = this.getDateTimeMillsByDateStr(values[1], format)
-            searchParams.push(param)
-          }
-        } else if (
-          (column.dataType === 'INTEGER' || column.dataType === 'LONG' || column.dataType === 'DOUBLE') &&
-          Array.isArray(values)
-        ) {
-          // 日期 或 时间类型
-          // const values1 = this.getFormItemValue(column.prop)
-          if (values) {
-            if (column.componentType === 'yearRange') {
-              if (values[0] || values[1]) {
-                param.startValue = values[0]
-                param.endValue = values[1]
-                if (values[0] && !values[1]) {
-                  param.startValue = values[0]
-                  param.endValue = 9999
-                } else if (!values[0] && values[1]) {
-                  param.startValue = 0
-                  param.endValue = values[1]
-                }
-                searchParams.push(param)
-              }
-            } else {
-              if (!Array.isArray(values) || values.length < 2 || (values[0] === null && values[1] === null)) {
-                // 填写了一个有效值
-                if (!Array.isArray(values)) {
-                  param.propValue = values
-                  searchParams.push(param)
-                } else if (values.length < 2) {
-                  param.propValue = values[0]
-                  searchParams.push(param)
-                } else if (values[0] === null) {
-                  param.propValue = values[1]
-                  searchParams.push(param)
-                } else if (values[1] === null) {
-                  param.propValue = values[0]
-                  searchParams.push(param)
-                }
-              } else {
-                // 填写了两个有效值
-
-                param.startValue = values[0]
-                param.endValue = values[1]
-                searchParams.push(param)
-              }
-            }
-          }
-        } else if (
-          column.componentType &&
-          column.componentType.indexOf('Tree') !== -1 &&
-          column.componentType.indexOf('single') === -1
-        ) {
-          // 说明是多选组织树
-          // 是否是人员树
-          const isUser = this.isUserTree(column.componentType)
-          const values = this.getFormItemValue(column.prop)
-          if (values && values !== '') {
-            const newValue = []
-            let valueArr = values
-            if (Array.isArray(values)) {
-              // 表示是数组
-              valueArr = values
-            } else {
-              // 表示是字符串
-              valueArr = values.split(',')
-            }
-            if (Array.isArray(valueArr) && valueArr && valueArr.length > 0) {
-              valueArr.forEach((val) => {
-                // 截取用户名中的英文名信息
-                const userName = this.getUserName(isUser, val)
-                if (userName !== undefined && userName !== null) {
-                  newValue.push(userName)
-                }
-              })
-            }
-            this.packageValueWithArray(newValue, searchParams, param)
-          }
-        } else if (column.componentType && column.componentType.indexOf('Tree') !== -1) {
-          // 说明是单选组织树
-          // 是否是人员树
-          const isUser = this.isUserTree(column.componentType)
-          let propValue = this.getFormItemValue(column.prop)
-          // 截取用户名中的英文名信息
-          propValue = this.getUserName(isUser, propValue)
-          this.packageValueWithArray(propValue, searchParams, param)
-        } else {
-          if (column.componentType === 'multiselect') {
-            // 表示是多选下拉框选择器选择的值
-            const values = this.getFormItemValue(column.prop)
-            // console.log('values==', values, column.prop)
-            this.packageValueWithArray(values, searchParams, param)
-          } else {
-            const propValue = this.getFormItemValue(column.prop)
-            this.packageValueWithArray(propValue, searchParams, param)
-          }
-        }
-      })
-      return searchParams
+      return this.packageSearchParamNormalType(this.searchableColumns)
     } else {
       const newSearchFormList = []
       this.searchFormList.forEach((param) => {
@@ -305,7 +172,7 @@ const searchMethods = {
     }
     return val
   },
-  getOperator(column) {
+  getOperator(column, searchForm) {
     if (
       (column.dataType === 'TEXT' || column.dataType === 'CLOB') &&
       column.fuzzy &&
@@ -318,7 +185,7 @@ const searchMethods = {
     ) {
       // 是否是文本类型的字段，且启用了模糊查询，则表示操作符为contains模糊查询
       return 'CONTAIN'
-    } else if (Array.isArray(this.getFormItemValue(column.prop))) {
+    } else if (Array.isArray(this.getFormItemValue(column.prop, null, searchForm))) {
       if (column.dataType === 'INTEGER' || column.dataType === 'LONG' || column.dataType === 'DOUBLE') {
         return 'BETWEEN'
       } else {
@@ -329,7 +196,10 @@ const searchMethods = {
       return 'EQ'
     }
   },
-  getFormItemValue(prop, index) {
+  getFormItemValue(prop, index, searchForm) {
+    if(!searchForm){
+      searchForm = this.searchForm
+    }
     if (prop.indexOf('.') > 0) {
       const parentOjbect = this.getParentObject(prop)
       if (index != null && index !== undefined) {
@@ -339,9 +209,9 @@ const searchMethods = {
       }
     } else {
       if (index != null && index !== undefined) {
-        return this.searchForm[prop][index]
+        return searchForm[prop][index]
       } else {
-        return this.searchForm[prop]
+        return searchForm[prop]
       }
     }
   },
@@ -508,6 +378,145 @@ const searchMethods = {
       return queryRangeFormat
     }
     return queryRange
+  },
+  packageSearchParamNormalType(searchableColumns, searchForm) {
+    const searchParams = []
+    if(!searchableColumns){
+      return searchParams
+    }
+    searchableColumns.forEach((column) => {
+      const param = { leftBracket: '', rightBracket: '', joinSign: 'and' }
+      // 布尔型字段时prop中去掉了is字符，查询时返回带有is的属性字段，
+      // 否则会导致查询布尔型报500错误
+      let orgProp = column.orgProp
+      // sql查询时，会把点“.”改为两个下划线"__"
+      const replaceDot = '__'
+      if (orgProp && orgProp.indexOf(replaceDot) > 0) {
+        // 表示包括点“.”，需要把两个下划线"__"重新改为点“.”,否则会导致查询报500错误
+        orgProp = orgProp.replace(replaceDot, '.')
+      }
+      param.propName = orgProp
+      param.enumName = column.enumName
+      param.operator = this.getOperator(column, searchForm)
+      param.dataType = column.dataType
+      param.matchingType = column.queryMatching
+      param.formatter = column.formatter ? JSON.parse(JSON.stringify(column.formatter)) : column.formatter
+      param.isEmptyValue = column._emptyValue && column._emptyValue === '#blank#' ? true : false
+      const values = this.getFormItemValue(column.prop, null, searchForm)
+      if (column.dataType === 'DATE' || column.dataType === 'TIME') {
+        // 日期 或 时间类型
+        // console.log('values==', values, column.prop)
+        if (values && values.length === 2 && values[0] !== null && values[1] !== null) {
+          const format = this.getDateTimeSearchFormatter(column, column.dataType, column.formatter)
+          if (format) {
+            if (!param.formatter) {
+              param.formatter = {}
+              param.formatter.options = {}
+            } else if (!param.formatter.options) {
+              param.formatter.options = {}
+            }
+            param.formatter.options.format = format
+          }
+          param.startValue = this.getDateTimeMillsByDateStr(values[0], format)
+          param.endValue = this.getDateTimeMillsByDateStr(values[1], format)
+          searchParams.push(param)
+        }
+      } else if (
+        (column.dataType === 'INTEGER' || column.dataType === 'LONG' || column.dataType === 'DOUBLE') &&
+        Array.isArray(values)
+      ) {
+        // 日期 或 时间类型
+        // const values1 = this.getFormItemValue(column.prop, null, searchForm)
+        if (values) {
+          if (column.componentType === 'yearRange') {
+            if (values[0] || values[1]) {
+              param.startValue = values[0]
+              param.endValue = values[1]
+              if (values[0] && !values[1]) {
+                param.startValue = values[0]
+                param.endValue = 9999
+              } else if (!values[0] && values[1]) {
+                param.startValue = 0
+                param.endValue = values[1]
+              }
+              searchParams.push(param)
+            }
+          } else {
+            if (!Array.isArray(values) || values.length < 2 || (values[0] === null && values[1] === null)) {
+              // 填写了一个有效值
+              if (!Array.isArray(values)) {
+                param.propValue = values
+                searchParams.push(param)
+              } else if (values.length < 2) {
+                param.propValue = values[0]
+                searchParams.push(param)
+              } else if (values[0] === null) {
+                param.propValue = values[1]
+                searchParams.push(param)
+              } else if (values[1] === null) {
+                param.propValue = values[0]
+                searchParams.push(param)
+              }
+            } else {
+              // 填写了两个有效值
+
+              param.startValue = values[0]
+              param.endValue = values[1]
+              searchParams.push(param)
+            }
+          }
+        }
+      } else if (
+        column.componentType &&
+        column.componentType.indexOf('Tree') !== -1 &&
+        column.componentType.indexOf('single') === -1
+      ) {
+        // 说明是多选组织树
+        // 是否是人员树
+        const isUser = this.isUserTree(column.componentType)
+        const values = this.getFormItemValue(column.prop, null, searchForm)
+        if (values && values !== '') {
+          const newValue = []
+          let valueArr = values
+          if (Array.isArray(values)) {
+            // 表示是数组
+            valueArr = values
+          } else {
+            // 表示是字符串
+            valueArr = values.split(',')
+          }
+          if (Array.isArray(valueArr) && valueArr && valueArr.length > 0) {
+            valueArr.forEach((val) => {
+              // 截取用户名中的英文名信息
+              const userName = this.getUserName(isUser, val)
+              if (userName !== undefined && userName !== null) {
+                newValue.push(userName)
+              }
+            })
+          }
+          this.packageValueWithArray(newValue, searchParams, param)
+        }
+      } else if (column.componentType && column.componentType.indexOf('Tree') !== -1) {
+        // 说明是单选组织树
+        // 是否是人员树
+        const isUser = this.isUserTree(column.componentType)
+        let propValue = this.getFormItemValue(column.prop, null, searchForm)
+        // 截取用户名中的英文名信息
+        propValue = this.getUserName(isUser, propValue)
+        this.packageValueWithArray(propValue, searchParams, param)
+      } else {
+        if (column.componentType === 'multiselect') {
+          // 表示是多选下拉框选择器选择的值
+          const values = this.getFormItemValue(column.prop, null, searchForm)
+          // console.log('values==', values, column.prop)
+          this.packageValueWithArray(values, searchParams, param)
+        } else {
+          const propValue = this.getFormItemValue(column.prop, null, searchForm)
+          this.packageValueWithArray(propValue, searchParams, param)
+        }
+      }
+    })
+    return searchParams
   }
 }
 export default searchMethods

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

@@ -227,6 +227,7 @@ 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'
+import searchMethods from './search-methods'
 export default {
   components: {
     IndexColumn,
@@ -943,6 +944,7 @@ export default {
     ...events,
     ...publicMethods,
     ...superGridService,
+		...searchMethods,
     ...apis,
     onResize(entry) {
       this.resizeTableHeight()

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

@@ -768,6 +768,7 @@ export function getDynamicDataSourceOptions(column, isSql, additionalParamMap, b
       options.dynamicDataSourceCode = valueSetOptionsObj.dynamicDataSourceCode
     }
   }
+  options.controlConfig = getControlConfig(column)
   return options
 }
 

package/packages/super-grid/src/view-image-dialog.vue

@@ -51,7 +51,7 @@ import * as Vue from 'vue'
 import {
 	isPlateSys,
 	getSystemFrontendUrl,
-  getKkFileBackendUrl,
+  getKkFilePreviewUrl,
 } from '../../../src/utils/common-util'
 import {getToken} from '../../../src/utils/auth'
 
@@ -155,7 +155,10 @@ export default {
 					//要预览文件的访问地址
 					const myPreviewUrl = originUrl + '&fullfilename='+myShowName
 					// http://127.0.0.1:8012/onlinePreview
-					previewUrl = getKkFileBackendUrl() +'?url='+encodeURIComponent(Base64.encode(myPreviewUrl))
+					getKkFilePreviewUrl(myPreviewUrl).then(url=>{
+						window.open(url, myShowName)
+					})
+					// previewUrl = window.$vueApp.config.globalProperties.kkFileViewUrl+'?url='+encodeURIComponent(Base64.encode(myPreviewUrl))
 				} else {
 					previewUrl =
 					this.baseUrl +
@@ -166,8 +169,8 @@ export default {
 						encodeURI(myShowName) +
 						'&serverPath=' +
 						uuid
+					window.open(previewUrl, myShowName)
 				}
-				window.open(previewUrl, myShowName)
 			}
 		},
 		deleteFile() {

package/packages/utils/value-set.js

@@ -27,7 +27,7 @@ function packageEnumAndBeanColumnValueSetsWhenPlate(columns, listCode) {
       let titleValueSet = null
       const titleValueSetJson = column.titleValueSet
       if (titleValueSetJson) {
-        titleValueSet = packageEnumAndBeanColumnValueSet(JSON.parse(titleValueSetJson))
+        titleValueSet = column.titleValueSet
       }
       if (columnValueSet || titleValueSet) {
         const valueSetMeta = {
@@ -150,11 +150,7 @@ function getDataSourceConfigList(columns) {
     const column = columns[i]
     const prop = column.prop ? column.prop : column.label
     const columnValueSet = getConfigWithValueSet(column, prop, column)
-    let titleValueSet = null
-    const titleValueSetJson = column.titleValueSet
-    if (titleValueSetJson) {
-      titleValueSet = getConfigWithValueSet(JSON.parse(titleValueSetJson), prop)
-    }
+    let titleValueSet = getConfigWithTitleValueSet(column.titleValueSetOptions, prop)
     if (columnValueSet || titleValueSet) {
       if (columnValueSet) {
         // 字段的值设置
@@ -178,14 +174,14 @@ function getConfigWithValueSet(valueSetInfo, prop, column) {
    * bean形式值设置前缀
    */
   const BEAN_NAME_PREFIX = 'beanname:'
-  const enumName = valueSetInfo.enumName
-  const beanName = valueSetInfo.beanName
+  const enumName = valueSetInfo?valueSetInfo.enumName:null
+  const beanName = valueSetInfo?valueSetInfo.beanName:null
   let infoObj = {
     uuid: prop
   }
   // 选项组的在解析列表字段配置时就获得了，不需要在此处获得了
   if (enumName && enumName !== '') {
-    if (valueSetInfo.remoteEnum === true) {
+    if (valueSetInfo && valueSetInfo.remoteEnum === true) {
       // 需要远程获得枚举值
       infoObj.type = 'enumName'
       infoObj.props = {
@@ -233,3 +229,47 @@ function getConfigWithValueSet(valueSetInfo, prop, column) {
   }
   return null
 }
+
+// 动态列标题列值设置解析
+function getConfigWithTitleValueSet(valueSetOptions, prop) {
+  let valueSetOptionsObj
+  if(valueSetOptions){
+    valueSetOptionsObj = JSON.parse(valueSetOptions)
+  }
+  let infoObj = {
+    uuid: prop
+  }
+  if (valueSetOptionsObj) {
+    // 动态数据源(select开启value-label自动转换或者)、数据表/视图、服务
+    const valueSetOptionsObj = JSON.parse(valueSetOptions)
+    if (
+      valueSetOptionsObj.type || valueSetOptionsObj.dynamicDataSourceCode
+    ) {
+      // 表示是动态数据源等值设置信息
+      // const isShouldInitSearch = (valueSetOptionsObj.filterType === undefined || valueSetOptionsObj.filterType != 'remote')
+      if (!valueSetOptionsObj.type || valueSetOptionsObj.type !== 'optionGroup') {
+        // 选项组时不需要在此处获得
+        Object.assign(infoObj, valueSetOptionsObj)
+        // 更新uuid为字段名
+        infoObj.uuid = prop
+        if (!infoObj.props) {
+          infoObj.props = {}
+        }
+        infoObj.props.prop = prop
+      }
+      if (valueSetOptionsObj.dynamicDataSourceCode) {
+        infoObj.type = 'dynamicData'
+        if (!infoObj.props) {
+          infoObj.props = {}
+        }
+        infoObj.props.code = valueSetOptionsObj.dynamicDataSourceCode
+      }
+    }
+  }
+  if (infoObj.type) {
+    // 表示是有效的值设置
+    return infoObj
+  }
+  return null
+}
+

package/src/utils/auth.js

@@ -1,6 +1,7 @@
 import authApi from './auth-api'
 import { removeAllSystemPermissions } from './permissionAuth'
 import { removeGlobalPropCache } from './global-prop'
+import { removeWatermark} from './watermark-cache'
 
 export function getToken() {
   return authApi.getToken()
@@ -168,4 +169,6 @@ export function clearPermission() {
 
   // 清除系统参数设置的全局属性缓存
   removeGlobalPropCache()
+  // 清除水印配置
+  removeWatermark()
 }

package/src/utils/common-util.js

@@ -3,6 +3,8 @@ import { getToken, getLanguage, getAllLanguages, setAllLanguages } from './auth'
 import { v4 as uuidv4 } from 'uuid'
 import { getCookieCache } from './auth'
 import i18nUtil from './i18n-util'
+import { Base64 } from 'js-base64'
+import { getWatermarkSetting } from './watermark'
 
 /**
  * 获得相对地址
@@ -818,11 +820,24 @@ export function getURLSearchParamObj(fullPath) {
     console.error('error===',error)
   }
 }
-/**
- * 获得KKFileView的路径。
- * @returns 
- */
-export function getKkFileBackendUrl() {
+
+// 获得KKFileView预览url，处理水印
+export function getKkFilePreviewUrl(previewUrl) {
+  let myPreviewUrl = getKkFileBackendUrl()+'?url='+encodeURIComponent(Base64.encode(previewUrl))
+  return new Promise((resolve,reject)=>{
+    getWatermarkSetting().then((watermark)=>{
+      if(watermark){
+        myPreviewUrl = myPreviewUrl + '&watermarkTxt='+watermark.content+'&watermarkXSpace=60&watermarkYSpace=100&watermarkWidth=500&watermarkHeight=100'
+      }
+      resolve(myPreviewUrl)
+    }).catch((error)=>{
+      console.error('获得水印失败',error)
+      resolve(myPreviewUrl)
+    })
+  })
+}
+
+function getKkFileBackendUrl() {
   let kkFileViewUrl = window.$vueApp.config.globalProperties.kkFileViewUrl
   let kkFileViewUrlResult = kkFileViewUrl
   let baseURL = window.$vueApp.config.globalProperties.baseURL

package/src/utils/request.js

@@ -80,7 +80,13 @@ service.interceptors.response.use(
         }
       } else if (error.response.status === 403) {
         // ForbiddenException(403) 403没权限
-        const message = getI18n().t('imatrixUIMessage.forbiddenException')
+        let message = ''
+        if (error.response.data?.message) {
+          message = error.response.data.message
+          console.error('ForbiddenException(403)：', error.response.data)
+        } else {
+          message = getI18n().t('imatrixUIMessage.forbiddenException')
+        }
         const serverConfig = window['$vueApp'].config.globalProperties
         let vnode
         if (serverConfig.forbiddenUser || serverConfig.forbiddenLinkUrl) {

package/src/utils/watermark-cache.js

@@ -0,0 +1,13 @@
+const watermarkSetting = 'AMB_WATERMARK_SETTING'
+
+export function getWatermark() {
+  return localStorage.getItem(watermarkSetting)
+}
+
+export function cacheWatermark(value) {
+  localStorage.setItem(watermarkSetting, value)
+}
+
+export function removeWatermark() {
+  localStorage.removeItem(watermarkSetting)
+}