agilebuilder-ui 1.1.39 → 1.1.40-sit1

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

@@ -107,6 +107,7 @@
             :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"
@@ -199,7 +200,6 @@
         <span v-if="column.formatter && column.formatter.type === 'files'" type="primary">
           <span
             :id="column.prop + 'DomData' + rowIndex"
-            :style="textOverflow === 'newline' ? {} : { width: cellWidth + 'px' }"
             :title="isShowOverflowTooltip ? $escapeHtml(getLabel(row)) : ''"
             :class="textOverflow === 'newline' ? 'wrap-text' : 'ellipsis cell--span'"
           >
@@ -238,15 +238,17 @@
             :title="getMyHyperLinkSetting(row, rowIndex).title"
             :class="textOverflow === 'newline' ? 'wrap-text' : 'ellipsis cell--span'"
             >{{ getMyHyperLinkSetting(row, rowIndex).label }}
-            <el-icon v-if="getMyHyperLinkSetting(row, rowIndex).icon">
-              <component :is="(getMyHyperLinkSetting(row), rowIndex.icon)" />
-            </el-icon>
+            <SuperIcon
+              v-if="getMyHyperLinkSetting(row, rowIndex).icon"
+              :iconValue="getMyHyperLinkSetting(row, rowIndex).icon"
+            ></SuperIcon>
           </span>
           <span v-else :id="column.prop + 'DomData' + rowIndex" :class="isShowForm ? '' : 'cell--span'"
             >{{ getMyHyperLinkSetting(row, rowIndex).label }}
-            <el-icon v-if="getMyHyperLinkSetting(row, rowIndex).icon">
-              <component :is="getMyHyperLinkSetting(row, rowIndex).icon" />
-            </el-icon>
+            <SuperIcon
+              v-if="getMyHyperLinkSetting(row, rowIndex).icon"
+              :iconValue="getMyHyperLinkSetting(row, rowIndex).icon"
+            ></SuperIcon>
           </span>
         </el-link>
         <span
@@ -262,15 +264,19 @@
         }}</span>
       </template>
       <template v-else>
-        <span v-if="column.componentType === 'annex' || column.componentType === 'multipartUpload'" type="primary">
+        <span
+          v-if="column.componentType === 'annex' || column.componentType === 'multipartUpload'"
+          type="primary"
+          style="width: 100%"
+        >
           <span
             v-if="isShowOverflowTooltip"
             :id="column.prop + 'DomData' + rowIndex"
-            :style="textOverflow === 'newline' ? {} : { width: cellWidth + 'px' }"
             :title="$escapeHtml(getLabel(row))"
             :class="textOverflow === 'newline' ? 'wrap-text' : 'ellipsis cell--span'"
           >
             <FsPreview
+              :width="cellWidth"
               :entity="row"
               :file-set-obj="getFileObj(column.fileSet)"
               :is-sql="isSql"
@@ -289,7 +295,6 @@
         <span v-else-if="column.formatter && column.formatter.type === 'files'">
           <span
             :id="column.prop + 'DomData' + rowIndex"
-            :style="textOverflow === 'newline' ? {} : { width: cellWidth + 'px' }"
             :title="isShowOverflowTooltip ? $escapeHtml(getLabel(row)) : ''"
             :class="textOverflow === 'newline' ? 'wrap-text' : 'ellipsis cell--span'"
           >
@@ -319,15 +324,17 @@
             :title="$escapeHtml(getMyHyperLinkSetting(row, rowIndex).title)"
             :class="textOverflow === 'newline' ? 'wrap-text' : 'ellipsis cell--span'"
             >{{ $escapeHtml(getMyHyperLinkSetting(row, rowIndex).label) }}
-            <el-icon v-if="getMyHyperLinkSetting(row, rowIndex).icon">
-              <component :is="getMyHyperLinkSetting(row, rowIndex).icon" />
-            </el-icon>
+            <SuperIcon
+              v-if="getMyHyperLinkSetting(row, rowIndex).icon"
+              :iconValue="getMyHyperLinkSetting(row, rowIndex).icon"
+            ></SuperIcon>
           </span>
           <span v-else :id="column.prop + 'DomData' + rowIndex" :class="isShowForm ? '' : 'cell--span'"
             >{{ $escapeHtml(getMyHyperLinkSetting(row, rowIndex).label) }}
