agilebuilder-ui 1.0.79-temp2 → 1.0.80-tmp1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "agilebuilder-ui",
-  "version": "1.0.79-temp2",
+  "version": "1.0.80-tmp1",
   "type": "module",
   "private": false,
   "main": "./lib/super-ui.js",

package/packages/dynamic-source-select/src/dynamic-source-select.vue

@@ -196,7 +196,7 @@ export default {
 		}
 		let lastValues = []
 		if (this.baseProps.multiple !== undefined && this.baseProps.multiple === true) {
-			if (this.value !== undefined && this.value !== null && this.value && Array.isArray(this.value)) {
+			if (this.value !== undefined && this.value !== null && Array.isArray(this.value)) {
 				lastValues = JSON.parse(JSON.stringify(this.value))
 			}
 		}
@@ -296,7 +296,7 @@ export default {
 							// 	})
 							// }
 							// 默认选中处理
-							if (dynamicDataSourceDto.defaultSelect) {
+							if (dynamicDataSourceDto.defaultSelect && (this.value === undefined || this.value === null || this.value === '')) {
 								// 多选处理
 								/**
 								if (this.baseProps.multiple) {

package/packages/rich-editor/index.vue

@@ -40,6 +40,19 @@
 		>
 			<div :id="fullscreenViewerId"/>
 		</el-dialog>
+		<!--<el-image-->
+			<!--  ref="preview"-->
+			<!--  :src="imgList[0]"-->
+			<!--  :preview-src-list="imgList"-->
+			<!--  style="display: none"-->
+		<!--/>-->
+		<ElImageViewer
+			v-if="isLightBoxVisible"
+			hide-on-click-modal
+			:initial-index="0"
+			:url-list="imgList"
+			:on-close="() =>{isLightBoxVisible = false}"
+		/>
 	</div>
 </template>
 
@@ -92,11 +105,13 @@ import 'tinymce/plugins/visualchars' //
 import 'tinymce/plugins/wordcount' // 数字统计
 import 'tinymce/skins/ui/oxide/skin.css' // 编辑器皮肤样式
 import './tinymce/zh_CN.js'
+import {ElImageViewer} from 'element-plus'
 
 export default {
 	name: 'RichEditor',
 	components: {
 		Editor,
+		ElImageViewer
 	},
 	props: {
 		entity: {
@@ -188,6 +203,18 @@ export default {
 					}
 					return url
 				},
+				setup: (editor) => {
+					editor.on('click', (e) => {
+						const targetNode = e.target.nodeName
+						if (targetNode === 'IMG') {
+						// 这里可以实现自定义的图片预览逻辑
+						const imgSrc = e.target.src
+						this.imgList = []
+						this.imgList.push(imgSrc)
+						this.isLightBoxVisible = true
+						}
+					})
+				},
 				images_upload_handler: (blobInfo, success, failure, progress) => {
 					let file
 					if (blobInfo.blob() instanceof File) {
@@ -223,6 +250,8 @@ export default {
 			dialogVisible: false,
 			fullscreenViewerId: 'editor_viewer_' + new Date().getTime(),
 			ImageComponent: null,
+			imgList: [],
+			isLightBoxVisible: false
 		}
 	},
 	watch: {

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

@@ -139,9 +139,9 @@ const apis = {
       const gridParams = store.get(listCode)
       const gridData = gridParams.gridData
       gridParams.superGrid.clearSort()
-      // console.log('创建行记录的条件1', gridParams.lineEdit)
+      console.log('创建行记录的条件1', gridParams.lineEdit)
       // console.log('创建行记录的条件2', gridParams.lineEdit.editable)
-      // console.log('创建行记录的条件3', gridParams.loaded)
+      console.log('创建行记录的条件3', gridParams.loaded)
       if (
         gridParams.lineEdit &&
         gridParams.lineEdit.editable &&

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

@@ -1590,15 +1590,19 @@ export default {
           isSaveAll = true
         }
       }
-      // console.log('multiselectChange2---this.innerValue=', this.innerValue)
-      if (this.innerValue && typeof this.innerValue !== 'number' && this.innerValue.indexOf('saveAll') !== -1) {
-        this.innerValue.splice(this.innerValue.indexOf('saveAll'), 1)
-      }
-      // console.log('multiselectChange3---this.innerValue=', this.innerValue)
-      if (isSaveAll) {
-        this.cellEvent('input', this.innerValue)
+      if (this.type === 'multiselect') {
+        // console.log('multiselectChange2---this.innerValue=', this.innerValue)
+        if (this.innerValue && typeof this.innerValue !== 'number' && this.innerValue.indexOf('saveAll') !== -1) {
+          this.innerValue.splice(this.innerValue.indexOf('saveAll'), 1)
+        }
+        // console.log('multiselectChange3---this.innerValue=', this.innerValue)
+        const val = this.innerValue && this.innerValue.length > 0 ? this.innerValue.join(',') : null
+        if (isSaveAll) {
+          this.cellEvent('input', val)
+        }
+        this.cellEvent('change', val)
+        this.setCellValue(this.column.prop, val, 'change')
       }
-      this.cellEvent('change', arr)
     },
     getDefaultValue(val) {
       // 表示当前字段的是空的，但是有默认值时，给当前字段设置值
@@ -1712,6 +1716,9 @@ export default {
     isInvalidValue(value) {
       return value === undefined || value === null || value === ''
     },
+    refreshList() {
+      this.$emit('refresh-list')
+    },
     getSwitchConfig(switchProp) {
       if (this.valueSetOptions && this.valueSetOptions[switchProp]) {
         return this.valueSetOptions[switchProp]

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

@@ -20,6 +20,7 @@
         @refresPortsData="refresPortsData"
         @refresMainTableFields="refresMainTableFields"
         @prohibit-to-edit="prohibitToEdit"
+        @open-page="openPageDialog"
       />
     </template>
     <template v-else>
@@ -33,6 +34,7 @@
         :grid-data="gridData"
         :page-grid-data="gridData"
         @prohibit-to-edit="prohibitToEdit"
+        @open-page="openPageDialog"
       />
     </template>
   </el-table-column>
@@ -108,6 +110,9 @@ export default {
     },
     prohibitToEdit(entity) {
       this.$emit('prohibit-to-edit', entity)
+    },
+    openPageDialog(openPageParams) {
+      this.$emit('open-page', openPageParams)
     }
   }
 }

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

@@ -11,9 +11,17 @@
     :width="getColumnWidth()"
   >
     <template v-slot:header>
-      <span :class="{ is_req: isFieldRequired() }"
-        ><span :title="$escapeHtml(label)" class="cell--span required__label" v-html="$escapeHtml(label)"
-      /></span>
+      <span v-if="!column.customHeader" :class="{is_req: isFieldRequired()}">
+        <span :title="$escapeHtml(label)" class="cell--span required__label" v-html="$escapeHtml(label)" />
+      </span>
+      <component
+        :is="column.customHeader"
+        v-else
+        :prop="column.prop"
+        :parent="parentFormData"
+        :grid-data="gridData"
+        :current-page="currentPage"
+      />
       <el-icon v-if="isShowAdd" style="font-size: 20px; color: #409eff" @click="createFormSubTableRow">
         <CirclePlus />
       </el-icon>
@@ -41,6 +49,7 @@
         @findIndex="findIndex(scope.$index)"
         @focus="onFocus(scope.$index)"
         @prohibit-to-edit="prohibitToEdit"
+        @refresh-list="refreshList"
         @refresData="refresData"
         @refresMainTableFields="refresMainTableFields"
         @refresPortData="refresPortData"
@@ -94,6 +103,8 @@
               :operation-index="operationIndex"
               :operation-setting="operation.props"
               :row-index="scope.$index"
+              :list-code="listCode"
+              :parent-form-data="parentFormData"
             />
           </span>
         </span>
@@ -147,6 +158,7 @@
             :component-id="componentId"
             :additional-settings="controlConfig"
             @prohibitToEdit="prohibitToEdit"
+            @refresh-list="refreshList"
         /></span>
         <span
           v-else-if="
@@ -444,12 +456,12 @@ export default {
     if (this.column.controlConfig) {
       controlConfig = JSON.parse(this.column.controlConfig)
     }
-
+    
     let scanEnable = false
-    if (controlConfig.scanEnable) {
+    if(controlConfig.scanEnable){
       scanEnable = true
     }
-    const componentId = this.listCode + '_' + this.column.prop
+    const componentId = this.listCode+'_'+this.column.prop
     return {
       selectRow: null,
       that: this,
@@ -1036,6 +1048,9 @@ export default {
     changeDisabled(state) {
       this.disabled = state
     },
+    refreshList() {
+      this.$emit('refresh-list')
+    },
     getFilesFormatter() {
       if (this.column.formatter.options?.fileSet) {
         return JSON.parse(this.column.formatter.options.fileSet)
@@ -1046,7 +1061,7 @@ export default {
      * 设置条码扫描解析规则
      */
     setScanRuleSets() {
-      if (this.scanEnable && this.controlConfig && this.controlConfig.scanRuleList) {
+      if(this.scanEnable && this.controlConfig && this.controlConfig.scanRuleList) {
         formatScanRuleSets(this.controlConfig.scanRuleList).then((res) => {
           //扫描处理
           this.column._scanRuleSets = res
@@ -1068,7 +1083,6 @@ export default {
 .m-requried {
   float: left;
   white-space: nowrap;
-  width: 100%;
 }
 
 .m-requried::after {

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

@@ -49,6 +49,7 @@
 import { mapGetters } from 'vuex'
 import customFormatter from './custom-formatter'
 import { analysisCondition } from '../../../src/utils/util'
+import store from './store'
 export default {
   name: 'RowOperation',
   props: {
@@ -89,6 +90,14 @@ export default {
       type: Number,
       default: null,
     },
+    listCode: {
+      type: String,
+      default: null
+    },
+    parentFormData: {
+      type: Object,
+      default: null
+    }
   },
   data() {
     return {
@@ -152,6 +161,7 @@ export default {
     },
     isShowButton() {
       // const start = new Date().getTime()
+      const gridParams = store.get(this.listCode)
       const val = customFormatter.isShowButtonFun(
         this.entity,
         this.column,
@@ -162,16 +172,15 @@ export default {
         const displayJudgment = JSON.stringify(
           this.operationSetting.buttonDisplayConditionsList
         )
-        return analysisCondition(
-          displayJudgment,
-          this.entity,
-          {},
-          {},
-          true,
-          null,
-          null,
-          null
-        )
+        if (gridParams) {
+          let tableName = null
+          if (gridParams.basicInfo.tableName) {
+            tableName = gridParams.basicInfo.tableName
+          }
+          return analysisCondition(displayJudgment, this.entity, gridParams.additionalParamMap, gridParams.contextParameter, true, tableName, this.parentFormData)
+        } else {
+          return analysisCondition(displayJudgment, this.entity, {}, {}, true, null, null)
+        }
       }
 
       if (val) {

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

@@ -203,6 +203,7 @@ const superGridService = {
                     configureObj: this.configureObj
                   })
                 }
+                console.log('fetchData-----this.options.initSearch=', this.options.initSearch,'gridParams.basicInfo.initializationQuery=', gridParams.basicInfo.initializationQuery, '0000000')
                 if (canFetchData === undefined || canFetchData === true) {
                   // 表示初始化时查询记录
                   if (this.options.isPageInfo) {
@@ -213,6 +214,7 @@ const superGridService = {
                       'undefined' ||
                       gridParams.basicInfo.initializationQuery
                     ) {
+                      console.log('fetchData-----this.loadCompleteQuery=', this.loadCompleteQuery, '1111111')
                       // 判断是否初始化完查询条件后再查询数据
                       if (this.loadCompleteQuery) {
                         this.isLoading = false
@@ -220,7 +222,7 @@ const superGridService = {
                         this.fetchData()
                       }
                     }
-                  } else if (this.options.initSearch !== false) {
+                  } else if (this.options.initSearch) {
                     // 判断是否初始化完查询条件后再查询数据
                     if (this.loadCompleteQuery) {
                       this.isLoading = false
@@ -308,6 +310,7 @@ const superGridService = {
       if (queryParameterSize > 0) {
         this.loadCompleteQuery = true
       }
+      console.log('isLoadCompleteQuery-----this.loadCompleteQuery=', this.loadCompleteQuery)
     }
   },
   packageColumnOptionMap(gridParams) {

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

@@ -1,5 +1,5 @@
 <template>
-  <div>
+  <div :style="subTableStyle">
     <search-form
       v-if="
         !isFormSubTable &&
@@ -102,6 +102,7 @@
             :page-grid-data="
               isSubTableShowPage ? getSubTableGridData(subTableData) : gridData
             "
+            @refresh-list="refreshList"
             @open-page="openPageDialog"
             @refresPortData="refresPortData"
             @refresPortsData="refresPortsData"
@@ -135,6 +136,7 @@
             "
             @open-page="openPageDialog"
             @refresData="refresData"
+            @refresh-list="refreshList"
             @refresPortData="refresPortData"
             @refresPortsData="refresPortsData"
             @refresMainTableFields="refresMainTableFields"
@@ -458,7 +460,8 @@ export default {
       pageContext, // 页面配置上下文
       configureObj, // 表格配置信息
       isMobile, // 是否是移动端
-      isShowMobileSearch: false // 是否显示移动端查询区域
+      isShowMobileSearch: false, // 是否显示移动端查询区域
+      subTableStyle: {}
     }
   },
   computed: {
@@ -785,11 +788,21 @@ export default {
                     pageGridData: this.isSubTableShowPage
                       ? this.gridData
                       : null,
+                    listCode: this.code,
                     additionalParamMap: gridParams.additionalParamMap,
                     pageContext: this.pageContext,
                     configureObj: this.configureObj
                   })
                 }
+                this.$emit('gridComplete', {
+                  gridData: this.isSubTableShowPage ? this.subTableData : this.gridData,
+                  columns: gridParams.columns,
+                  superGrid: this.$refs.superGrid,
+                  isMobile: false,
+                  listCode: this.code,
+                  pageGridData: this.isSubTableShowPage ? this.gridData : null,
+                  additionalParamMap: gridParams.additionalParamMap
+                })
               })
             }
           },
@@ -1256,6 +1269,7 @@ export default {
         gridParams.options.isFormSubTable === true
       ) {
         this.isFormSubTable = true
+        this.subTableStyle = { width: '100%' }
       }
     },
     /**
@@ -1651,13 +1665,14 @@ export default {
 
         this.isLoading = true
         this.hasLoadData = false
+          console.log('fetchData--isSearch--', isSearch)
         if (isSearch === undefined || isSearch === false) {
           // 如果不是查询时才需要从缓存中获得结果
           // 如果是刷新当前列表，则需要获得缓存中的window.sessionStorage
           const isRefreshList = window.sessionStorage.getItem(
             'refreshList-' + this.code
           )
-          // console.log('fetchData--isRefreshList--', isRefreshList)
+          console.log('fetchData--isRefreshList--', isRefreshList)
           if (isRefreshList !== undefined && isRefreshList === 'true') {
             const searchParamJson = window.sessionStorage.getItem(
               'searchParam-' + this.code
@@ -1743,11 +1758,13 @@ export default {
               configureObj: this.configureObj
             })
           }
+            console.log('fetchData--canFetchData--', canFetchData, 'requestUrl=', requestUrl)
           return new Promise((resolve, reject) => {
             if(isPromise(canFetchData)){
               canFetchData.then((result)=>{
                 if(result === undefined || result) {
                   if(!requestUrl){
+                    gridParams.loaded = true
                     resolve()
                   } else {
                     this.doRequest(requestUrl, param, parentRowIds, gridParams, resove).then(()=>{
@@ -1758,24 +1775,30 @@ export default {
                   }
                 } else {
                   console.error('beforeRequest result is false!!')
+                  gridParams.loaded = true
                   resolve()
                 }
               }).catch((error)=>{
+                gridParams.loaded = true
                 reject(error)
               })
             } else {
               if (canFetchData === undefined || canFetchData === true) {
                 if(!requestUrl){
+                    gridParams.loaded = true
                     resolve()
                   } else {
                     this.doRequest(requestUrl, param, parentRowIds, gridParams, resove).then(()=>{
+                      gridParams.loaded = true
                       resolve()
                     }).catch((error)=>{
+                      gridParams.loaded = true
                       reject(error)
                     })
                   }
               } else {
                 console.error('beforeRequest result is false!!')
+                gridParams.loaded = true
                 resolve()
               }
             }
@@ -1886,6 +1909,7 @@ export default {
             this.hasLoadData = true
           } else {
             // 对数据做序列化，比如：处理xss攻击
+            gridParams.loaded = true
             if (isHasOptionFunction('gridDataLoaded', this.code)) {
               gridParams.options.gridDataLoaded.call(this, {
                 gridData: data,
@@ -2902,7 +2926,7 @@ export default {
             if (index < 0) {
               index = 0
             }
-            this.editRow(index)
+            this.editRow(index, this.code)
           }
         }
       }
@@ -3115,6 +3139,9 @@ export default {
       store.set(this.code, gridParams)
       this['subTableData'] = data
     },
+    refreshList() {
+      this.fetchData(this.getSearchParam())
+    },
     // 选择记录
     selectRecord(selection, row){
       let selectRecordEventResult = true