Skip to content

Commit

Permalink
css webpack to dist
Browse files Browse the repository at this point in the history
  • Loading branch information
silianpan committed Sep 11, 2020
1 parent ec48362 commit c50f6b8
Show file tree
Hide file tree
Showing 7 changed files with 79 additions and 15 deletions.
3 changes: 2 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "p-charts",
"description": "Chart components based on AntV G2",
"version": "1.0.2",
"version": "1.0.6",
"author": "silianpan <[email protected]>",
"license": "MIT",
"private": false,
Expand All @@ -28,6 +28,7 @@
"babel-preset-stage-3": "^6.24.1",
"cross-env": "^5.0.5",
"css-loader": "^0.28.7",
"extract-text-webpack-plugin": "^3.0.2",
"file-loader": "^1.1.4",
"vue-loader": "^13.0.5",
"vue-template-compiler": "^2.4.4",
Expand Down
5 changes: 5 additions & 0 deletions src/assets/common.css
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
.analysis-card-title {
text-align: center;
/* color: #0050b3!important;
cursor: pointer; */
}
1 change: 1 addition & 0 deletions src/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ import PPie from './packages/pie/index'
import PBar from './packages/bar/index'
import PColumn from './packages/column/index'
import PLineChart from './packages/line-chart/index'
import './assets/common.css'

const components = [PPie, PBar, PColumn, PLineChart]

Expand Down
1 change: 1 addition & 0 deletions src/main.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import Vue from 'vue'
import App from './App.vue'
import './assets/common.css'
import PCharts from './index'
Vue.use(PCharts)

