Commit 794f2e06 by jml0128

feat

1 parent 98a9e556
No preview for this file type
...@@ -1311,14 +1311,6 @@ ...@@ -1311,14 +1311,6 @@
"integrity": "sha1-1h9G2DslGSUOJ4Ta9bCUeai0HFk=", "integrity": "sha1-1h9G2DslGSUOJ4Ta9bCUeai0HFk=",
"dev": true "dev": true
}, },
"axios": {
"version": "0.21.1",
"resolved": "https://registry.nlark.com/axios/download/axios-0.21.1.tgz?cache=0&sync_timestamp=1618847188301&other_urls=https%3A%2F%2Fregistry.nlark.com%2Faxios%2Fdownload%2Faxios-0.21.1.tgz",
"integrity": "sha1-IlY0gZYvTWvemnbVFu8OXTwJsrg=",
"requires": {
"follow-redirects": "^1.10.0"
}
},
"babel-code-frame": { "babel-code-frame": {
"version": "6.26.0", "version": "6.26.0",
"resolved": "https://registry.npm.taobao.org/babel-code-frame/download/babel-code-frame-6.26.0.tgz", "resolved": "https://registry.npm.taobao.org/babel-code-frame/download/babel-code-frame-6.26.0.tgz",
...@@ -2289,29 +2281,11 @@ ...@@ -2289,29 +2281,11 @@
"isarray": "^1.0.0" "isarray": "^1.0.0"
} }
}, },
"buffer-alloc": {
"version": "1.2.0",
"resolved": "https://registry.nlark.com/buffer-alloc/download/buffer-alloc-1.2.0.tgz",
"integrity": "sha1-iQ3ZDZI6hz4I4Q5f1RpX5bfM4Ow=",
"requires": {
"buffer-alloc-unsafe": "^1.1.0",
"buffer-fill": "^1.0.0"
}
},
"buffer-alloc-unsafe": {
"version": "1.1.0",
"resolved": "https://registry.npm.taobao.org/buffer-alloc-unsafe/download/buffer-alloc-unsafe-1.1.0.tgz",
"integrity": "sha1-vX3CauKXLQ7aJTvgYdupkjScGfA="
},
"buffer-fill": {
"version": "1.0.0",
"resolved": "https://registry.npm.taobao.org/buffer-fill/download/buffer-fill-1.0.0.tgz",
"integrity": "sha1-+PeLdniYiO858gXNY39o5wISKyw="
},
"buffer-from": { "buffer-from": {
"version": "1.1.1", "version": "1.1.1",
"resolved": "https://registry.nlark.com/buffer-from/download/buffer-from-1.1.1.tgz", "resolved": "https://registry.nlark.com/buffer-from/download/buffer-from-1.1.1.tgz",
"integrity": "sha1-MnE7wCj3XAL9txDXx7zsHyxgcO8=" "integrity": "sha1-MnE7wCj3XAL9txDXx7zsHyxgcO8=",
"dev": true
}, },
"buffer-indexof": { "buffer-indexof": {
"version": "1.1.1", "version": "1.1.1",
...@@ -3383,11 +3357,6 @@ ...@@ -3383,11 +3357,6 @@
} }
} }
}, },
"dijkstrajs": {
"version": "1.0.2",
"resolved": "https://registry.nlark.com/dijkstrajs/download/dijkstrajs-1.0.2.tgz",
"integrity": "sha1-LkjA07glRir+datK1egpyOzjYlc="
},
"dir-glob": { "dir-glob": {
"version": "2.2.2", "version": "2.2.2",
"resolved": "https://registry.nlark.com/dir-glob/download/dir-glob-2.2.2.tgz", "resolved": "https://registry.nlark.com/dir-glob/download/dir-glob-2.2.2.tgz",
...@@ -8014,11 +7983,6 @@ ...@@ -8014,11 +7983,6 @@
"semver-compare": "^1.0.0" "semver-compare": "^1.0.0"
} }
}, },
"pngjs": {
"version": "3.4.0",
"resolved": "https://registry.npm.taobao.org/pngjs/download/pngjs-3.4.0.tgz",
"integrity": "sha1-mcp9clll+2VYFOr2XzjxK72/VV8="
},
"portfinder": { "portfinder": {
"version": "1.0.28", "version": "1.0.28",
"resolved": "https://registry.npm.taobao.org/portfinder/download/portfinder-1.0.28.tgz", "resolved": "https://registry.npm.taobao.org/portfinder/download/portfinder-1.0.28.tgz",
...@@ -8725,181 +8689,6 @@ ...@@ -8725,181 +8689,6 @@
"resolved": "https://registry.npm.taobao.org/q/download/q-1.5.1.tgz", "resolved": "https://registry.npm.taobao.org/q/download/q-1.5.1.tgz",
"integrity": "sha1-fjL3W0E4EpHQRhHxvxQQmsAGUdc=" "integrity": "sha1-fjL3W0E4EpHQRhHxvxQQmsAGUdc="
}, },
"qrcode": {
"version": "1.4.4",
"resolved": "https://registry.nlark.com/qrcode/download/qrcode-1.4.4.tgz",
"integrity": "sha1-8MQ1aKfnUQpV78O4jZYC9xlj6oM=",
"requires": {
"buffer": "^5.4.3",
"buffer-alloc": "^1.2.0",
"buffer-from": "^1.1.1",
"dijkstrajs": "^1.0.1",
"isarray": "^2.0.1",
"pngjs": "^3.3.0",
"yargs": "^13.2.4"
},
"dependencies": {
"ansi-regex": {
"version": "4.1.0",
"resolved": "https://registry.nlark.com/ansi-regex/download/ansi-regex-4.1.0.tgz",
"integrity": "sha1-i5+PCM8ay4Q3Vqg5yox+MWjFGZc="
},
"ansi-styles": {
"version": "3.2.1",
"resolved": "https://registry.nlark.com/ansi-styles/download/ansi-styles-3.2.1.tgz?cache=0&sync_timestamp=1618995778321&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fansi-styles%2Fdownload%2Fansi-styles-3.2.1.tgz",
"integrity": "sha1-QfuyAkPlCxK+DwS43tvwdSDOhB0=",
"requires": {
"color-convert": "^1.9.0"
}
},
"buffer": {
"version": "5.7.1",
"resolved": "https://registry.npm.taobao.org/buffer/download/buffer-5.7.1.tgz",
"integrity": "sha1-umLnwTEzBTWCGXFghRqPZI6Z7tA=",
"requires": {
"base64-js": "^1.3.1",
"ieee754": "^1.1.13"
}
},
"camelcase": {
"version": "5.3.1",
"resolved": "https://registry.nlark.com/camelcase/download/camelcase-5.3.1.tgz",
"integrity": "sha1-48mzFWnhBoEd8kL3FXJaH0xJQyA="
},
"cliui": {
"version": "5.0.0",
"resolved": "https://registry.npm.taobao.org/cliui/download/cliui-5.0.0.tgz",
"integrity": "sha1-3u/P2y6AB4SqNPRvoI4GhRx7u8U=",
"requires": {
"string-width": "^3.1.0",
"strip-ansi": "^5.2.0",
"wrap-ansi": "^5.1.0"
}
},
"emoji-regex": {
"version": "7.0.3",
"resolved": "https://registry.nlark.com/emoji-regex/download/emoji-regex-7.0.3.tgz",
"integrity": "sha1-kzoEBShgyF6DwSJHnEdIqOTHIVY="
},
"find-up": {
"version": "3.0.0",
"resolved": "https://registry.nlark.com/find-up/download/find-up-3.0.0.tgz?cache=0&sync_timestamp=1618847130383&other_urls=https%3A%2F%2Fregistry.nlark.com%2Ffind-up%2Fdownload%2Ffind-up-3.0.0.tgz",
"integrity": "sha1-SRafHXmTQwZG2mHsxa41XCHJe3M=",
"requires": {
"locate-path": "^3.0.0"
}
},
"get-caller-file": {
"version": "2.0.5",
"resolved": "https://registry.nlark.com/get-caller-file/download/get-caller-file-2.0.5.tgz",
"integrity": "sha1-T5RBKoLbMvNuOwuXQfipf+sDH34="
},
"is-fullwidth-code-point": {
"version": "2.0.0",
"resolved": "https://registry.nlark.com/is-fullwidth-code-point/download/is-fullwidth-code-point-2.0.0.tgz",
"integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8="
},
"isarray": {
"version": "2.0.5",
"resolved": "https://registry.npm.taobao.org/isarray/download/isarray-2.0.5.tgz",
"integrity": "sha1-ivHkwSISRMxiRZ+vOJQNTmRKVyM="
},
"locate-path": {
"version": "3.0.0",
"resolved": "https://registry.npm.taobao.org/locate-path/download/locate-path-3.0.0.tgz",
"integrity": "sha1-2+w7OrdZdYBxtY/ln8QYca8hQA4=",
"requires": {
"p-locate": "^3.0.0",
"path-exists": "^3.0.0"
}
},
"p-limit": {
"version": "2.3.0",
"resolved": "https://registry.nlark.com/p-limit/download/p-limit-2.3.0.tgz",
"integrity": "sha1-PdM8ZHohT9//2DWTPrCG2g3CHbE=",
"requires": {
"p-try": "^2.0.0"
}
},
"p-locate": {
"version": "3.0.0",
"resolved": "https://registry.nlark.com/p-locate/download/p-locate-3.0.0.tgz",
"integrity": "sha1-Mi1poFwCZLJZl9n0DNiokasAZKQ=",
"requires": {
"p-limit": "^2.0.0"
}
},
"p-try": {
"version": "2.2.0",
"resolved": "https://registry.nlark.com/p-try/download/p-try-2.2.0.tgz",
"integrity": "sha1-yyhoVA4xPWHeWPr741zpAE1VQOY="
},
"require-main-filename": {
"version": "2.0.0",
"resolved": "https://registry.npm.taobao.org/require-main-filename/download/require-main-filename-2.0.0.tgz",
"integrity": "sha1-0LMp7MfMD2Fkn2IhW+aa9UqomJs="
},
"string-width": {
"version": "3.1.0",
"resolved": "https://registry.npm.taobao.org/string-width/download/string-width-3.1.0.tgz?cache=0&sync_timestamp=1618558823901&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fstring-width%2Fdownload%2Fstring-width-3.1.0.tgz",
"integrity": "sha1-InZ74htirxCBV0MG9prFG2IgOWE=",
"requires": {
"emoji-regex": "^7.0.1",
"is-fullwidth-code-point": "^2.0.0",
"strip-ansi": "^5.1.0"
}
},
"strip-ansi": {
"version": "5.2.0",
"resolved": "https://registry.npm.taobao.org/strip-ansi/download/strip-ansi-5.2.0.tgz?cache=0&sync_timestamp=1618553320591&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fstrip-ansi%2Fdownload%2Fstrip-ansi-5.2.0.tgz",
"integrity": "sha1-jJpTb+tq/JYr36WxBKUJHBrZwK4=",
"requires": {
"ansi-regex": "^4.1.0"
}
},
"wrap-ansi": {
"version": "5.1.0",
"resolved": "https://registry.npm.taobao.org/wrap-ansi/download/wrap-ansi-5.1.0.tgz?cache=0&sync_timestamp=1618558887146&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fwrap-ansi%2Fdownload%2Fwrap-ansi-5.1.0.tgz",
"integrity": "sha1-H9H2cjXVttD+54EFYAG/tpTAOwk=",
"requires": {
"ansi-styles": "^3.2.0",
"string-width": "^3.0.0",
"strip-ansi": "^5.0.0"
}
},
"y18n": {
"version": "4.0.3",
"resolved": "https://registry.npm.taobao.org/y18n/download/y18n-4.0.3.tgz",
"integrity": "sha1-tfJZyCzW4zaSHv17/Yv1YN6e7t8="
},
"yargs": {
"version": "13.3.2",
"resolved": "https://registry.nlark.com/yargs/download/yargs-13.3.2.tgz?cache=0&sync_timestamp=1620086644940&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fyargs%2Fdownload%2Fyargs-13.3.2.tgz",
"integrity": "sha1-rX/+/sGqWVZayRX4Lcyzipwxot0=",
"requires": {
"cliui": "^5.0.0",
"find-up": "^3.0.0",
"get-caller-file": "^2.0.1",
"require-directory": "^2.1.1",
"require-main-filename": "^2.0.0",
"set-blocking": "^2.0.0",
"string-width": "^3.0.0",
"which-module": "^2.0.0",
"y18n": "^4.0.0",
"yargs-parser": "^13.1.2"
}
},
"yargs-parser": {
"version": "13.1.2",
"resolved": "https://registry.nlark.com/yargs-parser/download/yargs-parser-13.1.2.tgz",
"integrity": "sha1-Ew8JcC667vJlDVTObj5XBvek+zg=",
"requires": {
"camelcase": "^5.0.0",
"decamelize": "^1.2.0"
}
}
}
},
"qs": { "qs": {
"version": "6.7.0", "version": "6.7.0",
"resolved": "https://registry.npm.taobao.org/qs/download/qs-6.7.0.tgz?cache=0&sync_timestamp=1616385328325&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fqs%2Fdownload%2Fqs-6.7.0.tgz", "resolved": "https://registry.npm.taobao.org/qs/download/qs-6.7.0.tgz?cache=0&sync_timestamp=1616385328325&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fqs%2Fdownload%2Fqs-6.7.0.tgz",
...@@ -12324,15 +12113,6 @@ ...@@ -12324,15 +12113,6 @@
"mkdirp": "^0.5.1" "mkdirp": "^0.5.1"
} }
}, },
"xrk-tools": {
"version": "1.0.11",
"resolved": "https://registry.nlark.com/xrk-tools/download/xrk-tools-1.0.11.tgz",
"integrity": "sha1-qUTD/WET+sw+G0HIrifwTyIjftw=",
"requires": {
"axios": "^0.21.1",
"qrcode": "^1.4.4"
}
},
"xtend": { "xtend": {
"version": "4.0.2", "version": "4.0.2",
"resolved": "https://registry.nlark.com/xtend/download/xtend-4.0.2.tgz", "resolved": "https://registry.nlark.com/xtend/download/xtend-4.0.2.tgz",
......
...@@ -27,8 +27,7 @@ ...@@ -27,8 +27,7 @@
"vue-awesome-swiper": "^4.1.1", "vue-awesome-swiper": "^4.1.1",
"vue-echarts": "^6.0.0-rc.5", "vue-echarts": "^6.0.0-rc.5",
"vue-photo-preview": "^1.1.3", "vue-photo-preview": "^1.1.3",
"vuedraggable": "^2.24.3", "vuedraggable": "^2.24.3"
"xrk-tools": "^1.0.11"
}, },
"devDependencies": { "devDependencies": {
"@vue/cli-plugin-eslint": "~4.5.0", "@vue/cli-plugin-eslint": "~4.5.0",
......
...@@ -130,3 +130,61 @@ export const getInterval = axisData => { ...@@ -130,3 +130,61 @@ export const getInterval = axisData => {
} }
return 'auto'; return 'auto';
}; };
export const check = {
isFunction: fn => {
return typeof fn === 'function';
}
};
export const base = {
numberFormat: (num, divisor = 100, decimalPlaces = 2, unit = '') => {
if (num == 0) {
return Number(num).toFixed(decimalPlaces) + unit;
}
return (Number(num) / divisor).toFixed(decimalPlaces) + unit;
}
};
export const date = {
dateFormat: (date = new Date(), fmt = 'Y-M-D H:m:s', autoFillZero = true) => {
let _date = new Date();
if (toString.call(date) === '[object Number]') {
// 时间戳
_date = new Date(Math.round(Number(String(date).padEnd(13, '0'))));
} else if (toString.call(date) === '[object Date]') {
// 时间对象
_date = date;
} else {
// 错误传参
console.warn(`入参${date}不是正确的时间对象或时间戳`);
return date;
}
const fillZero = (number, count = 2) => {
return String(number).padStart(count, '0');
};
const _fullYear = _date.getFullYear();
const _month = _date.getMonth() + 1;
const _day = _date.getDate();
const _hours = _date.getHours();
const _minutes = _date.getMinutes();
const _seconds = _date.getSeconds();
const fmtMap = {
Y: _fullYear,
M: autoFillZero ? fillZero(_month) : _month,
D: autoFillZero ? fillZero(_day) : _day,
H: autoFillZero ? fillZero(_hours) : _hours,
m: autoFillZero ? fillZero(_minutes) : _minutes,
s: autoFillZero ? fillZero(_seconds) : _seconds
};
let _fmt = String(fmt);
for (const key in fmtMap) {
if (Object.hasOwnProperty.call(fmtMap, key)) {
_fmt = _fmt.replace(
new RegExp(`${key}`),
String(Reflect.get(fmtMap, key))
);
}
}
return _fmt;
}
};
...@@ -56,7 +56,7 @@ ...@@ -56,7 +56,7 @@
</template> </template>
<script> <script>
import { check } from 'xrk-tools'; import { check } from '../chart-type/common';
import mixin from '../mixin/index'; import mixin from '../mixin/index';
import { Dialog, Button, Checkbox, CheckboxGroup, Message } from 'element-ui'; import { Dialog, Button, Checkbox, CheckboxGroup, Message } from 'element-ui';
export default { export default {
......
...@@ -71,7 +71,7 @@ import mixin, { printWidth } from '../mixin/index'; ...@@ -71,7 +71,7 @@ import mixin, { printWidth } from '../mixin/index';
import project from '../mixin/project'; import project from '../mixin/project';
import { chartConfig } from '../mock/index'; import { chartConfig } from '../mock/index';
import { date } from 'xrk-tools'; import { date } from '../chart-type/common';
const ChartConfigFn = chartConfig(); const ChartConfigFn = chartConfig();
import { import {
......
...@@ -80,7 +80,7 @@ import project from '../mixin/project'; ...@@ -80,7 +80,7 @@ import project from '../mixin/project';
import { chartConfig } from '../mock/index'; import { chartConfig } from '../mock/index';
const ChartConfigFn = chartConfig(); const ChartConfigFn = chartConfig();
import { date, check } from 'xrk-tools'; import { date, check } from '../chart-type/common';
import { import {
dealAxis, dealAxis,
dealLegends, dealLegends,
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
* @Description: * @Description:
* @Date: 2021-07-02 10:57:34 * @Date: 2021-07-02 10:57:34
*/ */
import { base } from 'xrk-tools'; import { base } from '../chart-type/common';
export const dealAxis = (arr = []) => { export const dealAxis = (arr = []) => {
return arr.map(item => ({ return arr.map(item => ({
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!