agilebuilder-ui 1.1.52 → 1.1.53-rc1

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

@@ -119,6 +119,14 @@
       filterable
       @change="setValueToModelProp(column.prop, $event)"
     >
+     <template v-if="column.dataType !== 'BOOLEAN'" #header>
+        <el-checkbox
+          v-model="checkEmptyValue"
+          @change="checkEmptyChange"
+        >
+          {{$t('imatrixUIPublicModel.emptyValue')}}
+        </el-checkbox>
+      </template>
       <el-option v-for="item in column.valueSet" :key="item.value" :label="item.label" :value="item.value" />
     </el-select>
     <el-select
@@ -133,6 +141,14 @@
       filterable
       @change="setValueToModelProp(column.prop, $event)"
     >
+     <template v-if="column.dataType !== 'BOOLEAN'" #header>
+        <el-checkbox
+          v-model="checkEmptyValue"
+          @change="checkEmptyChange"
+        >
+          {{$t('imatrixUIPublicModel.emptyValue')}}
+        </el-checkbox>
+      </template>
       <el-option v-for="item in column.valueSet" :key="item.value" :label="item.label" :value="item.value" />
     </el-select>
     <el-select
@@ -146,6 +162,14 @@
       multiple
       @change="setValueToModelProp(column.prop, $event)"
     >
+     <template #header>
+        <el-checkbox
+          v-model="checkEmptyValue"
+          @change="checkEmptyChange"
+        >
+          {{$t('imatrixUIPublicModel.emptyValue')}}
+        </el-checkbox>
+      </template>
       <el-option v-for="item in column.valueSet" :key="item.value" :label="item.label" :value="item.value" />
     </el-select>
     <template
@@ -156,6 +180,7 @@
       "
     >
       <dynamic-source-select
+        ref="selectRef"
         v-model:value="searchForm[column.prop]"
         :allow-create="dataSourceOptions?.controlConfig?.allowCreate"
         :base-props="{
@@ -168,7 +193,9 @@
         :list-toolbar-form-data="listToolbarFormData"
         :options="dataSourceOptions"
         :table-name="tableName"
+        :is-search="true"
         @change="multiselectChange"
+        @changeEmptyValue="checkEmptyChange"
       />
     </template>
     <!--
@@ -290,8 +317,8 @@ export default {
       dateVal: this.getFormItemValue(this.column.prop),
       controlConfig: getControlConfig(this.column),
       isShowEmtptyFlag: false,
-      dataSourceOptions: {}
-      // checkedEmpty: false,
+      dataSourceOptions: {},
+      checkEmptyValue: false // 是否选中空值
     }
   },
   computed: {
@@ -320,6 +347,22 @@ export default {
       }
     }
   },
