doway-coms 1.1.79 → 1.1.81

package/.browserslistrc

@@ -1,2 +1,2 @@
-> 1%
-last 2 versions
+> 1%
+last 2 versions

package/README.md

@@ -1,24 +1,24 @@
-# doway-coms
-
-## Project setup
-```
-npm install
-```
-
-### Compiles and hot-reloads for development
-```
-npm run serve
-```
-
-### Compiles and minifies for production
-```
-npm run build
-```
-
-### Lints and fixes files
-```
-npm run lint
-```
-
-### Customize configuration
-See [Configuration Reference](https://cli.vuejs.org/config/).
+# doway-coms
+
+## Project setup
+```
+npm install
+```
+
+### Compiles and hot-reloads for development
+```
+npm run serve
+```
+
+### Compiles and minifies for production
+```
+npm run build
+```
+
+### Lints and fixes files
+```
+npm run lint
+```
+
+### Customize configuration
+See [Configuration Reference](https://cli.vuejs.org/config/).

package/package.json

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

package/packages/BaseGrid/src/index.vue

@@ -225,7 +225,7 @@
         >
       </template>
       <template #operation_edit="scope">
-        <div class="interceptor-class">
+        <div>
           <a-button
             type="link"
             @click="operationButtonClick(item, scope)"
@@ -307,9 +307,15 @@
             :key="$index"
           >
             <a-input-number
-              style="width: 100%"
-              v-model:value="loopFilterValue.value[0]"
-            ></a-input-number>
+              :precision="0"
+              size="small"
+              v-model="loopFilterValue.value[0]"
+            />~
+            <a-input-number
+              :precision="0"
+              size="small"
+              v-model="loopFilterValue.value[1]"
+            />
           </div>
           <a-button @click="filterAddExp(scope.column)">添加条件</a-button>
           <a-button @click="filterConfirm(scope.column)">确认</a-button>
@@ -317,17 +323,31 @@
       </template>
       <template #select_filter="scope">
         <div class="interceptor-class">
-          <a-checkbox-group
-            v-model="scope.column.filters[0].data.displayValues"
+          <!--            <a-checkbox-group v-model="scope.column.filters[0].data.displayValues">-->
+          <!--              <a-checkbox-->
+          <!--                v-for="loopData in scope.column.params.dataSource"-->
+          <!--                :key="loopData.value"-->
+          <!--                :value="loopData.value"-->
+          <!--              >-->
+          <!--                {{ loopData.caption }}</a-checkbox-->
+          <!--              >-->
+          <!--            </a-checkbox-group>-->
+          <a-select
+              v-model="scope.column.filters[0].data.displayValues"
+              mode="multiple"
+              allowClear
+              style="width: 300px;"
+              placeholder="筛选条件"
+              showArrow
           >
-            <a-checkbox
-              v-for="loopData in scope.column.params.dataSource"
-              :key="loopData.value"
-              :value="loopData.value"
-            >
-              {{ loopData.caption }}</a-checkbox
+            <a-select-option
+                v-for="loopSource in scope.column.params.dataSource"
+                :key="loopSource.value"
+                :value="loopSource.value"
+            >{{ loopSource.caption }}</a-select-option
             >
-          </a-checkbox-group>
+          </a-select>
+          <br>
           <a-button @click="filterConfirm(scope.column)">确认</a-button>
         </div>
       </template>
@@ -364,9 +384,9 @@
               v-model="loopFilterValue.value[1]"
             />
           </div>
+          <a-button @click="filterAddExp(scope.column)">添加条件</a-button>
+          <a-button @click="filterConfirm(scope.column)">确认</a-button>
         </div>
-        <a-button @click="filterAddExp(scope.column)">添加条件</a-button>
-        <a-button @click="filterConfirm(scope.column)">确认</a-button>
       </template>
       <template #date_filter="scope">
         <div class="interceptor-class">
@@ -389,9 +409,9 @@
               v-model="loopFilterValue.value[1]"
             />
           </div>
+          <a-button @click="filterAddExp(scope.column)">添加条件</a-button>
+          <a-button @click="filterConfirm(scope.column)">确认</a-button>
         </div>
-        <a-button @click="filterAddExp(scope.column)">添加条件</a-button>
-        <a-button @click="filterConfirm(scope.column)">确认</a-button>
       </template>
     </VxeGrid>
     <VxeModal
@@ -2213,6 +2233,7 @@ export default {
       });
     },
     filterConfirm(colInfo) {
+      console.log(colInfo);
       colInfo.filters[0].data.bindingValues = [];
       XEUtils.arrayEach(colInfo.filters[0].data.displayValues, (item) => {
         if (colInfo.params.controlType === controlType.select) {
@@ -2296,6 +2317,18 @@ export default {
                 expStr = "小于等于";
               }
               break;
+            case controlType.number:
+              tempPushExp.operator = "RA";
+              tempPushExp.value = loopBindingValue.value;
+              console.log(tempPushExp);
+              expStr = "范围";
+              tempStr.exp =
+                tempStr.exp +
+                loopBindingValue.value[0] +
+                "到" +
+                loopBindingValue.value[1] +
+                "或";
+              break;
             default:
               tempPushExp.value = loopBindingValue.value[0];
               expStr = "包含";
@@ -2324,9 +2357,6 @@ export default {
         }
         //设置第一个输入框光标选中
         let tempClassName = column.field + "_filter_0";
-        console.log(tempClassName);
-        console.log(document);
-        console.log(document.getElementsByClassName(tempClassName)[0]);
         setTimeout(() => {
           document
             .getElementsByClassName(tempClassName)[0]
@@ -2378,82 +2408,95 @@ export default {
 }
 </style>
   <style lang="scss" scoped>
-.base-grid-view .vxe-header--row .vxe-header--column.sortable-ghost,
-.base-grid-view .vxe-header--row .vxe-header--column.sortable-chosen {
-  background-color: #dfecfb;
-}
-.base-grid-view .vxe-header--row .vxe-header--column.col--fixed {
-  cursor: no-drop;
-}
-.inner-cell-control {
-  width: 100% !important;
-  min-width: unset !important;
-}
-.input-box {
-  width: 100%;
-  border: 1px solid;
-  min-height: 24px;
-  border-radius: 4px;
-  border-color: rgb(217, 217, 217);
-  padding-left: 5px;
-  line-height: 24px !important;
-}
-.test_filter {
-  text-align: left;
-  // display: inline-block;
-  // width:90%
-}
-.test_filter_title {
-  margin-left: 2%;
-}
-/*滚动条整体部分*/
-.base-grid-view ::-webkit-scrollbar {
-  width: 10px;
-  height: 10px;
-  z-index: 10;
-}
-/*滚动条的轨道*/
-.base-grid-view ::-webkit-scrollbar-track {
-  background-color: #ffffff;
-  z-index: 10;
-}
-/*滚动条里面的小方块，能向上向下移动*/
-.base-grid-view ::-webkit-scrollbar-thumb {
-  background-color: #bfbfbf;
-  border-radius: 5px;
-  border: 1px solid #f1f1f1;
-  box-shadow: inset 0 0 6px rgba(0, 0, 0, 0.3);
-  z-index: 10;
-}
-.base-grid-view ::-webkit-scrollbar-thumb:hover {
-  background-color: #a8a8a8;
-  z-index: 10;
-}
-.base-grid-view ::-webkit-scrollbar-thumb:active {
-  background-color: #787878;
-  z-index: 10;
-}
-/*边角，即两个滚动条的交汇处*/
-.base-grid-view ::-webkit-scrollbar-corner {
-  background-color: #ffffff;
-  z-index: 10;
-}
-.draggableItem {
-  display: inline-block;
-  height: 100%;
-  line-height: 30px;
-  border: 1.3px solid #e8eaec;
-  margin: 0 !important;
-  margin: 0 10px;
-  // overflow: hidden;
-  // text-overflow: ellipsis;
-  // white-space: nowrap;
-}
-.sortable-column-demo .vxe-header--row .vxe-header--column.sortable-ghost,
-.sortable-column-demo .vxe-header--row .vxe-header--column.sortable-chosen {
-  background-color: #dfecfb;
-}
-.sortable-column-demo .vxe-header--row .vxe-header--column.col--fixed {
-  cursor: no-drop;
-}
-</style>
+  .base-grid-view .vxe-header--row .vxe-header--column.sortable-ghost,
+  .base-grid-view .vxe-header--row .vxe-header--column.sortable-chosen {
+    background-color: #dfecfb;
+  }
+  .base-grid-view .vxe-header--row .vxe-header--column.col--fixed {
+    cursor: no-drop;
+  }
+  .inner-cell-control {
+    width: 100% !important;
+    min-width:unset!important;
+  }
+  .input-box {
+    width: 100%;
+    border: 1px solid;
+    min-height: 24px;
+    border-radius: 4px;
+    border-color: rgb(217, 217, 217);
+    padding-left: 5px;
+    line-height: 24px !important;
+  }
+  .test_filter {
+    text-align: left;
+    // display: inline-block;
+    // width:90%
+  }
+  .test_filter_title {
+    margin-left: 2%;
+  }
+  /*滚动条整体部分*/
+  .base-grid-view ::-webkit-scrollbar {
+    width: 10px;
+    height: 10px;
+    z-index: 10;
+  }
+  /*滚动条的轨道*/
+  .base-grid-view ::-webkit-scrollbar-track {
+    background-color: #ffffff;
+    z-index: 10;
+  }
+  /*滚动条里面的小方块，能向上向下移动*/
+  .base-grid-view ::-webkit-scrollbar-thumb {
+    background-color: #bfbfbf;
+    border-radius: 5px;
+    border: 1px solid #f1f1f1;
+    box-shadow: inset 0 0 6px rgba(0, 0, 0, 0.3);
+    z-index: 10;
+  }
+  .base-grid-view ::-webkit-scrollbar-thumb:hover {
+    background-color: #a8a8a8;
+    z-index: 10;
+  }
+  .base-grid-view ::-webkit-scrollbar-thumb:active {
+    background-color: #787878;
+    z-index: 10;
+  }
+  /*边角，即两个滚动条的交汇处*/
+  .base-grid-view ::-webkit-scrollbar-corner {
+    background-color: #ffffff;
+    z-index: 10;
+  }
+  .draggableItem {
+    display: inline-block;
+    height: 100%;
+    line-height: 30px;
+    border: 1.3px solid #e8eaec;
+    margin: 0 !important;
+    margin: 0 10px;
+    // overflow: hidden;
+    // text-overflow: ellipsis;
+    // white-space: nowrap;
+  }
+  .sortable-column-demo .vxe-header--row .vxe-header--column.sortable-ghost,
+  .sortable-column-demo .vxe-header--row .vxe-header--column.sortable-chosen {
+    background-color: #dfecfb;
+  }
+  .sortable-column-demo .vxe-header--row .vxe-header--column.col--fixed {
+    cursor: no-drop;
+  }
+
+  .interceptor-class {
+    padding: 10px;
+    ::v-deep .ant-btn {
+      margin: 10px 10px 0;
+    }
+    ::v-deep .ant-input {
+      margin-bottom: 5px;
+    }
+    ::v-deep .ant-calendar-picker {
+      margin: 0 5px;
+    }
+  }
+  </style>

package/packages/BaseGridAdjust/src/index.vue

@@ -12,7 +12,7 @@
       </template>
       <template #checkbox="{ column }">
         <a-checkbox
-          v-model:checked="column.params.show"
+          v-model="column.params.show"
           @change="changeCheckbox(column)"
         ></a-checkbox>
         {{ column.title }}