操作栏增加判断条件

Reviewed-on: #3

package.json

@@ -1,6 +1,6 @@
 {
   "name": "code-brick-zj",
-  "version": "0.0.5",
+  "version": "0.0.7",
   "private": false,
   "description": "组件封装",
   "main": "index.js"

src/components/BaseTable/index.vue

@@ -25,7 +25,7 @@
         prop="_pageIndex"
         :width="pageWidth"
         align="center"
-        fixed
+        :fixed="cancelPageFixed ? false : true"
       >
         <template slot="header">
           <el-popover placement="bottom-start" width="300" trigger="click">
@@ -121,6 +121,10 @@ export default {
       type: Boolean,
       default: false
     },
+    cancelPageFixed: {
+      type: Boolean,
+      default: false
+    },
     tableData: {
       type: Array,
       required: true,
@@ -205,6 +209,9 @@ export default {
       let _this = this
       let obj = _this.$refs[name].data[index]
       _this.$refs[name].setCurrentRow(obj)
+    },
+    doLayout(name) {
+      this.$refs[name].doLayout()
     }
   }
 }

src/components/BaseTable/subcomponents/MethodBtn.vue

@@ -95,6 +95,13 @@ export default {
       let showStatus = true
       const showStatusArr = showParam.data.map((item) => {
         let showStatusItem = true
+        if (item.type === 'have') {
+          if (row[item.name] !== item.value) {
+            showStatusItem = true
+          } else {
+            showStatusItem = false
+          }
+        }
         if (item.type === 'unequal') {
           if (row[item.name] !== item.value) {
             showStatusItem = true
@@ -123,6 +130,13 @@ export default {
             showStatusItem = false
           }
         }
+        if (item.type === 'have') {
+          if (row[item.name] !== item.value) {
+            showStatusItem = true
+          } else {
+            showStatusItem = false
+          }
+        }
         if (item.type === 'indexof') {
           if (item.value.indexOf(row[item.name]) >= 0) {
             showStatusItem = true

src/components/SearchBar/SearchBar.vue

@@ -101,6 +101,7 @@
           @click="headBtnClick(item.name)"
           >{{ item.btnName }}</el-button
         >
+        <span v-if="item.type === 'separate'" class="separateStyle"></span>
         <!-- 可用于显示其他按钮 -->
       </el-form-item>
     </template>
@@ -253,4 +254,15 @@ export default {
   font-size: 16px;
   color:#0B58FF;
 }
+.searchBar .el-input__prefix .el-icon-time {
+  font-size: 16px;
+  color:#0B58FF;
+}
+.searchBar .separateStyle {
+  display: inline-block;
+  width: 1px;
+  height: 24px;
+  background: #E8E8E8;
+  vertical-align: middle;
+}
 </style>