agilebuilder-ui 1.1.50-sit3 → 1.1.50

package/packages/department-tree-inline/src/search-result.vue

@@ -151,8 +151,7 @@ export default {
     },
     // 添加用户
     addUser(index, row) {
-	  // JSON.parse(JSON.stringify(row)) 转换对象是为了解决添加数据时浏览器崩溃
-	  $emit(this, 'addUser', index, JSON.parse(JSON.stringify(row)))
+      $emit(this, 'addUser', index, JSON.parse(JSON.stringify(row)))
     },
     selectUser(selectVal) {
       // console.log('selectUser', selectVal)

package/packages/department-user-tree-inline/src/search-result.vue

@@ -202,8 +202,7 @@ export default {
     },
     // 添加用户
     addUser(index, row) {
-	  // JSON.parse(JSON.stringify(row)) 转换对象是为了解决添加数据时浏览器崩溃
-	  this.$emit('addUser', index, JSON.parse(JSON.stringify(row)))
+      this.$emit('addUser', index, JSON.parse(JSON.stringify(row)))
     },
     selectUser(selectVal) {
       // console.log('selectUser', selectVal)

package/packages/fs-preview/src/fs-preview.vue

@@ -304,7 +304,7 @@ export default {
             // window.$vueApp.config.globalProperties.kkFileViewUrl +
             // '?url=' +
             // encodeURIComponent(Base64.encode(myPreviewUrl))
-          //window.open(previewUrl, showName)
+          /window.open(previewUrl, showName)
           console.log('previewUrl====', previewUrl)
         } else {
           previewUrl = baseUrl + '/common/fs-upload/preview?jwt=' + token

package/packages/fs-upload-new/src/fs-button-upload.vue

@@ -33,6 +33,7 @@
       :file-list="fileList"
       :system-code="systemCode"
       :before-remove="beforeRemove"
+      :watermark="watermark"
       :on-remove="onRemove"
       :before-download="beforeDownload"
       :downloadable="downloadable"

package/packages/fs-upload-new/src/fs-drag-upload.vue

@@ -30,6 +30,7 @@
       :disabled-no-download="disabledNoDownload"
       :file-list="fileList"
       :system-code="systemCode"
+      :watermark="watermark"
       :before-remove="beforeRemove"
       :on-remove="onRemove"
       :before-download="beforeDownload"

package/packages/fs-upload-new/src/fs-preview-new.vue

@@ -20,12 +20,13 @@
                 </el-tooltip>
               </template>
               <el-tooltip v-if="!disabled || !disabledNoDownload" :content="t('fsUpload.download')" placement="top">
-                <el-icon style="margin-left: 10px" @click="handleDownload(file)">
+                <!-- <el-icon style="margin-left: 10px" @click="handleDownload(file)">
                   <Download />
-                </el-icon>
+                </el-icon> -->
+                <super-icon class="fs-preview-icon" @click="handleDownload(file)" iconValue="amb-color-icon-xiazai" />
               </el-tooltip>
               <el-tooltip v-if="!disabled" :content="t('fsUpload.delete')" placement="top">
-                <el-icon @click="handleOnRemove(file)"><Close /></el-icon>
+                <super-icon class="fs-preview-icon" @click="handleOnRemove(file)" iconValue="amb-color-icon-shanchu" />
               </el-tooltip>
             </div>
           </template>
@@ -61,7 +62,14 @@
 <script setup lang="ts">
 import { Close, Paperclip, Download } from '@element-plus/icons-vue'
 import { ref, defineProps } from 'vue'
-import { getSystemFrontendUrl, isPlateSys, isMobileBrowser, getReplaceUrlDomain, getRelativeBaseUrl, getKkFilePreviewUrl } from '../../../src/utils/common-util'
+import {
+  getSystemFrontendUrl,
+  isPlateSys,
+  isMobileBrowser,
+  getReplaceUrlDomain,
+  getRelativeBaseUrl,
+  getKkFilePreviewUrl
+} from '../../../src/utils/common-util'
 import { getToken } from '../../../src/utils/auth'
 import { isImage } from '../../../src/utils/util'
 import { Base64 } from 'js-base64'
@@ -125,7 +133,7 @@ const props = defineProps({
     default: false
   },
   // 水印配置{isShowWatermark:true/false,content:'xxxxx'}
-  watermark:{
+  watermark: {
     type: Object,
     default: () => ({})
   }
@@ -134,10 +142,10 @@ let baseURL = props.baseURL ? props.baseURL : window.$vueApp.config.globalProper
 let baseAPI = window.$vueApp.config.globalProperties.baseAPI
 baseURL = getRelativeBaseUrl(baseURL)
 baseAPI = getRelativeBaseUrl(baseAPI)
-if(!props.watermark.content){
+if (!props.watermark.content) {
   // 如果没有传水印配置，从按钮配置configure中获取
   props.watermark.isShowWatermark = props.configure.props?.watermark?.isShowWatermark===undefined?'true':props.configure.props?.watermark.isShowWatermark+''
-  props.watermark.content = props.configure.props.watermark.content
+  props.watermark.content = props.configure.props?.watermark?.content
 }
 const dialogVisible = ref<boolean>(false)
 const previewImageInfo = ref<any>({})
@@ -167,7 +175,7 @@ const download = (file: any) => {
   const showName = fileName.replace('#', '~~').replace('?', '~$').replace('&', '$')
   const isShowWatermark = props.watermark?.isShowWatermark
   let watermarkContent = props.watermark?.content
-  if(!watermarkContent){
+  if (!watermarkContent) {
     watermarkContent = ''
   }
   let url =
@@ -178,8 +186,10 @@ const download = (file: any) => {
     file.serverPath +
     '&jwt=' +
     token +
-    '&isShowWatermark='+isShowWatermark +
-    '&watermark='+encodeURI(watermarkContent)
+    '&isShowWatermark=' +
+    isShowWatermark +
+    '&watermark=' +
+    encodeURI(watermarkContent)
   if (isPlateSys(props.systemCode)) {
     url =
       baseAPI +
@@ -269,7 +279,7 @@ const previweDoc = (showName: string, serverPath: string) => {
       const myPreviewUrl = originUrl + '&fullfilename=' + showName
       console.log('myPreviewUrl====', myPreviewUrl)
       // http://127.0.0.1:8012/onlinePreview
-      getKkFilePreviewUrl(myPreviewUrl).then(url=>{
+      getKkFilePreviewUrl(myPreviewUrl).then((url) => {
         window.open(url, showName)
       })
       // previewUrl =
@@ -315,7 +325,23 @@ const isPreview = (fileName: string) => {
 </script>
 <style lang="scss" scoped>
 .amb-color-iconfont {
-  width: 30px;
-  height: 30px;
+  width: 25px;
+  height: 25px;
+}
+.fs-preview-icon {
+  font-size: 15px !important;
+  display: inline-block;
+  width: 1em !important;
+  height: 1em !important;
+  line-height: 1em;
+  cursor: pointer;
+
+  &:not(:first-of-type) {
+    margin-left: 20px;
+  }
+
+  & + & {
+    margin-left: 5px;
+  }
 }
 </style>

package/packages/fs-upload-new/src/fs-upload-new.vue

@@ -283,7 +283,7 @@ const props = defineProps({
     default: false
   },
   // 水印配置{isShowWatermark:true/false,content:'xxxxx'}
-  watermark:{
+  watermark: {
     type: Object,
     default: () => ({})
   }
@@ -302,10 +302,10 @@ console.log(
   'props.pageContext=',
   props.pageContext
 )
-if(!props.watermark.content){
+if (!props.watermark.content) {
   // 如果没有传水印配置，从按钮配置configure中获取
   props.watermark.isShowWatermark = props.configure?.props?.watermark?.isShowWatermark===undefined?'true':props.configure?.props?.watermark.isShowWatermark+''
-  props.watermark.content = props.configure?.props?.watermark.content
+  props.watermark.content = props.configure?.props?.watermark?.content
 }
 const listFileLabel = ref<string>('')
 if (props.displayType === 'input') {

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

@@ -107,7 +107,6 @@
             :is-show="operation.isShow"
             :label="operation.props.label ? operation.props.label : row[column.prop]"
             :on-click="operation.onClick"
-            :operation="operation"
             :operation-index="operationIndex"
             :operation-setting="operation.props"
             :event-name="operation.eventName"

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 class="table-operation-row-btn" :style="myStyle">
+  <span :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,13 +77,9 @@ export default {
       type: String,
       default: null,
     },
-    operation: {
-      type: Object,
-      default: () => ({}),
-    },
     operationSetting: {
       type: Object,
-      default: () => ({}),
+      default: null,
     },
     operationIndex: {
       type: Number,
@@ -152,16 +148,16 @@ export default {
     },
     // 后置图标
     suffixIcon() {
-      if(['right'].includes(this.operationSetting.iconPosition)) return this.operationSetting.iconValue
+      if(['right'].includes(this.operationSettingData.iconPosition)) return this.operationSetting.iconValue
       return undefined
     },
     // 是否显示文字按钮 > 图标模式
     isTextIcon() {
       if (this.isTableBtnLinkShow) {
-        if (this.operationSetting.isTextIcon === undefined) {
+        if (this.operationSettingData.isTextIcon === undefined) {
           return this.isSaveRow || this.isDeleteRow || this.isEditRow || this.isRestoreRow
         }
-        return this.operationSetting.isTextIcon
+        return this.operationSettingData.isTextIcon
       } else {
         return false
       }
@@ -176,14 +172,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-methods.js

@@ -172,7 +172,7 @@ const searchMethods = {
     }
     return val
   },
-  getOperator(column) {
+  getOperator(column, searchForm) {
     if (
       (column.dataType === 'TEXT' || column.dataType === 'CLOB') &&
       column.fuzzy &&
@@ -185,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 {
@@ -397,7 +397,7 @@ const searchMethods = {
       }
       param.propName = orgProp
       param.enumName = column.enumName
-      param.operator = this.getOperator(column)
+      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

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/utils/value-set.js

@@ -24,11 +24,7 @@ function packageEnumAndBeanColumnValueSetsWhenPlate(columns, listCode) {
       const column = columns[i]
       const prop = column.prop ? column.prop : column.label
       const columnValueSet = packageEnumAndBeanColumnValueSet(column)
-      let titleValueSet = null
-      const titleValueSetJson = column.titleValueSet
-      if (titleValueSetJson) {
-        titleValueSet = column.titleValueSet
-      }
+      const titleValueSet = column.titleValueSet
       if (columnValueSet || titleValueSet) {
         const valueSetMeta = {
           prop: prop

package/src/views/login/update-password.vue

@@ -28,6 +28,7 @@
           v-model="loginForm.password"
           type="password"
           name="password"
+          show-password
           auto-complete="on"
           placeholder="密码"
         />
@@ -36,6 +37,7 @@
         <el-input
           v-model="loginForm.newPassword"
           type="password"
+          show-password
           name="newPassword"
           auto-complete="on"
           placeholder="新密码"
@@ -45,6 +47,7 @@
         <el-input
           v-model="loginForm.confirmNewPassword"
           type="password"
+          show-password
           name="confirmNewPassword"
           auto-complete="on"
           placeholder="请再次输入新密码"