bi-element-ui 0.1.71 → 0.1.72

package/src/components/BiDatePicker/datePickerOption.js

@@ -15,12 +15,8 @@ const pickerOptions = {
       {
         text: '昨天',
         onClick(picker) {
-          const end = moment()
-            .subtract(1, 'days')
-            .format('YYYY-MM-DD 23:59:59')
-          const start = moment()
-            .subtract(1, 'days')
-            .format('YYYY-MM-DD 00:00:00')
+          const end = moment().subtract(1, 'days').format('YYYY-MM-DD 23:59:59')
+          const start = moment().subtract(1, 'days').format('YYYY-MM-DD 00:00:00')
           picker.$emit('pick', [start, end])
         }
       },
@@ -28,9 +24,7 @@ const pickerOptions = {
         text: '近一周',
         onClick(picker) {
           const end = moment().format('YYYY-MM-DD 23:59:59')
-          const start = moment()
-            .subtract(7, 'days')
-            .format('YYYY-MM-DD 00:00:00')
+          const start = moment().subtract(7, 'days').format('YYYY-MM-DD 00:00:00')
           picker.$emit('pick', [start, end])
         }
       },
@@ -38,35 +32,23 @@ const pickerOptions = {
         text: '近一月',
         onClick(picker) {
           const end = moment().format('YYYY-MM-DD 23:59:59')
-          const start = moment()
-            .subtract(30, 'days')
-            .format('YYYY-MM-DD 00:00:00')
+          const start = moment().subtract(30, 'days').format('YYYY-MM-DD 00:00:00')
           picker.$emit('pick', [start, end])
         }
       },
       {
         text: '上个月',
         onClick(picker) {
-          const start = moment()
-            .startOf('month')
-            .subtract(1, 'month')
-            .format('YYYY-MM-DD 00:00:00')
-          const end = moment()
-            .endOf('month')
-            .subtract(1, 'month')
-            .format('YYYY-MM-DD 23:59:59')
+          const start = moment().startOf('month').subtract(1, 'month').format('YYYY-MM-DD 00:00:00')
+          const end = moment().endOf('month').subtract(1, 'month').format('YYYY-MM-DD 23:59:59')
           picker.$emit('pick', [start, end])
         }
       },
       {
         text: '本月',
         onClick(picker) {
-          const start = moment()
-            .startOf('month')
-            .format('YYYY-MM-DD 00:00:00')
-          const end = moment()
-            .endOf('month')
-            .format('YYYY-MM-DD 23:59:59')
+          const start = moment().startOf('month').format('YYYY-MM-DD 00:00:00')
+          const end = moment().endOf('month').format('YYYY-MM-DD 23:59:59')
           picker.$emit('pick', [start, end])
         }
       }
@@ -77,64 +59,40 @@ const pickerOptions = {
       {
         text: '本月',
         onClick(picker) {
-          const start = moment()
-            .startOf('month')
-            .format('YYYY-MM-DD')
-          const end = moment()
-            .endOf('month')
-            .format('YYYY-MM-DD')
+          const start = moment().startOf('month').format('YYYY-MM-DD')
+          const end = moment().endOf('month').format('YYYY-MM-DD')
           picker.$emit('pick', [start, end])
         }
       },
       {
         text: '最近三个月',
         onClick(picker) {
-          const start = moment()
-            .subtract(2, 'month')
-            .startOf('month')
-            .format('YYYY-MM-DD')
-          const end = moment()
-            .endOf('month')
-            .format('YYYY-MM-DD')
+          const start = moment().subtract(2, 'month').startOf('month').format('YYYY-MM-DD')
+          const end = moment().endOf('month').format('YYYY-MM-DD')
           picker.$emit('pick', [start, end])
         }
       },
       {
         text: '最近六个月',
         onClick(picker) {
-          const start = moment()
-            .subtract(5, 'month')
-            .startOf('month')
-            .format('YYYY-MM-DD')
-          const end = moment()
-            .endOf('month')
-            .format('YYYY-MM-DD')
+          const start = moment().subtract(5, 'month').startOf('month').format('YYYY-MM-DD')
+          const end = moment().endOf('month').format('YYYY-MM-DD')
           picker.$emit('pick', [start, end])
         }
       },
       {
         text: '最近一年',
         onClick(picker) {
-          const start = moment()
-            .subtract(11, 'month')
-            .startOf('month')
-            .format('YYYY-MM-DD')
-          const end = moment()
-            .endOf('month')
-            .format('YYYY-MM-DD')
+          const start = moment().subtract(11, 'month').startOf('month').format('YYYY-MM-DD')
+          const end = moment().endOf('month').format('YYYY-MM-DD')
           picker.$emit('pick', [start, end])
         }
       },
       {
         text: '今年',
         onClick(picker) {
-          const start = moment()
-            .startOf('year')
-            .startOf('month')
-            .format('YYYY-MM-DD')
-          const end = moment()
-            .endOf('month')
-            .format('YYYY-MM-DD')
+          const start = moment().startOf('year').startOf('month').format('YYYY-MM-DD')
+          const end = moment().endOf('month').format('YYYY-MM-DD')
           picker.$emit('pick', [start, end])
         }
       }
@@ -155,12 +113,8 @@ const pickerOptions = {
       {
         text: '昨天',
         onClick(picker) {
-          const end = moment()
-            .subtract(1, 'days')
-            .format('YYYY-MM-DD 23:59:59')
-          const start = moment()
-            .subtract(1, 'days')
-            .format('YYYY-MM-DD 00:00:00')
+          const end = moment().subtract(1, 'days').format('YYYY-MM-DD 23:59:59')
+          const start = moment().subtract(1, 'days').format('YYYY-MM-DD 00:00:00')
           picker.$emit('pick', [start, end])
         }
       },
@@ -168,9 +122,7 @@ const pickerOptions = {
         text: '近一周',
         onClick(picker) {
           const end = moment().format('YYYY-MM-DD 23:59:59')
-          const start = moment()
-            .subtract(7, 'days')
-            .format('YYYY-MM-DD 00:00:00')
+          const start = moment().subtract(7, 'days').format('YYYY-MM-DD 00:00:00')
           picker.$emit('pick', [start, end])
         }
       },
@@ -178,9 +130,7 @@ const pickerOptions = {
         text: '近一月',
         onClick(picker) {
           const end = moment().format('YYYY-MM-DD 23:59:59')
-          const start = moment()
-            .subtract(30, 'days')
-            .format('YYYY-MM-DD 00:00:00')
+          const start = moment().subtract(30, 'days').format('YYYY-MM-DD 00:00:00')
           picker.$emit('pick', [start, end])
         }
       },
@@ -188,24 +138,12 @@ const pickerOptions = {
         text: '上个月',
         onClick(picker) {
           if (picker.value !== null) {
-            const end = moment(picker.value[1])
-              .subtract(1, 'months')
-              .endOf('month')
-              .format('YYYY-MM-DD 23:59:59')
-            const start = moment(picker.value[0])
-              .subtract(1, 'months')
-              .startOf('month')
-              .format('YYYY-MM-DD 00:00:00')
+            const end = moment(picker.value[1]).subtract(1, 'months').endOf('month').format('YYYY-MM-DD 23:59:59')
+            const start = moment(picker.value[0]).subtract(1, 'months').startOf('month').format('YYYY-MM-DD 00:00:00')
             picker.$emit('pick', [start, end])
           } else {
-            const end = moment()
-              .subtract(1, 'months')
-              .endOf('month')
-              .format('YYYY-MM-DD 23:59:59')
-            const start = moment()
-              .subtract(1, 'months')
-              .startOf('month')
-              .format('YYYY-MM-DD 00:00:00')
+            const end = moment().subtract(1, 'months').endOf('month').format('YYYY-MM-DD 23:59:59')
+            const start = moment().subtract(1, 'months').startOf('month').format('YYYY-MM-DD 00:00:00')
             picker.$emit('pick', [start, end])
           }
         }
@@ -213,12 +151,8 @@ const pickerOptions = {
       {
         text: '本月',
         onClick(picker) {
-          const end = moment()
-            .endOf('month')
-            .format('YYYY-MM-DD 23:59:59')
-          const start = moment()
-            .startOf('month')
-            .format('YYYY-MM-DD 00:00:00')
+          const end = moment().endOf('month').format('YYYY-MM-DD 23:59:59')
+          const start = moment().startOf('month').format('YYYY-MM-DD 00:00:00')
           picker.$emit('pick', [start, end])
         }
       }

package/src/components/BiDatePicker/index.vue

@@ -1,21 +1,6 @@
 <template>
-  <el-date-picker
-    v-if="true"
-    v-model="date"
-    :picker-options="componentPickerOptions"
-    :format="format"
-    :value-format="valueFormat"
-    v-bind="$attrs"
-    v-on="$listeners"
-  >
-  </el-date-picker>
-  <el-date-picker
-    v-else
-    v-model="date"
-    type="date"
-    placeholder="选择日期"
-  >
-  </el-date-picker>
+  <el-date-picker v-if="true" v-model="date" :picker-options="componentPickerOptions" :format="format" :value-format="valueFormat" v-bind="$attrs" v-on="$listeners"> </el-date-picker>
+  <el-date-picker v-else v-model="date" type="date" placeholder="选择日期"> </el-date-picker>
 </template>
 
 <script>

package/src/components/BiTable/columu.vue

@@ -1,42 +1,19 @@
 <template>
-  <el-table-column
-    v-bind="column"
-    v-on="$listeners"
-  >
-    <template
-      slot="header"
-      slot-scope="scope"
-    >
-      <bi-render
-        v-if="column.renderHeader"
-        :scope="scope"
-        :render="column.renderHeader"
-      />
+  <el-table-column v-bind="column" v-on="$listeners">
+    <template slot="header" slot-scope="scope">
+      <bi-render v-if="column.renderHeader" :scope="scope" :render="column.renderHeader" />
       <span v-else>{{ scope.column.label }}</span>
     </template>
 
     <template slot-scope="scope">
-      <component
-        :is="column.component"
-        v-if="column.component"
-        v-bind="getCptBind(scope, column)"
-        v-on="column.listeners"
-      />
+      <component :is="column.component" v-if="column.component" v-bind="getCptBind(scope, column)" v-on="column.listeners" />
 
       <!-- 嵌套表格 -->
       <template v-else-if="column.children">
-        <free-column
-          v-for="col in column.children"
-          :key="col.prop"
-          :column="col"
-        />
+        <free-column v-for="col in column.children" :key="col.prop" :column="col" />
       </template>
 
-      <bi-render
-        v-else
-        :scope="scope"
-        :render="column.render"
-      />
+      <bi-render v-else :scope="scope" :render="column.render" />
     </template>
   </el-table-column>
 </template>

package/src/components/BiTable/forced.js

@@ -1,28 +1,15 @@
 // 这些选项不应该被覆盖
 export default {
   selection: {
-    renderHeader: function(h, { store }) {
-      return (
-        <el-checkbox
-          disabled={store.states.data && store.states.data.length === 0}
-          indeterminate={
-            store.states.selection.length > 0 && !this.isAllSelected
-          }
-          nativeOn-click={this.toggleAllSelection}
-          value={this.isAllSelected}
-        />
-      )
+    renderHeader: function (h, { store }) {
+      return <el-checkbox disabled={store.states.data && store.states.data.length === 0} indeterminate={store.states.selection.length > 0 && !this.isAllSelected} nativeOn-click={this.toggleAllSelection} value={this.isAllSelected} />
     },
-    renderCell: function(h, { row, column, store, $index }) {
+    renderCell: function (h, { row, column, store, $index }) {
       return (
         <el-checkbox
-          nativeOn-click={event => event.stopPropagation()}
+          nativeOn-click={(event) => event.stopPropagation()}
           value={store.isSelected(row)}
-          disabled={
-            column.selectable
-              ? !column.selectable.call(null, row, $index)
-              : false
-          }
+          disabled={column.selectable ? !column.selectable.call(null, row, $index) : false}
           on-input={() => {
             store.commit('rowSelectedChanged', row)
           }}
@@ -33,10 +20,10 @@ export default {
     resizable: false
   },
   index: {
-    renderHeader: function(h, { column }) {
+    renderHeader: function (h, { column }) {
       return column.label || '#'
     },
-    renderCell: function(h, { $index, column }) {
+    renderCell: function (h, { $index, column }) {
       let i = $index + 1
       const index = column.index
 
@@ -51,15 +38,15 @@ export default {
     sortable: false
   },
   expand: {
-    renderHeader: function(h, { column }) {
+    renderHeader: function (h, { column }) {
       return column.label || ''
     },
-    renderCell: function(h, { row, store }) {
+    renderCell: function (h, { row, store }) {
       const classes = ['el-table__expand-icon']
       if (store.states.expandRows.indexOf(row) > -1) {
         classes.push('el-table__expand-icon--expanded')
       }
-      const callback = function(e) {
+      const callback = function (e) {
         e.stopPropagation()
         store.toggleRowExpansion(row)
       }

package/src/components/BiTable/index.js

@@ -1,6 +1,6 @@
 import BiTable from './table.vue'
 
-BiTable.install = function(Vue) {
+BiTable.install = function (Vue) {
   Vue.component(BiTable.name, BiTable)
 }
 export default BiTable

package/src/components/BiTable/table.vue

@@ -1,43 +1,20 @@
 <template>
   <div class="bi-table">
     <div class="bi-table-wrapper">
-      <el-table
-        ref="elTable"
-        :data="data"
-        :max-height="maxHeight"
-        v-bind="$attrs"
-        v-on="$listeners"
-      >
+      <el-table ref="elTable" :data="data" :max-height="maxHeight" v-bind="$attrs" v-on="$listeners">
         <template v-for="item in tbColumns">
-          <el-table-column
-            v-if="item.slotScope"
-            :key="item.prop+item.label"
-            v-bind="item"
-            v-on="$listeners"
-          >
+          <el-table-column v-if="item.slotScope" :key="item.prop + item.label" v-bind="item" v-on="$listeners">
             <template slot-scope="scope">
-              <slot
-                :name="item.prop"
-                v-bind="scope"
-              ></slot>
+              <slot :name="item.prop" v-bind="scope"></slot>
             </template>
           </el-table-column>
 
-          <bi-column
-            v-else
-            :key="item.prop+item.label"
-            v-bind="$attrs"
-            :column="item"
-          />
+          <bi-column v-else :key="item.prop + item.label" v-bind="$attrs" :column="item" />
         </template>
       </el-table>
     </div>
     <template v-if="pagination">
-      <pagination
-        v-if="data.length > 0"
-        v-bind="$attrs"
-        v-on="$listeners"
-      />
+      <pagination v-if="data.length > 0" v-bind="$attrs" v-on="$listeners" />
     </template>
   </div>
 </template>

package/src/components/BiTableColumn/Group.vue

@@ -7,7 +7,7 @@
             <el-checkbox
               v-model="item.status"
               @change="
-                val => {
+                (val) => {
                   return handleCheckAllChange(val, item)
                 }
               "
@@ -20,7 +20,7 @@
               :true-label="1"
               :false-label="0"
               @change="
-                val => {
+                (val) => {
                   return handleCheckedColChange(val, item)
                 }
               "
@@ -29,9 +29,9 @@
                 v-for="(city, childrenIndex) in item.children"
                 :key="childrenIndex"
                 :label="city.name"
-                style="width:120px;margin:0 15px 15px 0;"
+                style="width: 120px; margin: 0 15px 15px 0"
                 @change="
-                  val => {
+                  (val) => {
                     return handleChange(val, city)
                   }
                 "
@@ -60,9 +60,7 @@
     </div>
     <span slot="footer" class="dialog-footer" style="display: flex; justify-content: space-between">
       <span style="display: inline-block; line-height: 32px">
-        <el-checkbox v-model="checkAllData" label="全选" @change="checkAll">
-          全选
-        </el-checkbox>
+        <el-checkbox v-model="checkAllData" label="全选" @change="checkAll"> 全选 </el-checkbox>
       </span>
       <el-button @click="dialogVisible = false">关闭</el-button>
     </span>
@@ -118,9 +116,9 @@ export default {
     },
     tableColumnList() {
       const obj = {}
-      this.colList.map(group => {
+      this.colList.map((group) => {
         if (group.children && group.children.length) {
-          group.children.map(item => {
+          group.children.map((item) => {
             obj[item.name] = Boolean(item.status)
           })
         } else {
@@ -175,7 +173,7 @@ export default {
   },
   methods: {
     granularityLabel() {
-      this.colList[0].children.map(item => {
+      this.colList[0].children.map((item) => {
         if (this.granularity === 'week') {
           item.name === 'today_roi' && (item.content = '当周回本')
           item.name === 'date_num' && (item.content = '回本周数')
@@ -213,7 +211,7 @@ export default {
     defaultCheck() {
       this.checkList = []
       this.colList.forEach((item, index) => {
-        item.children.forEach(em => {
+        item.children.forEach((em) => {
           if (em.status) {
             this.checkList.push(em.name)
           }
@@ -239,7 +237,7 @@ export default {
     // 勾选框组监听选中数组
     handleCheckedColChange(array, item) {
       let flag = true
-      item.children.forEach(em => {
+      item.children.forEach((em) => {
         if (em.status) {
           item.status = true
         } else {