doway-coms 2.11.52 → 2.11.56

package/package.json

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

package/packages/BaseGrid/src/index.vue

@@ -2144,6 +2144,9 @@ export default {
         colInfo.width = 100
       }
 
+      // 设置最小列宽为60px
+      colInfo.minWidth = originCol.minWidth || 60
+
       if (originCol.controlType === 'operation') {
         customSlot['default'] = 'operation_edit'
       }
@@ -3662,6 +3665,28 @@ export default {
           }
           switch (tempControlType) {
             case controlType.date:
+              if (loopBindingValue.value[0] && loopBindingValue.value[1]) {
+                tempPushExp.operator = 'RA'
+                tempPushExp.value = [loopBindingValue.value[0]+' 00:00:00',loopBindingValue.value[1]+' 23:59:59']
+                expStr = '范围'
+                tempStr.exp =
+                  tempStr.exp +
+                  loopBindingValue.value[0] +
+                  '到' +
+                  loopBindingValue.value[1] +
+                  '或'
+              } else if (loopBindingValue.value[0]) {
+                tempPushExp.operator = 'GE'
+                tempPushExp.value = loopBindingValue.value[0] +' 00:00:00'
+                tempStr.exp = tempStr.exp + tempPushExp.value + '或'
+                expStr = '大于等于'
+              } else {
+                tempPushExp.operator = 'LE'
+                tempPushExp.value = loopBindingValue.value[1] +' 23:59:59'
+                tempStr.exp = tempStr.exp + tempPushExp.value + '或'
+                expStr = '小于等于'
+              }
+              break
             case controlType.datetime:
               if (loopBindingValue.value[0] && loopBindingValue.value[1]) {
                 tempPushExp.operator = 'RA'
@@ -4313,3 +4338,31 @@ export default {
   display: none !important;
 }
 </style>
+<style lang="less" scoped>
+// ... existing code ...
+::v-deep .vxe-cell--filter, ::v-deep .vxe-cell--sort {
+  white-space: nowrap;
+  //display: inline-block;
+  display: inline-flex;
+  flex-shrink: 0;
+}
+
+::v-deep .vxe-cell--title {
+  white-space: normal; /* 允许标题换行 */
+  word-break: break-word;
+  display: flex;
+  align-items: center;
+  flex: 1;
+  margin-right: 4px;
+}
+
+::v-deep .vxe-cell--sort-wrapper {
+  display: inline-flex;
+}
+
+::v-deep .vxe-cell {
+  display: flex !important;
+  align-items: center !important;
+  justify-content: flex-start !important;
+}
+</style>

package/packages/styles/hps/default.less

@@ -23,9 +23,15 @@
   border-left:2px solid #a7a6a6!important;
 }
 // 筛选图标颜色
-.vxe-filter--btn.vxe-icon-funnel{
+.vxe-cell--filter .vxe-filter--btn{
   color:black!important;
 }
+.is--filter-active .vxe-cell--filter .vxe-filter--btn{
+  color:#409eff!important;  
+}
+// .vxe-filter--btn.vxe-icon-funnel{
+//   color:black!important;
+// }
 // //排序图标颜色
 // .vxe-sort--desc-btn.vxe-icon-caret-down{
 // color:black;