doway-coms 1.6.0 → 1.6.1

package/package.json

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

package/packages/BaseGantt/src/index.vue

@@ -121,6 +121,8 @@
           <div
               v-for="loopItem in row.items"
               :key="loopItem.id"
+              :name="'gantt-bar'+loopItem.taskId"
+              :id="'gantt-bar'+loopItem.id"
               class="gantt-bar"
               @mouseenter="ganttBarMouseEnter($event, loopItem, rowIndex)"
               @mouseleave="ganttBarMouseLeave($event, loopItem)"
@@ -448,9 +450,11 @@ export default {
           evt.clientY + evt.target.offsetHeight - evt.offsetY // (rowIndex + 1) * this.rowHeight
       this.ganttBarTooltip.item = ordInfo
       this.ganttBarTooltip.show = true
+      this.$emit('mouseEnter',ordInfo)
     },
     ganttBarMouseLeave(evt, ordInfo) {
       this.ganttBarTooltip.show = false
+      this.$emit('mouseLeave',ordInfo)
     },
     bodyScroll(scrollInfo) {
       if (scrollInfo.isX === true) {

package/packages/BaseGrid/src/index.vue

@@ -364,41 +364,47 @@
       </template>
       <template #select_filter="scope">
         <div class="interceptor-class">
-              <a-checkbox-group
-                  v-model="scope.column.filters[0].data.displayValues"
-                  @keyup.enter.native="filterConfirm(scope.column)"
-              >
-              <a-input placeholder="请输入搜索内容" @change="displayValueSearchTextChange(scope.column)" v-model="scope.column.filters[0].data.displayValueSearchText"  :addon-before="'已选'+scope.column.filters[0].data.displayValues.length"/>
-                <div style="max-height:200px;overflow-y:scroll">
-                <div style="text-align:left;" v-for="loopSource in scope.column.params.dataSource" :key="loopSource.value">
-                  <a-checkbox
-                     v-show="loopSource.caption.indexOf(scope.column.filters[0].data.displayValueSearchText)>-1"
-                    :value="loopSource.value"
-                    style="margin: 5px 0;"
-                  >{{ loopSource.caption }}
-                  </a-checkbox>
-                </div>
+          <a-checkbox-group
+            v-model="scope.column.filters[0].data.displayValues"
+            @keyup.enter.native="filterConfirm(scope.column)"
+          >
+            <a-input placeholder="请输入搜索内容" @change="displayValueSearchTextChange(scope.column)" v-model="scope.column.filters[0].data.displayValueSearchText"  :addon-before="'已选'+scope.column.filters[0].data.displayValues.length"/>
+            <div style="max-height:200px;overflow-y:scroll">
+              <div style="text-align:left;" v-for="loopSource in scope.column.params.dataSource" :key="loopSource.value">
+                <a-checkbox
+                  v-show="loopSource.caption.indexOf(scope.column.filters[0].data.displayValueSearchText)>-1"
+                  :value="loopSource.value"
+                  style="margin: 5px 0;"
+                >{{ loopSource.caption }}
+                </a-checkbox>
               </div>
-              </a-checkbox-group>
-<!--          <a-select-->
-<!--              v-model="scope.column.filters[0].data.displayValues"-->
-<!--              mode="multiple"-->
-<!--              allowClear-->
-<!--              style="width: 300px;"-->
-<!--              placeholder="筛选条件"-->
-<!--              showArrow-->
-<!--          >-->
-<!--            <a-select-option-->
-<!--                v-for="loopSource in scope.column.params.dataSource"-->
-<!--                :key="loopSource.value"-->
-<!--                :value="loopSource.value"-->
-<!--            >{{ loopSource.caption }}</a-select-option-->
-<!--            >-->
-<!--          </a-select>-->
+            </div>
+          </a-checkbox-group>
           <br>
           <a-button @click="filterConfirm(scope.column)">确认</a-button>
         </div>
       </template>
+      <template #checkbox_filter="scope">
+        <div class="interceptor-class">
+          <a-checkbox-group
+            v-model="scope.column.filters[0].data.displayValues"
+            @keyup.enter.native="filterConfirm(scope.column)"
+          >
+            <div style="max-height:200px;overflow-y:scroll">
+              <div style="text-align:left;" v-for="loopSource in scope.column.params.dataSource" :key="loopSource.value">
+                <a-checkbox
+                  v-show="loopSource.caption.indexOf(scope.column.filters[0].data.displayValueSearchText)>-1"
+                  :value="loopSource.value"
+                  style="margin: 5px 0;"
+                >{{ loopSource.caption }}
+                </a-checkbox>
+              </div>
+            </div>
+          </a-checkbox-group>
+        <br>
+        <a-button @click="filterConfirm(scope.column)">确认</a-button>
+        </div>
+      </template>
       <template #datetime_filter="scope">
         <div class="interceptor-class">
           <div
@@ -1342,7 +1348,12 @@ export default {
       if (!originCol.controlType) {
         originCol.controlType = controlType.text;
       }
-
+      if (originCol.controlType === controlType.checkbox) {
+        originCol.dataSource = [
+          {caption:'是',value: true},
+          {caption:'否',value: false}
+        ]
+      }
       if (originCol.controlType === controlType.customRadio) {
         colInfo["type"] = "radio";
         customSlot["radio"] = "customRadio";
@@ -2349,7 +2360,7 @@ export default {
       this.$set(col.filters[0].data,'bindingValues',[])
       colInfo.filters[0].data.bindingValues = [];
       XEUtils.arrayEach(colInfo.filters[0].data.displayValues, (item) => {
-        if (colInfo.params.controlType === controlType.select) {
+        if (colInfo.params.controlType === controlType.select || colInfo.params.controlType === controlType.checkbox) {
           colInfo.filters[0].data.bindingValues.push(item);
           this.$set(col.filters[0].data,'bindingValues',colInfo.filters[0].data.bindingValues)
         } else {
@@ -2435,7 +2446,7 @@ export default {
         //筛选条件过滤
         let colFilterExpression = { operator: "or", expressions: [] };
 
-        if (loopColInfo.params.controlType === controlType.select) {
+        if (loopColInfo.params.controlType === controlType.select || loopColInfo.params.controlType === controlType.checkbox) {
           colFilterExpression.expressions.push({
             field: loopColInfo.field,
             operator: "IN",
@@ -2691,9 +2702,6 @@ export default {
     ::v-deep .ant-btn {
       margin: 10px 10px 0;
     }
-    ::v-deep .ant-input {
-      margin-bottom: 5px;
-    }
     ::v-deep .ant-calendar-picker {
       margin: 0 5px;
     }