-            <el-icon v-if="getMyHyperLinkSetting(row, rowIndex).icon">
-              <component :is="getMyHyperLinkSetting(row, rowIndex).icon" />
-            </el-icon>
+            <SuperIcon
+              v-if="getMyHyperLinkSetting(row, rowIndex).icon"
+              :iconValue="getMyHyperLinkSetting(row, rowIndex).icon"
+            ></SuperIcon>
           </span>
         </el-link>
         <!-- 富文本 -->
@@ -700,7 +707,7 @@ export default {
       }
     }
     this.setScanRuleSets()
-    this.requiredClass = this.isRequired(this.row.$editing) ? 'm-requried' : ''
+    this.requiredClass = this.isRequired(this.row.$editing) ? 'm-requried column-text-main' : ''
   },
   mounted() {
     if (this.controlConfig) {
@@ -1215,7 +1222,7 @@ export default {
       }
     },
     changeRequired(required) {
-      this.requiredClass = required ? 'm-requried' : ''
+      this.requiredClass = required ? 'm-requried column-text-main' : ''
     },
     openPageEvent(openPageParams) {
       console.log('normalColumnContent----openPageEvent----', openPageParams)

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

@@ -213,7 +213,18 @@
       :style="column.searchControlWidth"
       @keyup.enter="submitForm('searchForm')"
       @input="setValueToModelProp(column.prop, $event)"
-    />
+      @focus="showEmpty()"
+      @blur="hiddenEmpty()"
+    >
+      <template #suffix>
+        <el-tooltip
+          :content="$t('superGrid.searchEmpty')"
+          placement="bottom"
+        >
+          <el-checkbox v-if="isShowEmtpty" v-model="checkedEmpty" @change="checkEmptyChange"/>
+        </el-tooltip>
+      </template>
+    </el-input>
   </el-form-item>
 </template>
 
@@ -281,7 +292,9 @@ export default {
       dataTwo: null,
       moduleConfig: {},
       dateVal: this.getFormItemValue(this.column.prop),
-      controlConfig: getControlConfig(this.column)
+      controlConfig: getControlConfig(this.column),
+      isShowEmtptyFlag: false,
+      // checkedEmpty: false,
     }
   },
   computed: {
@@ -291,6 +304,23 @@ export default {
         return data.listToolbarFormData
       }
       return null
+    },
+    isShowEmtpty() {
+      return this.isShowEmtptyFlag
+    },
+    checkedEmpty(){
+      if(this.column._emptyValue  && this.column._emptyValue === '#blank#'){
+        return true
+      }
+      if(this.column._resetValue || this.column._resetValue === undefined){
+        if(this.column._resetValue){
+          this.column._resetValue = undefined
+          this.isShowEmtptyFlag = false
+        }
+        return false
+      } else {
+        return true
+      }
     }
   },
   created() {
@@ -480,12 +510,25 @@ export default {
       if (arr.indexOf('saveAll') !== -1) {
         if (this.searchForm[this.column.prop] && typeof this.searchForm[this.column.prop] === 'string') {
           this.searchForm[this.column.prop] = this.searchForm[this.column.prop].split(',')
-        } else {
-          this.searchForm[this.column.prop] = []
         }
       } else {
         this.searchForm[this.column.prop] = arr
       }
+    },
+    showEmpty(){
+      this.isShowEmtptyFlag = true
+    },
+    hiddenEmpty(){
+      if(!this.checkedEmpty){
+        this.isShowEmtptyFlag = false
+      }
+    },
+    checkEmptyChange(newValue) {
+      if(newValue){
+        this.column._emptyValue='#blank#'
+      } else {
+        this.column._emptyValue=undefined
+      }
     }
   },
   emits: ['submit-form']

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

@@ -157,6 +157,11 @@ export default {
 					}
 					this.setDefaultQueryValue(column, this.searchForm)
 				}
+				// 清空空值状态
+				if(column._emptyValue){
+					column._emptyValue=undefined
+					column._resetValue=true
+				}
 			})
 			// 取消当前选中的条件列表的信息
 			// this.$refs.searchConditionList.editConditionId = null

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

@@ -162,6 +162,11 @@ export default {
 					}
 					this.setDefaultQueryValue(column, this.searchForm)
 				}
+				// 清空空值状态
+				if(column._emptyValue){
+					column._emptyValue=undefined
+					column._resetValue=true
+				}
 			})
 			// 取消当前选中的条件列表的信息
 			// this.$refs.searchConditionList.editConditionId = null