Expand Down
24 changes: 16 additions & 8 deletions src/packages/column/p-column.vue
Original file line number Diff line number Diff line change
Expand Up @@ -72,8 +72,7 @@ export default {
this.containerId = `container${CommonUtil.uuid()}`
},
mounted() {
this.newOptions = { ...this.defaultOptions, ...this.options }
this.initData()
this.updateData()
},
beforeDestroy() {
if (this.chart !== null) {
Expand All @@ -83,17 +82,26 @@ export default {
watch: {
options: {
handler(newVal, oldVal) {
if (this.chart !== null) {
this.chart.destroy()
this.chart = null
}
this.newOptions = { ...this.defaultOptions, ...this.options }
this.initData()
this.updateData()
},
deep: true
},
data: {
handler(newVal, oldVal) {
this.updateData()
},
deep: true
}
},
methods: {
updateData() {
if (this.chart !== null) {
this.chart.destroy()
this.chart = null
}
this.newOptions = { ...this.defaultOptions, ...this.options }
this.initData()
},
initData() {
if (_.isEmpty(this.data)) {
return
Expand Down
16 changes: 11 additions & 5 deletions webpack.config.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
var path = require('path')
var webpack = require('webpack')
const ExtractTextPlugin = require("extract-text-webpack-plugin")

const resolve = dir => {
return path.join(__dirname, dir)
Expand All @@ -21,10 +22,14 @@ module.exports = {
rules: [
{
test: /\.css$/,
use: [
'vue-style-loader',
'css-loader'
],
// use: [
// 'vue-style-loader',
// 'css-loader'
// ],
use: ExtractTextPlugin.extract({
fallback: 'vue-style-loader',
use: 'css-loader'
})
}, {
test: /\.vue$/,
loader: 'vue-loader',
Expand Down Expand Up @@ -83,6 +88,7 @@ if (process.env.NODE_ENV === 'production') {
}),
new webpack.LoaderOptionsPlugin({
minimize: true
})
}),
new ExtractTextPlugin("styles.css")
])
}
44 changes: 43 additions & 1 deletion yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -163,6 +163,16 @@ ajv-keywords@^3.1.0:
resolved "https://registry.npm.taobao.org/ajv-keywords/download/ajv-keywords-3.5.2.tgz#31f29da5ab6e00d1c2d329acf7b5929614d5014d"
integrity sha1-MfKdpatuANHC0yms97WSlhTVAU0=

ajv@^5.0.0:
version "5.5.2"
resolved "https://registry.npmjs.org/ajv/-/ajv-5.5.2.tgz#73b5eeca3fab653e3d3f9422b341ad42205dc965"
integrity sha1-c7Xuyj+rZT49P5Qis0GtQiBdyWU=
dependencies:
co "^4.6.0"
fast-deep-equal "^1.0.0"
fast-json-stable-stringify "^2.0.0"
json-schema-traverse "^0.3.0"

ajv@^6.1.0:
version "6.12.4"
resolved "https://registry.npm.taobao.org/ajv/download/ajv-6.12.4.tgz?cache=0&sync_timestamp=1597480893665&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fajv%2Fdownload%2Fajv-6.12.4.tgz#0614facc4522127fa713445c6bfd3ebd376e2234"
Expand Down Expand Up @@ -326,7 +336,7 @@ async-each@^1.0.1:
resolved "https://registry.npm.taobao.org/async-each/download/async-each-1.0.3.tgz#b727dbf87d7651602f06f4d4ac387f47d91b0cbf"
integrity sha1-tyfb+H12UWAvBvTUrDh/R9kbDL8=

async@^2.1.2, async@^2.6.2:
async@^2.1.2, async@^2.4.1, async@^2.6.2:
version "2.6.3"
resolved "https://registry.npm.taobao.org/async/download/async-2.6.3.tgz#d72625e2344a3656e3a3ad4fa749fa83299d82ff"
integrity sha1-1yYl4jRKNlbjo61Pp0n6gymdgv8=
Expand Down Expand Up @@ -1326,6 +1336,11 @@ clone@^1.0.2:
resolved "https://registry.npm.taobao.org/clone/download/clone-1.0.4.tgz#da309cc263df15994c688ca902179ca3c7cd7c7e"
integrity sha1-2jCcwmPfFZlMaIypAheco8fNfH4=

co@^4.6.0:
version "4.6.0"
resolved "https://registry.npmjs.org/co/-/co-4.6.0.tgz#6ea6bdf3d853ae54ccb8e47bfa0bf3f9031fb184"
integrity sha1-bqa989hTrlTMuOR7+gvz+QMfsYQ=

coa@~1.0.1:
version "1.0.4"
resolved "https://registry.npm.taobao.org/coa/download/coa-1.0.4.tgz#a9ef153660d6a86a8bdec0289a5c684d217432fd"
Expand Down Expand Up @@ -2341,6 +2356,21 @@ extglob@^2.0.4:
snapdragon "^0.8.1"
to-regex "^3.0.1"

extract-text-webpack-plugin@^3.0.2:
version "3.0.2"
resolved "https://registry.npmjs.org/extract-text-webpack-plugin/-/extract-text-webpack-plugin-3.0.2.tgz#5f043eaa02f9750a9258b78c0a6e0dc1408fb2f7"
integrity sha512-bt/LZ4m5Rqt/Crl2HiKuAl/oqg0psx1tsTLkvWbJen1CtD+fftkZhMaQ9HOtY2gWsl2Wq+sABmMVi9z3DhKWQQ==
dependencies:
async "^2.4.1"
loader-utils "^1.1.0"
schema-utils "^0.3.0"
webpack-sources "^1.0.1"

fast-deep-equal@^1.0.0:
version "1.1.0"
resolved "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-1.1.0.tgz#c053477817c86b51daa853c81e059b733d023614"
integrity sha1-wFNHeBfIa1HaqFPIHgWbcz0CNhQ=

fast-deep-equal@^3.1.1:
version "3.1.3"
resolved "https://registry.npm.taobao.org/fast-deep-equal/download/fast-deep-equal-3.1.3.tgz?cache=0&sync_timestamp=1591599604977&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Ffast-deep-equal%2Fdownload%2Ffast-deep-equal-3.1.3.tgz#3a7d56b559d6cbc3eb512325244e619a65c6c525"
Expand Down Expand Up @@ -3208,6 +3238,11 @@ json-loader@^0.5.4:
resolved "https://registry.npm.taobao.org/json-loader/download/json-loader-0.5.7.tgz?cache=0&sync_timestamp=1586264303942&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fjson-loader%2Fdownload%2Fjson-loader-0.5.7.tgz#dca14a70235ff82f0ac9a3abeb60d337a365185d"
integrity sha1-3KFKcCNf+C8KyaOr62DTN6NlGF0=

json-schema-traverse@^0.3.0:
version "0.3.1"
resolved "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.3.1.tgz#349a6d44c53a51de89b40805c5d5e59b417d3340"
integrity sha1-NJptRMU6Ud6JtAgFxdXlm0F9M0A=

json-schema-traverse@^0.4.1:
version "0.4.1"
resolved "https://registry.npm.taobao.org/json-schema-traverse/download/json-schema-traverse-0.4.1.tgz#69f6a87d9513ab8bb8fe63bdb0979c448e684660"
Expand Down Expand Up @@ -4766,6 +4801,13 @@ sax@~1.2.1:
resolved "https://registry.npm.taobao.org/sax/download/sax-1.2.4.tgz#2816234e2378bddc4e5354fab5caa895df7100d9"
integrity sha1-KBYjTiN4vdxOU1T6tcqold9xANk=

schema-utils@^0.3.0:
version "0.3.0"
resolved "https://registry.npmjs.org/schema-utils/-/schema-utils-0.3.0.tgz#f5877222ce3e931edae039f17eb3716e7137f8cf"
integrity sha1-9YdyIs4+kx7a4DnxfrNxbnE3+M8=
dependencies:
ajv "^5.0.0"

schema-utils@^0.4.5:
version "0.4.7"
resolved "https://registry.npm.taobao.org/schema-utils/download/schema-utils-0.4.7.tgz?cache=0&sync_timestamp=1590761195120&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fschema-utils%2Fdownload%2Fschema-utils-0.4.7.tgz#ba74f597d2be2ea880131746ee17d0a093c68187"
Expand Down

0 comments on commit c50f6b8

Please sign in to comment.