bi-element-ui 0.1.48 → 0.1.49

package/package.json

@@ -1,57 +1,57 @@
-{
-  "name": "bi-element-ui",
-  "version": "0.1.48",
-  "private": false,
-  "description": "基于element-ui编写的ui组件库",
-  "main": "lib/bi-element-ui.common.js",
-  "scripts": {
-    "dev": "vue-cli-service serve",
-    "build": "vue-cli-service build",
-    "test:unit": "vue-cli-service test:unit",
-    "test:e2e": "vue-cli-service test:e2e",
-    "lint": "vue-cli-service lint",
-    "commit": "git-cz",
-    "lib": "vue-cli-service build --target lib --name bi-element-ui --dest lib packages/index.js"
-  },
-  "dependencies": {
-    "axios": "^0.19.2",
-    "element-ui": "^2.13.1",
-    "image-webpack-loader": "^6.0.0",
-    "moment": "^2.29.1",
-    "vue": "^2.6.11",
-    "vue-router": "^3.1.6",
-    "vuedraggable": "^2.24.3",
-    "vuex": "^3.1.3"
-  },
-  "devDependencies": {
-    "@vue/cli-plugin-babel": "~4.3.0",
-    "@vue/cli-plugin-e2e-cypress": "~4.3.0",
-    "@vue/cli-plugin-eslint": "~4.3.0",
-    "@vue/cli-plugin-router": "~4.3.0",
-    "@vue/cli-plugin-unit-mocha": "~4.3.0",
-    "@vue/cli-plugin-vuex": "~4.3.0",
-    "@vue/cli-service": "~4.3.0",
-    "@vue/eslint-config-prettier": "^6.0.0",
-    "@vue/test-utils": "1.0.0-beta.31",
-    "babel-eslint": "^10.1.0",
-    "chai": "^4.1.2",
-    "commitizen": "^4.0.4",
-    "core-js": "^3.6.5",
-    "cz-conventional-changelog": "^3.1.0",
-    "eslint": "^6.7.2",
-    "eslint-plugin-prettier": "^3.1.1",
-    "eslint-plugin-vue": "^6.2.2",
-    "file-loader": "^6.2.0",
-    "node-gyp": "^6.1.0",
-    "prettier": "^1.19.1",
-    "sass": "^1.26.3",
-    "sass-loader": "^8.0.2",
-    "url-loader": "^4.1.1",
-    "vue-template-compiler": "^2.6.11"
-  },
-  "config": {
-    "commitizen": {
-      "path": "node_modules/cz-conventional-changelog"
-    }
-  }
-}
+{
+  "name": "bi-element-ui",
+  "version": "0.1.49",
+  "private": false,
+  "description": "基于element-ui编写的ui组件库",
+  "main": "lib/bi-element-ui.common.js",
+  "scripts": {
+    "dev": "vue-cli-service serve",
+    "build": "vue-cli-service build",
+    "test:unit": "vue-cli-service test:unit",
+    "test:e2e": "vue-cli-service test:e2e",
+    "lint": "vue-cli-service lint",
+    "commit": "git-cz",
+    "lib": "vue-cli-service build --target lib --name bi-element-ui --dest lib packages/index.js"
+  },
+  "dependencies": {
+    "axios": "^0.19.2",
+    "element-ui": "^2.13.1",
+    "image-webpack-loader": "^6.0.0",
+    "moment": "^2.29.1",
+    "vue": "^2.6.11",
+    "vue-router": "^3.1.6",
+    "vuedraggable": "^2.24.3",
+    "vuex": "^3.1.3"
+  },
+  "devDependencies": {
+    "@vue/cli-plugin-babel": "~4.3.0",
+    "@vue/cli-plugin-e2e-cypress": "~4.3.0",
+    "@vue/cli-plugin-eslint": "~4.3.0",
+    "@vue/cli-plugin-router": "~4.3.0",
+    "@vue/cli-plugin-unit-mocha": "~4.3.0",
+    "@vue/cli-plugin-vuex": "~4.3.0",
+    "@vue/cli-service": "~4.3.0",
+    "@vue/eslint-config-prettier": "^6.0.0",
+    "@vue/test-utils": "1.0.0-beta.31",
+    "babel-eslint": "^10.1.0",
+    "chai": "^4.1.2",
+    "commitizen": "^4.0.4",
+    "core-js": "^3.6.5",
+    "cz-conventional-changelog": "^3.1.0",
+    "eslint": "^6.7.2",
+    "eslint-plugin-prettier": "^3.1.1",
+    "eslint-plugin-vue": "^6.2.2",
+    "file-loader": "^6.2.0",
+    "node-gyp": "^6.1.0",
+    "prettier": "^1.19.1",
+    "sass": "^1.26.3",
+    "sass-loader": "^8.0.2",
+    "url-loader": "^4.1.1",
+    "vue-template-compiler": "^2.6.11"
+  },
+  "config": {
+    "commitizen": {
+      "path": "node_modules/cz-conventional-changelog"
+    }
+  }
+}

package/src/App.vue

