agilebuilder-ui 1.1.50-rc1 → 1.1.50-sit2

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

@@ -1,10 +1,10 @@
 <template>
   <!--将@click改为@mousedown.native是因为操作列保存按钮时事件和input等组件的@blur冲突，导致保存需要保存两次，因为
       @blur先于@click执行的，所以只会执行@blur，@click就失效了，@mousedown是先于@blur执行的-->
-  <span :style="myStyle">
+  <span class="table-operation-row-btn" :style="myStyle">
     <template v-if="isShowButton()">
       <el-tooltip :disabled="tooltipDisabled" :content="label" placement="top">
-        <template v-if="operationSettingData.permission">
+        <template v-if="operationSettingData?.permission">
           <component
             v-bind="operationSettingData"
             :is="isElementType"
@@ -77,9 +77,13 @@ export default {
       type: String,
       default: null,
     },
+    operation: {
+      type: Object,
+      default: () => ({}),
+    },
     operationSetting: {
       type: Object,
-      default: null,
+      default: () => ({}),
     },
     operationIndex: {
       type: Number,
@@ -148,16 +152,16 @@ export default {
     },
     // 后置图标
     suffixIcon() {
-      if(['right'].includes(this.operationSettingData.iconPosition)) return this.operationSetting.iconValue
+      if(['right'].includes(this.operationSetting.iconPosition)) return this.operationSetting.iconValue
       return undefined
     },
     // 是否显示文字按钮 > 图标模式
     isTextIcon() {
       if (this.isTableBtnLinkShow) {
-        if (this.operationSettingData.isTextIcon === undefined) {
+        if (this.operationSetting.isTextIcon === undefined) {
           return this.isSaveRow || this.isDeleteRow || this.isEditRow || this.isRestoreRow
         }
-        return this.operationSettingData.isTextIcon
+        return this.operationSetting.isTextIcon
       } else {
         return false
       }
@@ -172,14 +176,14 @@ export default {
     },
     // 是否自动开启表格 按钮 转 文字按钮
     isTableBtnLinkShow() {
-      if (this.operationSetting.text) return true
+      if (this.operationSetting?.text) return true
       if (this.isTableBtnLink && this.elementType === 'el-button') {
-        return [this.operationSetting.text, this.operationSetting.plain, this.operationSetting.round].every(v => v === undefined)
+        return [this.operationSetting?.text, this.operationSetting?.plain, this.operationSetting?.round].every(v => v === undefined)
       }
       return false
     },
     operationSettingData() {
-      const dataList = { ...this.operationSetting }
+      const dataList = { ...(this.operationSetting ?? {}) }
       if (this.isTableBtnLinkShow) {
         dataList.underline = false
         delete dataList.text

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/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)
+}

package/src/utils/watermark.js

@@ -1,5 +1,4 @@
-'use strict'
-// import ssoService from '../api/sso-service'
+import {getWatermark, cacheWatermark, removeWatermark} from './watermark-cache'
 const watermark = {}
 
 const setWatermark = (str, parma, paramId) => {
@@ -35,12 +34,12 @@ const setWatermark = (str, parma, paramId) => {
   const div = document.createElement('div')
   div.id = id
   div.style.pointerEvents = 'none'
-  div.style.top = '80px'
-  div.style.left = '200px'
+  div.style.top = '10px'  // 80px
+  div.style.left = '0px' // 200px
   div.style.position = 'fixed'
   div.style.zIndex = '10000'
-  div.style.width = '70%'
-  div.style.height = '80%'
+  div.style.width = '100%' // 70%
+  div.style.height = '100%' // 80%
   div.style.background =
     'url(' + can.toDataURL('image/png') + ') left top repeat'
 
@@ -71,6 +70,48 @@ export function showWatermark(label, parma, user, paramId) {
     }
   })
 }
+
+// 获得水印维护信息
+export function getWatermarkSetting(){
+  return new Promise((resolve,reject)=>{
+    let watermark = getWatermark()
+    if(!watermark || watermark === 'EMPTY_VALUE'){
+      window.$vueApp.config.globalProperties.$http.get(window.$vueApp.config.globalProperties.baseAPI + '/component/watermark').then((data)=>{
+        if(data){
+          watermark = data
+          cacheWatermark(JSON.stringify(watermark))
+          // 兼容之前的代码
+          watermark.font = watermark.fontStyle
+          watermark.color = watermark.fontColor
+          resolve(watermark)
+        } else {
+          cacheWatermark('EMPTY_VALUE')
+          resolve()
+        }
+      })
+    } else {
+      try{
+        watermark = JSON.parse(watermark)
+        // 兼容之前的代码
+        watermark.font = watermark.fontStyle
+        watermark.color = watermark.fontColor
+        resolve(watermark)
+      }catch(error){
+        console.error('watermark content error.',error)
+        resolve()
+      }
+    }
+  })
+}
+
+// 该方法只允许调用一次
+export function showWatermarkNew() {
+  getWatermarkSetting().then((watermark)=>{
+    if(watermark){
+      setWatermark(watermark.content, watermark)
+    }
+  })
+}
 // watermark.set = (label, parma) => {
 
 // }

package/src/views/layout/EmptyLayout.vue

@@ -1,3 +1,11 @@
 <template>
   <router-view />
-</template>
+</template>
+<script>
+import {showWatermarkNew} from '../../utils/watermark'
+export default {
+  mounted(){
+    showWatermarkNew()
+  }
+}
+</script>

package/src/views/layout/Layout.vue

@@ -17,6 +17,7 @@
 import { Sidebar, AppMain, Breadcrumb } from './components'
 import ResizeMixin from './mixin/ResizeHandler'
 import { isShowMenuRoute } from '../../../src/utils/common-util'
+import {showWatermarkNew} from '../../utils/watermark'
 
 export default {
   name: 'Layout',
@@ -49,6 +50,9 @@ export default {
       }
     },
   },
+  mounted(){
+    showWatermarkNew()
+  },
   methods: {
     handleClickOutside() {
       this.$store.dispatch('closeSidebar', { withoutAnimation: false })

package/src/views/layout/NewLayout.vue

@@ -9,10 +9,14 @@
 
 <script>
 import { AppMain } from './components'
+import {showWatermarkNew} from '../../utils/watermark'
 export default {
   name: 'NewLayout',
   components: {
     AppMain,
   },
+  mounted(){
+    showWatermarkNew()
+  }
 }
 </script>