vsyswin-ui 0.2.71 → 0.2.74

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "vsyswin-ui",
-    "version": "0.2.71",
+    "version": "0.2.74",
     "main": "lib/vsyswin-ui.umd.min.js",
     "private": false,
     "description": "Vue2.x的应用组件库.",

package/packages/search-bar/src/search-bar.scss

@@ -87,6 +87,10 @@
     z-index: $--zindex-modal;
     overflow: hidden;
 
+    ::v-deep .el-range-editor--small .el-range-separator {
+      line-height: 28px;
+    }
+
     @include e(wrap) {
       border: $--border-base;
       border-bottom: none;

package/packages/search-bar/src/search-bar.vue

@@ -48,6 +48,7 @@
                       type="daterange"
                       v-model="item.value"
                       size="small"
+                      :picker-options="item.pickerOptions && pickerOptions"
                       range-separator="至"
                       start-placeholder="开始日期"
                       end-placeholder="结束日期"
@@ -92,6 +93,7 @@
                       type="datetimerange"
                       v-model="item.value"
                       size="small"
+                      :picker-options="item.pickerOptions && pickerOptions"
                       :format="item.format ? item.format : 'yyyy-MM-dd HH:mm:ss'"
                       :default-time="['00:00:00', '23:59:59']"
                       :unlink-panels="true"
@@ -153,6 +155,7 @@
                       type="daterange"
                       v-model="item.value"
                       size="small"
+                      :picker-options="item.pickerOptions && pickerOptions"
                       range-separator="至"
                       start-placeholder="开始日期"
                       end-placeholder="结束日期"
@@ -197,6 +200,7 @@
                       type="datetimerange"
                       v-model="item.value"
                       size="small"
+                      :picker-options="item.pickerOptions && pickerOptions"
                       :format="item.format ? item.format : 'yyyy-MM-dd HH:mm:ss'"
                       :default-time="['00:00:00', '23:59:59']"
                       :unlink-panels="true"
@@ -226,6 +230,9 @@
                       <el-option v-for="opt in item.options" :key="opt.id" :label="opt.label" :value="opt.value"></el-option>
                     </el-select>
                   </template>
+                  <template v-else-if="item.type === 'slot'">
+                    <slot :name="item.slot" :item="item">内容为空</slot>
+                  </template>
                 </li>
               </ul>
             </div>
@@ -254,6 +261,7 @@
                           type="daterange"
                           v-model="item.value"
                           size="small"
+                          :picker-options="item.pickerOptions && pickerOptions"
                           range-separator="至"
                           start-placeholder="开始日期"
                           end-placeholder="结束日期"
@@ -286,6 +294,7 @@
                           type="datetimerange"
                           v-model="item.value"
                           size="small"
+                          :picker-options="item.pickerOptions && pickerOptions"
                           :format="item.format ? item.format : 'yyyy-MM-dd HH:mm:ss'"
                           :default-time="['00:00:00', '23:59:59']"
                           :unlink-panels="true"
@@ -391,7 +400,10 @@ export default {
         function clickHandler(e) {
           // 这里判断点击的元素是否是本身，是本身，则返回
           if (el.contains(e.target)) {
-            return false
+            const btnsBox = el.querySelector('.syswin-searchbar-container__listBtns') // 点击右侧的按钮时也要隐藏所有条件面板
+            if (!btnsBox.contains(e.target)) {
+              return false
+            }
           }
           // 判断指令中是否绑定了函数
           if (binding.expression) {
@@ -415,7 +427,7 @@ export default {
     saveToLocal: {
       // 搜索条件保存到本地
       type: Boolean,
-      default: true
+      default: false
     },
     searchList: {
       type: Array,
@@ -454,6 +466,10 @@ export default {
       // 自定义条件标签的显示
       type: Boolean,
       default: false
+    },
+    maxConditionLength: {
+      type: Number,
+      default: 4
     }
   },
   data() {
@@ -461,13 +477,51 @@ export default {
       keyword: '',
       currentSearchList: [],
       shrinkFilterList: false,
-      maxConditionLength: 4,
       conditionList: [],
       conditionValue: '',
       currentData: {},
       dialogConditionVisible: false,
       hasSetDefaultTag: false, // 是否设置过默认tag
-      tagList: []
+      tagList: [],
+      pickerOptions: {
+        shortcuts: [
+          {
+            text: '今日',
+            onClick(picker) {
+              const end = new Date(new Date().setHours(0, 0, 0, 0) + 24 * 60 * 60 * 1000 - 1) // 今日23:59:59的时间
+              const start = new Date(new Date().setHours(0, 0, 0, 0)) // 今日0点
+              picker.$emit('pick', [start, end])
+            }
+          },
+          {
+            text: '最近三天',
+            onClick(picker) {
+              const end = new Date()
+              const start = new Date()
+              start.setTime(start.getTime() - 3600 * 1000 * 24 * 3)
+              picker.$emit('pick', [start, end])
+            }
+          },
+          {
+            text: '最近一周',
+            onClick(picker) {
+              const end = new Date()
+              const start = new Date()
+              start.setTime(start.getTime() - 3600 * 1000 * 24 * 7)
+              picker.$emit('pick', [start, end])
+            }
+          },
+          {
+            text: '最近一个月',
+            onClick(picker) {
+              const end = new Date()
+              const start = new Date()
+              start.setTime(start.getTime() - 3600 * 1000 * 24 * 30)
+              picker.$emit('pick', [start, end])
+            }
+          }
+        ]
+      }
     }
   },
   computed: {},
@@ -837,7 +891,7 @@ export default {
         // 先清空所有标签
         currentSearchList.forEach((ele) => {
           ele.itemList.forEach((item) => {
-            item.isActive = (['daterange', 'monthrange'].includes(item.type)) && (item.value = null)
+            item.isActive = ['daterange', 'monthrange'].includes(item.type) && (item.value = null)
           })
         })
 
@@ -854,7 +908,8 @@ export default {
                       v.id === ele.id && ['daterange', 'monthrange'].includes(v.type) && (v.value = ele.value)
                     } else {
                       // 单选
-                      v.isActive = v.id === ele.id && [('daterange', 'monthrange')].includes(v.type) && (v.value = v.id === ele.id ? ele.value : null)
+                      v.isActive = v.id === ele.id
+                      v.id === ele.id && [('daterange', 'monthrange')].includes(v.type) && (v.value = v.id === ele.id ? ele.value : null)
                     }
                   } else if (v.type === 'slot') {
                     v.setValue && v.setValue({ value: ele.value, name: ele.name, ...ele })