doway-coms 2.7.2 → 2.7.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "doway-coms",
-  "version": "2.7.2",
+  "version": "2.7.4",
   "description": "doway组件库",
   "author": "dowaysoft",
   "main": "packages/index.js",

package/packages/BaseDate/src/index.vue

@@ -39,7 +39,7 @@
           {{ moment(currentValue).format("YYYY-MM-DD") }}
         </template>
         <span  @contextmenu.prevent="(event) => onContextmenu(event, currentValue)">
-          {{ moment(currentValue).format("YYYY-MM-DD") }}
+          {{ currentValue?moment(currentValue).format("YYYY-MM-DD"):currentValue }}
         </span>
       </Tooltip>
     </div>

package/packages/BaseGrid/src/index.vue

@@ -1,5 +1,5 @@
 <template>
-  <div :style="{ height: height - tagHeight - 10 + 'px' }">
+  <div :style="{ height: height + 'px' }">
     <div class="head-tag" v-if="tagData.length" ref="tagView">
       <a-tag
         closable
@@ -78,7 +78,7 @@
       :data="rows"
       :columns="internalColumns"
       class="base-grid-view"
-      :height="'auto'"
+      :height="height - tagHeight"
       :maxHeight="expandHeight"
       :show-footer="showFooter"
       @scroll="bodyScroll"
@@ -170,6 +170,7 @@
       <template #text_edit="scope">
         <div class="interceptor-class">
           <a-input
+              v-if="scope.column.params.controlEdit === true"
             class="inner-cell-control"
             size="small"
             v-model="scope.row[scope.column.property]"
@@ -177,6 +178,9 @@
             type="text"
             :disabled="editDisabled(scope)"
           />
+          <div v-else>
+            {{ gridDefaultValueDisplay(scope.row, scope.column) }}
+          </div>
         </div>
       </template>
       <template #checkbox_edit="scope">
@@ -411,7 +415,7 @@
       </template>
       <!-- 筛选过滤 -->
       <template #text_filter="scope">
-        <div class="interceptor-class">
+        <div class="interceptor-filter-class">
           <div
             :class="scope.column.field + '_filter_' + $index"
             v-for="(loopFilterValue, $index) in scope.column.filters[0].data
@@ -434,7 +438,7 @@
         </div>
       </template>
       <template #customCell_filter="scope">
-        <div class="interceptor-class">
+        <div class="interceptor-filter-class">
           <div
             :class="scope.column.field + '_filter_' + $index"
             v-for="(loopFilterValue, $index) in scope.column.filters[0].data
@@ -457,7 +461,7 @@
         </div>
       </template>
       <template #pulldown_filter="scope">
-        <div class="interceptor-class">
+        <div class="interceptor-filter-class">
           <div
             :class="scope.column.field + '_filter_' + $index"
             v-for="(loopFilterValue, $index) in scope.column.filters[0].data
@@ -480,7 +484,7 @@
         </div>
       </template>
       <template #number_filter="scope">
-        <div class="interceptor-class">
+        <div class="interceptor-filter-class">
           <div
             :class="scope.column.field + '_filter_' + $index"
             v-for="(loopFilterValue, $index) in scope.column.filters[0].data
@@ -510,7 +514,7 @@
         </div>
       </template>
       <template #select_filter="scope">
-        <div class="interceptor-class">
+        <div class="interceptor-filter-class">
           <a-checkbox-group
             v-model="scope.column.filters[0].data.displayValues"
             @keyup.enter.native="filterConfirm(scope.column)"
@@ -552,7 +556,7 @@
         </div>
       </template>
       <template #multiSelect_filter="scope">
-        <div class="interceptor-class">
+        <div class="interceptor-filter-class">
           <a-checkbox-group
             v-model="scope.column.filters[0].data.displayValues"
             @keyup.enter.native="filterConfirm(scope.column)"
@@ -594,7 +598,7 @@
         </div>
       </template>
       <template #checkbox_filter="scope">
-        <div class="interceptor-class">
+        <div class="interceptor-filter-class">
           <a-checkbox-group
             v-model="scope.column.filters[0].data.displayValues"
             @keyup.enter.native="filterConfirm(scope.column)"
@@ -628,7 +632,7 @@
         </div>
       </template>
       <template #datetime_filter="scope">
-        <div class="interceptor-class">
+        <div class="interceptor-filter-class">
           <div
             :class="scope.column.field + '_filter_' + $index"
             v-for="(loopFilterValue, $index) in scope.column.filters[0].data
@@ -672,7 +676,7 @@
         </div>
       </template>
       <template #date_filter="scope">
-        <div class="interceptor-class">
+        <div class="interceptor-filter-class">
           <div
             :class="scope.column.field + '_filter_' + $index"
             v-for="(loopFilterValue, $index) in scope.column.filters[0].data
@@ -1311,7 +1315,10 @@ export default {
       this.$refs.baseGrid.clearRowExpand()
     },
     tagChange() {
-      if (!this.$refs.tagView) return
+      if (!this.$refs.tagView) {
+        this.tagHeight = 0
+        return
+      }
       this.tagHeight = this.$refs.tagView.offsetHeight
     },
     // 取消当前字段筛选
@@ -2841,27 +2848,29 @@ export default {
         return footerData
       }else{
         if (this.footerSum.length > 0) {
-          return [
-            columns.map((column, columnIndex) => {
-              if (columnIndex === 0) {
-                return '合计'
-              }
-              if (this.footerSum.includes(column.property)) {
-                let tempSumVal = XEUtils.sum(data, column.property)
-                if (
-                  column.formatter &&
-                  column.formatter !== 'defaultFormat' &&
-                  VXETable.formats.store[column.formatter]
-                ) {
-                  tempSumVal = VXETable.formats.store[column.formatter]({
-                    cellValue: tempSumVal,
-                  })
+          if (this.footerSum.length > 0) {
+            let tempResult = [
+              columns.map((column, columnIndex) => {
+                if (columnIndex === 0) {
+                  return '合计'
                 }
-                return tempSumVal
-              }
-              return null
-            }),
-          ]
+                if (this.footerSum.includes(column.property)) {
+                  let tempSumVal = XEUtils.sum(data, column.property)
+                  if (
+                      column.formatter &&
+                      column.formatter !== 'defaultFormat' &&
+                      VXETable.formats.store[column.formatter]
+                  ) {
+                    tempSumVal = VXETable.formats.store[column.formatter]({
+                      cellValue: tempSumVal,
+                    })
+                  }
+                  return tempSumVal
+                }
+                return null
+              }),
+            ]
+            return tempResult
         } else {
           return []
         }
@@ -3669,7 +3678,15 @@ export default {
 }
 
 .interceptor-class {
-  // padding: 10px;
+  ::v-deep .ant-btn {
+    margin: 10px 10px 0;
+  }
+  ::v-deep .ant-calendar-picker {
+    margin: 0 5px;
+  }
+}
+.interceptor-filter-class {
+  padding: 10px;
   ::v-deep .ant-btn {
     margin: 10px 10px 0;
   }

package/packages/styles/default.less

@@ -84,6 +84,9 @@
 }
 
 .vxe-table--render-default .vxe-cell{
-  padding-left:5px;
-  padding-right:5px;
+  padding-left:2px!important;
+  padding-right:2px!important;
 }
+.grid-valid-display{
+  padding-left:3px;
+}