+  watch:{
+    // 重置按钮时，清空下拉选中 空值 的选中状态
+    'column._resetValue': {
+      deep: true,
+      handler(newValue) {
+        if (newValue) {
+          // 表示是点击了重置按钮
+          this.checkEmptyValue = false
+          if(this.$refs.selectRef){
+            this.$refs.selectRef.clearEmptyValue()
+          }
+          this.column._resetValue = undefined
+        }
+      }
+    }
+  },
   created() {
     if (this.column.valueSetOptions) {
       this.moduleConfig = JSON.parse(this.column.valueSetOptions)
@@ -509,13 +552,11 @@ export default {
       }
     },
     multiselectChange(arr, selectedItem) {
-      debugger
       if (arr && 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 {
-        debugger
         this.searchForm[this.column.prop] = arr
       }
     },

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

@@ -237,11 +237,28 @@ const searchMethods = {
       // if (!Array.isArray(values)) {
       //   selectValues = values.split(',')
       // }
+      // 是否已经封装了左括号
+      let isHasFirstLeftBracket = false
+      if(param.isEmptyValue){
+        const selectParam = Object.assign({}, param)
+        if(selectParam){
+          if(selectValues.length > 0){
+            selectParam.joinSign = 'or' // 将条件连接符修改为or，否则无法查询到值
+            isHasFirstLeftBracket = true
+            selectParam.leftBracket = '1' // 左边有1个括号
+          } else {
+            selectParam.joinSign = 'and' // 将条件连接符修改为or，否则无法查询到值
+          }
+          searchParams.push(selectParam)
+        }
+        // 用完该变量就修改这个变量的值，否则会导致下面的查询字段报错
+        param.isEmptyValue = false
+      }
       let num = 0
       selectValues.forEach((val) => {
         const selectParam = Object.assign({}, param)
         selectParam.joinSign = 'or' // 将条件连接符修改为or，否则无法查询到值
-        if (num === 0) {
+        if (num === 0 && !isHasFirstLeftBracket) {
           selectParam.leftBracket = '1' // 左边有1个括号
         }
         if (num === selectValues.length - 1) {

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

@@ -944,7 +944,7 @@ export default {
     ...events,
     ...publicMethods,
     ...superGridService,
-		...searchMethods,
+    ...searchMethods,
     ...apis,
     onResize(entry) {
       this.resizeTableHeight()
@@ -1639,6 +1639,7 @@ export default {
         gridParams.subTableData = this.subTableData
         this.gridData = this.getSubTableGridData(this.subTableData)
       } else {
+        this.subTableAddGuId(subTableData)
         this.gridData = subTableData
       }
       gridParams.gridData = this.gridData
@@ -1698,8 +1699,16 @@ export default {
       if (gridData === undefined || gridData === null) {
         gridData = []
       }
+      this.subTableAddGuId(gridData)
       return gridData
     },
+    subTableAddGuId(data) {
+      data.forEach((item) => {
+        if (!item.$rowDataGuId) {
+          item.$rowDataGuId = getGuId()
+        }
+      })
+    },
     fetchListData(searchParam, isSearch, parentRowIds, resove) {
       this.isLoading = true
       this.hasLoadData = false
@@ -3381,7 +3390,8 @@ export default {
             refresPortData: this.refresPortData,
             refresPortsData: this.refresPortsData,
             refresMainTableFields: this.refresMainTableFields,
-            prohibitToEdit: this.prohibitToEdit
+            prohibitToEdit: this.prohibitToEdit,
+            batchDeleteSubTableRow: this.batchDeleteSubTableRow
           }
         }
       } catch (error) {
@@ -3448,6 +3458,10 @@ export default {
         }
         return newRow
       }
+    },
+    batchDeleteSubTableRow() {
+      const selectRows = this.$refs.superGrid.getSelectionRows()
+      this.batchDeleteSubTableRowApi(this.code, selectRows, this.getRowKeyProp)
     }
   },
   emits: [

package/src/i18n/langs/cn.js

@@ -44,7 +44,8 @@ const cn = {
     forbidden: '禁用',
     startUsing: '启用',
     systemCode: '系统编码',
-    code: '编码'
+    code: '编码',
+    emptyValue: '空值'
   },
   imatrixUIMessage: {
     whetherToConfirmDeletion: '是否确认删除',
@@ -84,7 +85,8 @@ const cn = {
     uploadFileTip: '上传的文件不超过{fileSize}M',
     asyncExportJumpMsg: '或点击我跳转到下载页面',
     mustFill: '{label} 必须填写',
-    filePathNotFound: '文件UUID未找到，请检查配置'
+    filePathNotFound: '文件UUID未找到，请检查配置',
+    pleaseSelectDeleteData: '请选择要删除的数据'
   },
   // 列表组件
   superGrid: {
@@ -275,7 +277,8 @@ const cn = {
   fsUpload: {
     upload: '上传',
     download: '下载',
-    delete: '删除',
+		delete: '删除',
+		deleteSuccessful: '删除成功',
     preview: '预览',
     name: '名称',
     picture: '图片',

package/src/i18n/langs/en.js

@@ -44,7 +44,8 @@ const en = {
     forbidden: 'forbidden',
     startUsing: 'Start Using',
     systemCode: 'System Code',
-    code: 'Code'
+    code: 'Code',
+    emptyValue: 'Empty Value'
   },
   imatrixUIMessage: {
     whetherToConfirmDeletion: 'Whether To Confirm Deletion',
@@ -85,7 +86,8 @@ const en = {
     uploadFileTip: 'The file size should lower {fileSize}M',
     asyncExportJumpMsg: 'Or click me to jump to download page.',
     mustFill: '{label} must fill',
-    filePathNotFound: 'File UUID not found, please check the configuration'
+    filePathNotFound: 'File UUID not found, please check the configuration',
+    pleaseSelectDeleteData: 'Please select the data to delete'
   },
   superGrid: {
     editablePlaceholder: 'Please click to input',
@@ -275,6 +277,7 @@ const en = {
     upload: 'Upload',
     download: 'Download',
     delete: 'Delete',
+    deleteSuccessful: 'Delete successful',
     preview: 'Preview',
     name: 'Name',
     picture: 'Picture',

package/src/styles/element-ui.scss

@@ -1,30 +1,35 @@
  //to reset element-ui default css
  .el-upload {
-  input[type="file"] {
-    display: none !important;
-  }
-}
+   input[type="file"] {
+     display: none !important;
+   }
+ }
 
-.el-upload__input {
-  display: none;
-}
+ .el-upload__input {
+   display: none;
+ }
 
-//暂时性解决diolag 问题 https://github.com/ElemeFE/element/issues/2461 Dialog内select tree等组件在点击箭头时有虚晃
-// 去掉这个配置是因为margin: 0 auto;影响弹框位置，紧贴浏览器顶部，没有间距。例如：权限系统/授权管理/分支字段权限管理/新建按钮弹框
-// .el-dialog {
-//   transform: none;
-//   left: 0;
-//   position: relative;
-//   margin: 0 auto;
-// }
+ .el-input-group__append .el-button+.el-button {
+   margin-left: 12px;
+ }
 
-//element ui upload
-.upload-container {
-  .el-upload {
-    width: 100%;
-    .el-upload-dragger {
-      width: 100%;
-      height: 200px;
-    }
-  }
-}
+ //暂时性解决diolag 问题 https://github.com/ElemeFE/element/issues/2461 Dialog内select tree等组件在点击箭头时有虚晃
+ // 去掉这个配置是因为margin: 0 auto;影响弹框位置，紧贴浏览器顶部，没有间距。例如：权限系统/授权管理/分支字段权限管理/新建按钮弹框
+ // .el-dialog {
+ //   transform: none;
+ //   left: 0;
+ //   position: relative;
+ //   margin: 0 auto;
+ // }
+
+ //element ui upload
+ .upload-container {
+   .el-upload {
+     width: 100%;
+
+     .el-upload-dragger {
+       width: 100%;
+       height: 200px;
+     }
+   }
+ }

package/src/utils/util.js

@@ -259,14 +259,14 @@ function parseCondition(
         // 再获取属于那张表
         const propDbNameArr = propDbName.split('_+_')
         propDbName = propDbNameArr[1]
-         if (pageContext && propDbName && propDbName.indexOf('${')>=0) {
+        if (pageContext && propDbName && propDbName.indexOf('${') >= 0) {
           leftValue = getPropValueNew(propDbName, pageContext, entity)
         } else {
           leftValue = getValue(parentFormData, propDbName, isSql)
         }
         // leftValue = getValue(parentFormData, propDbName, isSql)
       } else {
-         if (pageContext && propDbName  && propDbName.indexOf('${')>=0) {
+        if (pageContext && propDbName && propDbName.indexOf('${') >= 0) {
           leftValue = getPropValueNew(propDbName, pageContext, entity)
         } else {
           leftValue = getValue(entity, propDbName, isSql)
@@ -277,7 +277,7 @@ function parseCondition(
         if (tableName && propDbName.toLowerCase().startsWith(tableName.toLowerCase() + '.')) {
           // 表示是当前表的字段
           const myProp = propDbName.substring(propDbName.indexOf('.'))
-         if (pageContext && myProp  && myProp.indexOf('${')>=0) {
+          if (pageContext && myProp && myProp.indexOf('${') >= 0) {
             leftValue = getPropValueNew(myProp, pageContext, entity)
           } else {
             leftValue = getValue(entity, myProp, isSql)
@@ -290,14 +290,14 @@ function parseCondition(
         propName = propName.replace('parent_+_', '')
         const propNameArr = propName.split('_+_')
         propName = propNameArr[1]
-         if (pageContext && propName && propName.indexOf('${')>=0) {
+        if (pageContext && propName && propName.indexOf('${') >= 0) {
           leftValue = getPropValueNew(propName, pageContext, entity)
         } else {
-          leftValue =getValue(parentFormData, propName, isSql)
+          leftValue = getValue(parentFormData, propName, isSql)
         }
         // leftValue = getValue(parentFormData, propName, isSql)
       } else {
-         if (pageContext && propName && propName.indexOf('${')>=0) {
+        if (pageContext && propName && propName.indexOf('${') >= 0) {
           leftValue = getPropValueNew(propName, pageContext, entity)
         } else {
           leftValue = getValue(entity, propName, isSql)
@@ -305,7 +305,7 @@ function parseCondition(
         // leftValue = getValue(entity, propName, isSql)
       }
       if (propDbName && (leftValue === undefined || leftValue === null)) {
-         if (pageContext && propDbName && propDbName.indexOf('${')>=0) {
+        if (pageContext && propDbName && propDbName.indexOf('${') >= 0) {
           leftValue = getPropValueNew(propDbName, pageContext, entity)
         } else {
           leftValue = getValue(entity, propDbName, isSql)
@@ -638,7 +638,7 @@ export function getPropValue(
 
 function getAdditionalParamMap(pageContext) {
   if (pageContext && pageContext.entity) {
-    let additionalParamMap = pageContext.entity.page
+    let additionalParamMap = { ...pageContext.entity.page }
     if (!additionalParamMap) {
       additionalParamMap = {}
     }

package/vite.config.js

@@ -12,7 +12,7 @@ export default defineConfig(({ mode }) => ({
     terser({
       compress: {
         drop_debugger: ['production'].includes(mode),
-        // pure_funcs: ['production'].includes(mode) ? ['console.log', 'console.info', 'console.warn', 'console.debug'] : [],
+        pure_funcs: ['production'].includes(mode) ? ['console.log', 'console.info', 'console.warn', 'console.debug'] : [],
       },
       output: {
         // 对于console.error，不做任何处理