agilebuilder-ui 1.1.29-dingtalkphoto2 → 1.1.30-sit1

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

@@ -93,7 +93,7 @@
       @input="cellEvent('input', $event)"
     />
     <el-time-picker
-      v-else-if="type === 'timePicker'"
+      v-else-if="type === 'timePicker' || (type === 'input' && column.dataType === 'TIME')"
       ref="item"
       v-model="innerValue"
       :disabled="disabled"
@@ -108,7 +108,7 @@
     />
     <!--必须有@input ,否则无法输入值-->
     <el-date-picker
-      v-else-if="type === 'time' || column.dataType === 'TIME'"
+      v-else-if="type === 'time'"
       ref="item"
       v-model="innerValue"
       :disabled="disabled"
@@ -132,6 +132,7 @@
       :disabled="disabled"
       :placeholder="$t('imatrixUIMessage.pleaseEnterContent')"
       :title="innerValue"
+      :type="column.dataType === 'INTEGER' || column.dataType === 'LONG' ? 'number' : 'text'"
       clearable
       @blur="cellEvent('blur', $event)"
       @change="cellEvent('change', $event)"
@@ -926,14 +927,14 @@ export default {
         let selectTittle = ''
         if (typeof val === 'string') {
           // 单选
-          this.options.forEach((item) => {
+          this.options?.forEach((item) => {
             if (item.value === val) {
               selectTittle = item.label
             }
           })
         } else {
           // 多选
-          this.options.forEach((item) => {
+          this.options?.forEach((item) => {
             val.forEach((Vtem) => {
               if (item.value === Vtem) {
                 selectTittle = selectTittle + item.label + ','
@@ -1743,7 +1744,7 @@ export default {
             if (!this.innerValue || this.innerValue.indexOf(saveAll) >= 0) {
               this.innerValue = []
             }
-            this.options.forEach((item) => {
+            this.options?.forEach((item) => {
               if (this.innerValue.indexOf(item.value) === -1) {
                 this.innerValue.push(item.value)
               }
@@ -1832,12 +1833,8 @@ export default {
     },
     // 时间格式判断是否是字符串类型，显示格式
     isFormat() {
-      if (this.type === 'time' && this.column.dataType === 'TIME') {
+      if (this.type === 'dateTimePicker') {
         return 'YYYY-MM-DD HH:mm:ss'
-      } else if (this.type === 'dateTimePicker') {
-        return 'YYYY-MM-DD HH:mm:ss'
-      } else if (this.type === 'date' && this.column.dataType === 'DATE') {
-        return 'YYYY-MM-DD'
       } else if (this.type === 'timePicker') {
         if (this.column.originalFormat) {
           return this.column.originalFormat
@@ -1847,8 +1844,12 @@ export default {
         return 'YYYY'
       } else if (this.type === 'month') {
         return 'MM'
-      } else if (this.dataType === 'TIME') {
+      } else if (this.type === 'date') {
+        return 'YYYY-MM-DD'
+      } else if (this.type === 'time' || this.column.dataType === 'TIME') {
         return 'HH:mm:ss'
+      } else if (this.column.dataType === 'DATE') {
+        return 'YYYY-MM-DD'
       }
       return 'YYYY-MM-DD'
     },

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

@@ -1,16 +1,17 @@
 <template>
   <el-table-column
-    align="center"
+    header-align="center"
+    show-overflow-tooltip
+    :align="align"
     :fixed="fixed"
-    :width="70"
+    :width="width"
+    :min-width="minWidth"
   >
     <template v-slot:header>
       <span class="cell--span">{{ $t('superGrid.index') }}</span>
     </template>
     <template v-slot="scope">
-      <span class="cell--span">
-        {{ scope.$index + startIndex }}
-      </span>
+      {{ scope.$index + startIndex }}
     </template>
   </el-table-column>
 </template>
@@ -43,19 +44,27 @@ export default {
       type: Object,
       default: null,
     },
+    isDataChildren: {
+      type: Boolean,
+      default: false,
+    }
   },
   computed: {
+    align() {
+      if (this.isDataChildren) return 'left'
+      return 'center'
+    },
+    width() {
+      if (this.isDataChildren) return undefined
+      return 70
+    },
+    minWidth() {
+      if (this.isDataChildren) return 100
+      return undefined
+    },
     fixed() {
-      if (
-        this.column.fixed &&
-        (this.column.fixed === 'false' || this.column.fixed === '')
-      ) {
-        return false
-      }
-      // 序号只支持左固定
-      if (this.column.fixed && this.column.fixed === 'right') {
-        return 'left'
-      }
+      if (!this.column.fixed) return false
+      if (['null', 'false', 'undefined'].includes(this.column.fixed)) return false
       return this.column.fixed
     },
     startIndex() {

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

@@ -35,15 +35,16 @@
       @open-page="openPageEvent"
     />
     <div v-else class="column-text-main">
-      <div v-if="lineEdit.editable && isEditable && !isHideEdit && !isContentViewText" class="column-text-edit-main" @click="onEditing">
+      <div v-if="lineEdit.editable && (options?.configureObj?.props?.base?.columnEditable ?? false) && isEditable && !isHideEdit && !isContentViewText" class="column-text-edit-main" @click="onEditing">
         <el-icon :size="14" color="#409eff"><Edit /></el-icon>
-        <span v-if="[undefined, null, ''].includes(row[column.prop])" table-column-placeholder>请点击输入</span>
+        <span v-if="[undefined, null, ''].includes(row[column.prop])" table-column-placeholder>{{ $t('superGrid.editablePlaceholder') }}</span>
       </div>
       <span v-if="column.operations" class="grid-operation-buttons">
         <span
           v-for="(operation, operationIndex) in column.operations"
           :key="operationIndex"
           :class="isShowForm ? '' : 'cell--span'"
+          class="buttons-row-content-span"
         >
           <el-dropdown
             v-if="operation.isGroup"
@@ -100,6 +101,7 @@
             :row-index="rowIndex"
             :list-code="listCode"
             :parent-form-data="parentFormData"
+            is-table-btn-link
           />
         </span>
       </span>
@@ -358,6 +360,7 @@ import { $emit, $off, $on } from '../../utils/gogocodeTransfer'
 import {
   ArrowKeyAction,
   getColumnValues,
+  isDisableEdit,
   getFileList,
   isDynamicDataSourceSource,
   isHasEditOption,
@@ -617,6 +620,7 @@ export default {
     if (gridParams && gridParams.options && gridParams.options.isFormSubTable) {
       this.isFormSubTable = gridParams.options.isFormSubTable
     }
+    this.disabled = isDisableEdit(this.column.prop, this.listCode, this.row)
     if (
       gridParams &&
       gridParams.options &&
@@ -671,6 +675,10 @@ export default {
     this.requiredClass = this.isRequired(this.row.$editing) ? 'm-requried' : ''
   },
   mounted() {
+    // 监听取消自定义编辑事件
+    eventBus.$on('clearTableAllStartEditing', () => {
+      this.clearAllEditing()
+    })
     // 监听保存时点击按钮事件线触发
     $on(eventBus, 'un-edit', (param) => {
       // 处理多选选项组问题保存问题
@@ -759,6 +767,7 @@ export default {
     if (this.$parent.$parent && this.$parent.$parent.$options._componentTag === 'GroupColumn') {
       eventBus.$off('prohibitToEdit')
     }
+    eventBus.$off('clearTableAllStartEditing')
   },
   methods: {
     ...customFormatter,
@@ -1137,6 +1146,7 @@ export default {
       return 'primary'
     },
     changeDisabled(state) {
+      debugger
       this.disabled = state
     },
     refreshList() {
@@ -1199,6 +1209,13 @@ export default {
     align-items: center;
     gap: 10px;
 
+    [table-column-placeholder] {
+      display: block;
+      white-space: nowrap;
+      overflow: hidden;
+      text-overflow: ellipsis;
+    }
+
     &::after {
       content: ' ';
       position: absolute;

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

@@ -76,6 +76,7 @@ import FsPreview from '../../fs-preview'
 import RichEditorViewer from '../../rich-editor/viewer.vue'
 import GridIcon from './components/grid-icon.vue'
 import NormalColumnContent from './normal-column-content.vue'
+import eventBus from './eventBus'
 export default {
   components: {
     DynamicInput,
@@ -189,17 +190,8 @@ export default {
       }
     },
     fixed() {
-      if (
-        (this.column.fixed && this.column.fixed === 'false') ||
-        this.column.fixed === undefined ||
-        this.column.fixed === ''
-      ) {
-        return false
-      }
-      if (this.column.prop === 'operation' && this.column.fixed && this.column.fixed === 'left') {
-        // 操作列居右固定
-        return 'right'
-      }
+      if (!this.column.fixed) return false
+      if (['null', 'false', 'undefined'].includes(this.column.fixed)) return false
       return this.column.fixed
     },
     sortable() {
@@ -297,8 +289,17 @@ export default {
       gridParams.options &&
       gridParams.options.showOperationButton
   },
-  mounted() {},
-  unmounted() {},
+  mounted() {
+    if(this.column.prop === 'operation'){
+      const that = this
+      eventBus.$on('change-add-state',(value)=>{
+        that.isShowAdd = value
+      })
+    }
+  },
+  unmounted() {
+    eventBus.$off('change-add-state')
+  },
   methods: {
     ...customFormatter,
     ...apis,

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

@@ -4,41 +4,39 @@
   <span :style="myStyle">
     <template v-if="isShowButton()">
       <template v-if="label">
-        <!-- <el-tooltip :content="label" class="item" effect="dark" placement="top-start"> -->
-        <component
-          v-bind="operationSetting"
-          :is="elementType"
-          v-if="operationSetting.permission"
-          v-permission="operationSetting.permission"
-          :disabled="preventReclick"
-          @mousedown="onClickFun(operationSetting)"
-          >{{ label }}</component
-        >
-        <component
-          v-bind="operationSetting"
-          :is="elementType"
-          v-else
-          :disabled="preventReclick"
-          @mousedown="onClickFun(operationSetting)"
-          >{{ label }}</component
-        >
-        <!-- </el-tooltip> -->
+        <template v-if="operationSettingData.permission">
+          <component
+            v-bind="operationSettingData"
+            :is="isElementType"
+            v-permission="operationSettingData.permission"
+            :disabled="preventReclick"
+            @mousedown="onClickFun(operationSettingData)"
+            >{{ label }}</component>
+        </template>
+        <template v-else>
+          <component
+            v-bind="operationSettingData"
+            :is="isElementType"
+            :disabled="preventReclick"
+            @mousedown="onClickFun(operationSettingData)"
+            >{{ label }}</component>
+        </template>
       </template>
       <template v-else>
         <component
-          v-bind="operationSetting"
-          :is="elementType"
-          v-if="operationSetting.permission"
-          v-permission="operationSetting.permission"
+          v-bind="operationSettingData"
+          :is="isElementType"
+          v-if="operationSettingData.permission"
+          v-permission="operationSettingData.permission"
           :disabled="preventReclick"
-          @mousedown="onClickFun(operationSetting)"
+          @mousedown="onClickFun(operationSettingData)"
         />
         <component
-          v-bind="operationSetting"
-          :is="elementType"
+          v-bind="operationSettingData"
+          :is="isElementType"
           v-else
           :disabled="preventReclick"
-          @mousedown="onClickFun(operationSetting)"
+          @mousedown="onClickFun(operationSettingData)"
         />
       </template>
     </template>
@@ -58,6 +56,10 @@ export default {
       type: Boolean,
       default: false,
     },
+    isTableBtnLink: {
+      type: [Boolean],
+      default: false,
+    },
     isShow: {
       type: [Boolean, Function],
       default: true,
@@ -107,6 +109,26 @@ export default {
   },
   computed: {
     ...mapGetters(['preventReclick']),
+    // 是否自动开启表格 按钮 转 文字按钮
+    isTableBtnLinkShow() {
+      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 false
+    },
+    operationSettingData() {
+      const dataList = { ...this.operationSetting }
+      if (this.isTableBtnLinkShow) {
+        dataList.underline = false
+        delete dataList.text
+      }
+      return dataList
+    },
+    isElementType() {
+      if (this.isTableBtnLinkShow) return 'el-link'
+      return this.elementType
+    }
   },
   created() {
     if (

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

@@ -27,18 +27,8 @@ export default {
   },
   computed: {
     fixed() {
-      if (
-        this.column.fixed === undefined ||
-        this.column.fixed === null ||
-        this.column.fixed === '' ||
-        this.column.fixed === 'false'
-      ) {
-        return false
-      }
-      // 左右都固定会导致列表显示速度慢，暂只支持左侧固定
-      if (this.column.fixed && this.column.fixed === 'right') {
-        return 'left'
-      }
+      if (!this.column.fixed) return false
+      if (['null', 'false', 'undefined'].includes(this.column.fixed)) return false
       return this.column.fixed
     },
   },

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

@@ -1,5 +1,5 @@
 <template>
-  <div data-v="1.0.0" class="super-grid-main-view" :style="subTableStyle" @click="onClickTableMain">
+  <div v-resize="onResize" data-v="1.0.0" class="super-grid-main-view" :style="subTableStyle" @click="onClickTableMain">
     <search-form
       v-if="!isFormSubTable && hasLoadedColumns && query && query.showType === 'embedded'"
       v-show="!isMobile || (isMobile && isShowMobileSearch)"
@@ -305,7 +305,12 @@ export default {
     additionalParamMap: {
       type: Object,
       default: null
-    }
+    },
+    // 手动控制高度偏移
+    manualHeightOffset: {
+      type: [undefined, Number],
+      default: undefined
+    },
   },
   data() {
     let parentProp
@@ -453,15 +458,19 @@ export default {
     }
   },
   computed: {
+    // 高度偏移
+    heightOffset() {
+      return Number(this.manualHeightOffset ?? this.options?.configureObj?.props?.size?.pc?.heightOffset ?? 33)
+    },
     // 限制高度最低值
     hasMaxHeight() {
       if (this.maxHeight) {
-        return this.maxHeight <= 100 ? 100 : this.maxHeight ?? undefined
+        return this.maxHeight <= 100 ? 100 : this.maxHeight + this.heightOffset ?? undefined
       }
       return undefined
     },
 
-    // 是指固钉高度最低值
+    // 是指固定高度最低值
     hasTableHeight() {
       if (this.tableHeight) {
         return this.tableHeight <= 100 ? 100 : this.tableHeight ?? undefined
@@ -473,7 +482,7 @@ export default {
     },
     // 是否显示卡片
     isShowCard() {
-      return this.isShowAutoCard && this.isMobileListCard && !this.options.isAdministerListView
+      return this.isShowAutoCard && this.isMobileListCard && !this.options.isAdministerListView && (this.options?.configureObj?.props?.base?.isMobileCard ?? true)
     },
     visibleColumns() {
       const gridParams = store.get(this.code)
@@ -688,7 +697,7 @@ export default {
         this.$nextTick(() => {
           if (newVal) {
             // 手动触发新单元格的点击事件
-            newVal.click()
+             newVal.click()
           }
           if (oldVal) {
             // 清空上一个单元格的选中样式
@@ -800,7 +809,7 @@ export default {
             }
           )
         }
-
+        window.addEventListener('resize', this.resizeTableHeight);
         this.$watch(
           'hasLoadData',
           function (newVal, oldVal) {
@@ -899,11 +908,17 @@ export default {
       )
     })
   },
+  beforeDestroy() {
+    window.removeEventListener('resize', this.resizeTableHeight);
+  },
   methods: {
     ...events,
     ...publicMethods,
     ...superGridService,
     ...apis,
+		onResize(entry) {
+      this.resizeTableHeight()
+		},
     onClickMain() {
       // 清理编辑选中
       storeVuex?.dispatch?.('clearAllEditing')
@@ -3270,6 +3285,7 @@ export default {
             'options': this.options,
             'current-page': this.currentPage,
             'pagination': this.pagination,
+            'is-data-children': this.tableDatas.some(d => Array.isArray(d?.children)),
             'grid-data': this.isSubTableShowPage ? this.subTableData : this.gridData,
             'page-grid-data': this.isSubTableShowPage ? this.getSubTableGridData(this.subTableData) : this.gridData,
             ...(myCustomFormatter ? {
@@ -3296,6 +3312,9 @@ export default {
           column
         }
       }
+    },
+    changeOperationAddState(state){
+      eventBus.$emit('change-add-state', state)
     }
   },
   emits: [
@@ -3309,7 +3328,8 @@ export default {
     'un-edit',
     'refresMainTableFields',
     'refresh',
-    'cancel-search'
+    'cancel-search',
+    'changeOperationAddState'
   ]
 }
 </script>