doway-coms 1.5.14 → 1.6.0

package/package.json

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

package/packages/BaseForm/src/index.vue

@@ -1,9 +1,10 @@
 <template>
   <div class="d-form-items">
+    <!-- <div @click="hiddenDetail = !hiddenDetail">展开</div> -->
     <div
       class="d-form-item"
       v-for="col in internalComputedHiddenCols"
-      :key="col.field"
+      :key="col.field" v-show="(hiddenDetail?colIndex===0:true)"
     >
       <!-- 文本框输入控件 -->
       <BaseInput
@@ -371,6 +372,7 @@ export default {
   filters: {},
   data() {
     return {
+      hiddenDetail:false,
       moment,
       editFormName: "",
       internalEdit: false,

package/packages/BaseGantt/src/index.vue

@@ -121,8 +121,6 @@
           <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)"
@@ -450,11 +448,9 @@ 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,47 +364,41 @@
       </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>
+              <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>
               </div>
-            </div>
-          </a-checkbox-group>
+              </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>-->
           <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
@@ -1348,12 +1342,7 @@ 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";
@@ -2360,7 +2349,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 || colInfo.params.controlType === controlType.checkbox) {
+        if (colInfo.params.controlType === controlType.select) {
           colInfo.filters[0].data.bindingValues.push(item);
           this.$set(col.filters[0].data,'bindingValues',colInfo.filters[0].data.bindingValues)
         } else {
@@ -2446,7 +2435,7 @@ export default {
         //筛选条件过滤
         let colFilterExpression = { operator: "or", expressions: [] };
 
-        if (loopColInfo.params.controlType === controlType.select || loopColInfo.params.controlType === controlType.checkbox) {
+        if (loopColInfo.params.controlType === controlType.select) {
           colFilterExpression.expressions.push({
             field: loopColInfo.field,
             operator: "IN",
@@ -2702,6 +2691,9 @@ 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;
     }

package/packages/BasePagination/src/index.vue

@@ -43,7 +43,7 @@
       pageSizeOptions: {
         type: Array,
         default: function() {
-          return [10, 20 ,50, 100, 150, 200]
+          return [10, 20 ,50, 100, 150, 200,500,1000]
         }
       },
       totalRows: {