@@ -1,42 +1,42 @@
-<template>
-  <div id="app">
-    <el-container>
-      <el-aside width="150px">
-        <div id="nav">
-          <router-link to="/">例子展示</router-link>
-          <router-link to="/date">date</router-link>
-          <router-link to="/scene">场景使用</router-link>
-          <router-link to="/table">Table</router-link>
-          <router-link to="/showData">Data</router-link>
-        </div>
-      </el-aside>
-      <el-main>
-        <router-view />
-      </el-main>
-    </el-container>
-  </div>
-</template>
-
-<style lang="scss">
-#app {
-  font-family: Avenir, Helvetica, Arial, sans-serif;
-  -webkit-font-smoothing: antialiased;
-  -moz-osx-font-smoothing: grayscale;
-  color: #2c3e50;
-}
-
-#nav {
-  margin-top: 30px;
-
-  a {
-    display: block;
-    padding: 20px 25px;
-    font-weight: bold;
-    color: #2c3e50;
-
-    &.router-link-exact-active {
-      color: #42b983;
-    }
-  }
-}
-</style>
+<template>
+  <div id="app">
+    <el-container>
+      <el-aside width="150px">
+        <div id="nav">
+          <router-link to="/">例子展示</router-link>
+          <router-link to="/date">date</router-link>
+          <router-link to="/scene">场景使用</router-link>
+          <router-link to="/table">Table</router-link>
+          <router-link to="/showData">Data</router-link>
+        </div>
+      </el-aside>
+      <el-main>
+        <router-view />
+      </el-main>
+    </el-container>
+  </div>
+</template>
+
+<style lang="scss">
+#app {
+  font-family: Avenir, Helvetica, Arial, sans-serif;
+  -webkit-font-smoothing: antialiased;
+  -moz-osx-font-smoothing: grayscale;
+  color: #2c3e50;
+}
+
+#nav {
+  margin-top: 30px;
+
+  a {
+    display: block;
+    padding: 20px 25px;
+    font-weight: bold;
+    color: #2c3e50;
+
+    &.router-link-exact-active {
+      color: #42b983;
+    }
+  }
+}
+</style>

package/src/components/BiDatePicker/datePickerOption.js

@@ -1,229 +1,229 @@
-import moment from 'moment'
-const pickerOptions = {
-  daterange: {
-    shortcuts: [
-      {
-        text: '今天',
-        onClick(picker) {
-          const end = moment().format('YYYY-MM-DD 23:59:59')
-          const start = moment().format('YYYY-MM-DD 00:00:00')
-          // const end = new Date()
-          // const start = new Date()
-          picker.$emit('pick', [start, end])
-        }
-      },
-      {
-        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')
-          picker.$emit('pick', [start, end])
-        }
-      },
-      {
-        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')
-          picker.$emit('pick', [start, end])
-        }
-      },
-      {
-        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')
-          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')
-          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')
-          picker.$emit('pick', [start, end])
-        }
-      }
-    ]
-  },
-  monthrange: {
-    shortcuts: [
-      {
-        text: '本月',
-        onClick(picker) {
-          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')
-          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')
-          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')
-          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')
-          picker.$emit('pick', [start, end])
-        }
-      }
-    ]
-  },
-  datetimerange: {
-    shortcuts: [
-      {
-        text: '今天',
-        onClick(picker) {
-          const end = moment().format('YYYY-MM-DD 23:59:59')
-          const start = moment().format('YYYY-MM-DD 00:00:00')
-          // const end = new Date()
-          // const start = new Date()
-          picker.$emit('pick', [start, end])
-        }
-      },
-      {
-        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')
-          picker.$emit('pick', [start, end])
-        }
-      },
-      {
-        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')
-          picker.$emit('pick', [start, end])
-        }
-      },
-      {
-        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')
-          picker.$emit('pick', [start, end])
-        }
-      },
-      {
-        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')
-            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')
-            picker.$emit('pick', [start, end])
-          }
-        }
-      },
-      {
-        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')
-          picker.$emit('pick', [start, end])
-        }
-      }
-    ]
-  }
-}
-
-export default pickerOptions
+import moment from 'moment'
+const pickerOptions = {
+  daterange: {
+    shortcuts: [
+      {
+        text: '今天',
+        onClick(picker) {
+          const end = moment().format('YYYY-MM-DD 23:59:59')
+          const start = moment().format('YYYY-MM-DD 00:00:00')
+          // const end = new Date()
+          // const start = new Date()
+          picker.$emit('pick', [start, end])
+        }
+      },
+      {
+        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')
+          picker.$emit('pick', [start, end])
+        }
+      },
+      {
+        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')
+          picker.$emit('pick', [start, end])
+        }
+      },
+      {
+        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')
+          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')
+          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')
+          picker.$emit('pick', [start, end])
+        }
+      }
+    ]
+  },
+  monthrange: {
+    shortcuts: [
+      {
+        text: '本月',
+        onClick(picker) {
+          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')
+          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')
+          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')
+          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')
+          picker.$emit('pick', [start, end])
+        }
+      }
+    ]
+  },
+  datetimerange: {
+    shortcuts: [
+      {
+        text: '今天',
+        onClick(picker) {
+          const end = moment().format('YYYY-MM-DD 23:59:59')
+          const start = moment().format('YYYY-MM-DD 00:00:00')
+          // const end = new Date()
+          // const start = new Date()
+          picker.$emit('pick', [start, end])
+        }
+      },
+      {
+        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')
+          picker.$emit('pick', [start, end])
+        }
+      },
+      {
+        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')
+          picker.$emit('pick', [start, end])
+        }
+      },
+      {
+        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')
+          picker.$emit('pick', [start, end])
+        }
+      },
+      {
+        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')
+            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')
+            picker.$emit('pick', [start, end])
+          }
+        }
+      },
+      {
+        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')
+          picker.$emit('pick', [start, end])
+        }
+      }
+    ]
+  }
+}
+
+export default pickerOptions