You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@echarts.apache.org by su...@apache.org on 2020/04/25 21:08:45 UTC
[incubator-echarts] branch attached-text created (now 3687f4b)
This is an automated email from the ASF dual-hosted git repository.
sushuang pushed a change to branch attached-text
in repository https://gitbox.apache.org/repos/asf/incubator-echarts.git.
at 3687f4b Merge branch 'next' into custom-series-enhance
This branch includes the following new commits:
new 05e35a3 enhance: adjust innerFill/innerStroke rule
new 5cb15bc enhance: adjust insideFill/insideStroke
new 791b6c9 enhance: set default outsideStroke.
new 560ea38 fix: fix mktest and test facility
new 1b43577 fix: add back canteen and add el debug util.
new 19bf4d4 test: add test facility.
new b35d798 tweak
new 3687f4b Merge branch 'next' into custom-series-enhance
The 8 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@echarts.apache.org
For additional commands, e-mail: commits-help@echarts.apache.org
[incubator-echarts] 03/08: enhance: set default outsideStroke.
Posted by su...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
sushuang pushed a commit to branch attached-text
in repository https://gitbox.apache.org/repos/asf/incubator-echarts.git
commit 791b6c9a95268d5f76d1cadcd650a04072cd7294
Author: 100pah <su...@gmail.com>
AuthorDate: Thu Apr 23 02:01:11 2020 +0800
enhance: set default outsideStroke.
---
src/util/graphic.ts | 3 +++
1 file changed, 3 insertions(+)
diff --git a/src/util/graphic.ts b/src/util/graphic.ts
index 88eecf8..e701301 100644
--- a/src/util/graphic.ts
+++ b/src/util/graphic.ts
@@ -801,6 +801,9 @@ export function createTextConfig(
// fill and auto is determined by the color of path fill if it's not specified by developers.
textConfig.outsideFill = opt.autoColor || null;
textConfig.insideStroke = opt.autoColor || null;
+ // Set default stroke, which is useful when label is over other
+ // messy graphics (like lines) in background.
+ textConfig.outsideStroke = 'rgba(255, 255, 255, 0.7)';
// if (!textStyle.fill) {
// textConfig.insideFill = 'auto';
// textConfig.outsideFill = opt.autoColor || null;
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@echarts.apache.org
For additional commands, e-mail: commits-help@echarts.apache.org
[incubator-echarts] 05/08: fix: add back canteen and add el debug
util.
Posted by su...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
sushuang pushed a commit to branch attached-text
in repository https://gitbox.apache.org/repos/asf/incubator-echarts.git
commit 1b43577c985a1a32d44a6cc58042c58990503dc8
Author: 100pah <su...@gmail.com>
AuthorDate: Fri Apr 24 00:20:04 2020 +0800
fix: add back canteen and add el debug util.
---
test/lib/canteen.js | 566 +++++++++++++++++++++++++++++++++++++++++++++++++
test/lib/testHelper.js | 118 ++++++++++-
2 files changed, 681 insertions(+), 3 deletions(-)
diff --git a/test/lib/canteen.js b/test/lib/canteen.js
new file mode 100644
index 0000000..86338fc
--- /dev/null
+++ b/test/lib/canteen.js
@@ -0,0 +1,566 @@
+/**
+ * Canteen v1.0.4
+ * August 19th, 2015
+ *
+ * Copyright 2015 Platfora, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+ ;(function() {
+ // ================================ Constants ================================
+ var CONTEXT_2D_ATTRIBUTES = [
+ 'fillStyle',
+ 'font',
+ 'globalAlpha',
+ 'globalCompositeOperation',
+ 'lineCap',
+ 'lineDashOffset',
+ 'lineJoin',
+ 'lineWidth',
+ 'miterLimit',
+ 'shadowBlur',
+ 'shadowColor',
+ 'shadowOffsetX',
+ 'shadowOffsetY',
+ 'strokeStyle',
+ 'textAlign',
+ 'textBaseline'
+ ];
+
+ // ================================ Utils ================================
+
+ function each(arr, func) {
+ var len = arr.length,
+ n;
+
+ for (n=0; n<len; n++) {
+ func(arr[n], n);
+ }
+ }
+
+ function round(val, decimalPoints) {
+ var power = Math.pow(10, decimalPoints);
+ return Math.round(val * power) / power;
+ }
+
+ function roundArr(arr, decimalPoints) {
+ var len = arr.length,
+ ret = [],
+ n;
+
+ for (n=0; n<len; n++) {
+ if (isNumber(arr[n])) {
+ ret.push(round(arr[n], decimalPoints));
+ }
+ else {
+ ret.push(arr[n]);
+ }
+ }
+
+ return ret;
+ }
+
+ function isFunction(func) {
+ return func && {}.toString.call(func) === '[object Function]';
+ }
+
+ function isNumber(val) {
+ return typeof val === 'number';
+ }
+
+ // ================================ Canteen Class ================================
+
+ /**
+ * Canteen Constructor
+ * @constructor
+ */
+ var Canteen = function(context) {
+ var that = this;
+
+ this._stack = [];
+ this.context = context;
+
+ // add observable attributes
+ each(CONTEXT_2D_ATTRIBUTES, function(key, n) {
+ Object.defineProperty(that, key, {
+ get: function() {
+ return that.context[key];
+ },
+ set: function(val) {
+ that._pushAttr(key, val);
+ that.context[key] = val;
+ }
+ });
+ });
+ };
+
+ // Canteen methods
+ Canteen.prototype = {
+ /**
+ * get a stack of operations
+ * @method stack
+ * @param {Object} config
+ * @param {String} [config.loose=false] - strict mode returns method calls with arguments and property names
+ * with values. loose mode only returns method calls and property names
+ * @param {Number} [config.decimalPoints=3] - number of decimal points to round numeric values to. The default is
+ * 3, i.e. 1.23456 will round to 1.234
+ * @returns {Array}
+ * @public
+ */
+ stack: function(config) {
+ var config = config || {},
+ loose = config.loose,
+ decimalPoints = config.decimalPoints === undefined ? 3 : config.decimalPoints,
+ ret = [];
+
+ if (loose) {
+ each(this._stack, function(el, n) {
+ ret.push(el.method || el.attr);
+ });
+ }
+ else {
+ each(this._stack, function(el, n) {
+ // if method instruction
+ if (el.method) {
+ ret.push({
+ method: el.method,
+ arguments: roundArr(el.arguments, decimalPoints)
+ });
+ }
+ // if attr
+ else if (el.attr) {
+ ret.push({
+ attr: el.attr,
+ val: isNumber(el.val) ? round(el.val, decimalPoints) : el.val
+ });
+ }
+ });
+ }
+
+ return ret;
+ },
+ /**
+ * serialize a stack into a string
+ * @method json
+ * @param {Object} config
+ * @param {String} [config.loose=false] - strict mode returns method calls with arguments and property names
+ * with values. loose mode only returns method calls and property names
+ * @param {Number} [config.decimalPoints=3] - number of decimal points to round numeric values to. The default is
+ * 3, i.e. 1.23456 will round to 1.234
+ * @returns {String}
+ * @public
+ */
+ json: function(config) {
+ return JSON.stringify(this.stack(config));
+ },
+ /**
+ * convert a stack into a small hash string for easy comparisons
+ * @method hash
+ * @param {Object} config
+ * @param {String} [config.loose=false] - strict mode returns method calls with arguments and property names
+ * with values. loose mode only returns method calls and property names
+ * @param {Number} [config.decimalPoints=3] - number of decimal points to round numeric values to. The default is
+ * 3, i.e. 1.23456 will round to 1.234
+ * @public
+ * @returns {String}
+ */
+ hash: function(config) {
+ return Canteen.md5(this.json(config));
+ },
+ /**
+ * clear the stack
+ * @method clear
+ * @public
+ */
+ clear: function() {
+ this._stack = [];
+ },
+ /**
+ * push instruction method onto the stack
+ * @method _pushMethod
+ * @param {String} method
+ * @param {arguments} args
+ * @private
+ */
+ _pushMethod: function(method, args) {
+ this._stack.push({
+ method: method,
+ arguments: Array.prototype.slice.call(args, 0)
+ });
+
+ this._slice();
+ },
+ /**
+ * push instruction attribute onto the stack
+ * @method _pushAttr
+ * @param {String} attr
+ * @param {*} val
+ * @private
+ */
+ _pushAttr: function(attr, val) {
+ this._stack.push({
+ attr: attr,
+ val: val
+ });
+
+ this._slice();
+ },
+ /**
+ * slice the stack if needed. This means making sure that it doesn't exceed
+ * the STACK_SIZE. if it does, then shorten the stack starting from the beginning
+ * @method _slice
+ * @private
+ */
+ _slice: function() {
+ var stack = this._stack,
+ len = stack.length,
+ exceded = len - Canteen.globals.STACK_SIZE;
+ if (exceded > 0) {
+ this._stack = stack.slice(exceded);
+ }
+ }
+ };
+
+ // generate observable methods and add them to the Canteen prototype
+ (function(){
+ var proto = CanvasRenderingContext2D.prototype,
+ key, val, desc;
+
+ function addMethod(key, val) {
+ Canteen.prototype[key] = function() {
+ this._pushMethod(key, arguments);
+ return this.context[key].apply(this.context, arguments);
+ };
+ }
+
+ for (key in proto) {
+ desc = Object.getOwnPropertyDescriptor(CanvasRenderingContext2D.prototype, key);
+ val = (desc && desc.value ? proto[key] : null);
+ if (isFunction(val)) {
+ addMethod(key, val);
+ }
+ }
+ })();
+
+ // ================================ Global Config ================================
+ /**
+ * global config. You can directly change these values in order to configure Canteen
+ * @static
+ * @example
+ * // change stack size to 3000
+ * Canteen.globals.STACK_SIZE = 3000;
+ */
+ Canteen.globals = {
+ STACK_SIZE: 10000
+ };
+
+ // ================================ Initialization ================================
+
+ // override the canvas context getContext method in order to automatically instantiate
+ // a Canteen instance and wrap the native context object
+ (function(){
+ var origGetContext = HTMLCanvasElement.prototype.getContext;
+
+ HTMLCanvasElement.prototype.getContext = function() {
+ var context = origGetContext.apply(this, arguments);
+
+ // if the context already has a canteen instance, then return it
+ if (context.canteen) {
+ return context.canteen
+ }
+ // if the context does not have a canteen instance, then instantiate one
+ // and return it
+ else {
+ context.canteen = new Canteen(context);
+ return context.canteen;
+ }
+ }
+ })();
+
+ // make the Canteen namespace global so that developers can configure
+ // it via Canteen.globals, or override methods if desired
+ window.Canteen = Canteen;
+})();
+;/*
+ * JavaScript MD5 1.0.1
+ * https://github.com/blueimp/JavaScript-MD5
+ *
+ * Copyright 2011, Sebastian Tschan
+ * https://blueimp.net
+ *
+ * Licensed under the MIT license:
+ * http://www.opensource.org/licenses/MIT
+ *
+ * Based on
+ * A JavaScript implementation of the RSA Data Security, Inc. MD5 Message
+ * Digest Algorithm, as defined in RFC 1321.
+ * Version 2.2 Copyright (C) Paul Johnston 1999 - 2009
+ * Other contributors: Greg Holt, Andrew Kepert, Ydnar, Lostinet
+ * Distributed under the BSD License
+ * See http://pajhome.org.uk/crypt/md5 for more info.
+ */
+
+/*jslint bitwise: true */
+/*global unescape, define */
+(function ($) {
+ 'use strict';
+
+ /*
+ * Add integers, wrapping at 2^32. This uses 16-bit operations internally
+ * to work around bugs in some JS interpreters.
+ */
+ function safe_add(x, y) {
+ var lsw = (x & 0xFFFF) + (y & 0xFFFF),
+ msw = (x >> 16) + (y >> 16) + (lsw >> 16);
+ return (msw << 16) | (lsw & 0xFFFF);
+ }
+
+ /*
+ * Bitwise rotate a 32-bit number to the left.
+ */
+ function bit_rol(num, cnt) {
+ return (num << cnt) | (num >>> (32 - cnt));
+ }
+
+ /*
+ * These functions implement the four basic operations the algorithm uses.
+ */
+ function md5_cmn(q, a, b, x, s, t) {
+ return safe_add(bit_rol(safe_add(safe_add(a, q), safe_add(x, t)), s), b);
+ }
+ function md5_ff(a, b, c, d, x, s, t) {
+ return md5_cmn((b & c) | ((~b) & d), a, b, x, s, t);
+ }
+ function md5_gg(a, b, c, d, x, s, t) {
+ return md5_cmn((b & d) | (c & (~d)), a, b, x, s, t);
+ }
+ function md5_hh(a, b, c, d, x, s, t) {
+ return md5_cmn(b ^ c ^ d, a, b, x, s, t);
+ }
+ function md5_ii(a, b, c, d, x, s, t) {
+ return md5_cmn(c ^ (b | (~d)), a, b, x, s, t);
+ }
+
+ /*
+ * Calculate the MD5 of an array of little-endian words, and a bit length.
+ */
+ function binl_md5(x, len) {
+ /* append padding */
+ x[len >> 5] |= 0x80 << (len % 32);
+ x[(((len + 64) >>> 9) << 4) + 14] = len;
+
+ var i, olda, oldb, oldc, oldd,
+ a = 1732584193,
+ b = -271733879,
+ c = -1732584194,
+ d = 271733878;
+
+ for (i = 0; i < x.length; i += 16) {
+ olda = a;
+ oldb = b;
+ oldc = c;
+ oldd = d;
+
+ a = md5_ff(a, b, c, d, x[i], 7, -680876936);
+ d = md5_ff(d, a, b, c, x[i + 1], 12, -389564586);
+ c = md5_ff(c, d, a, b, x[i + 2], 17, 606105819);
+ b = md5_ff(b, c, d, a, x[i + 3], 22, -1044525330);
+ a = md5_ff(a, b, c, d, x[i + 4], 7, -176418897);
+ d = md5_ff(d, a, b, c, x[i + 5], 12, 1200080426);
+ c = md5_ff(c, d, a, b, x[i + 6], 17, -1473231341);
+ b = md5_ff(b, c, d, a, x[i + 7], 22, -45705983);
+ a = md5_ff(a, b, c, d, x[i + 8], 7, 1770035416);
+ d = md5_ff(d, a, b, c, x[i + 9], 12, -1958414417);
+ c = md5_ff(c, d, a, b, x[i + 10], 17, -42063);
+ b = md5_ff(b, c, d, a, x[i + 11], 22, -1990404162);
+ a = md5_ff(a, b, c, d, x[i + 12], 7, 1804603682);
+ d = md5_ff(d, a, b, c, x[i + 13], 12, -40341101);
+ c = md5_ff(c, d, a, b, x[i + 14], 17, -1502002290);
+ b = md5_ff(b, c, d, a, x[i + 15], 22, 1236535329);
+
+ a = md5_gg(a, b, c, d, x[i + 1], 5, -165796510);
+ d = md5_gg(d, a, b, c, x[i + 6], 9, -1069501632);
+ c = md5_gg(c, d, a, b, x[i + 11], 14, 643717713);
+ b = md5_gg(b, c, d, a, x[i], 20, -373897302);
+ a = md5_gg(a, b, c, d, x[i + 5], 5, -701558691);
+ d = md5_gg(d, a, b, c, x[i + 10], 9, 38016083);
+ c = md5_gg(c, d, a, b, x[i + 15], 14, -660478335);
+ b = md5_gg(b, c, d, a, x[i + 4], 20, -405537848);
+ a = md5_gg(a, b, c, d, x[i + 9], 5, 568446438);
+ d = md5_gg(d, a, b, c, x[i + 14], 9, -1019803690);
+ c = md5_gg(c, d, a, b, x[i + 3], 14, -187363961);
+ b = md5_gg(b, c, d, a, x[i + 8], 20, 1163531501);
+ a = md5_gg(a, b, c, d, x[i + 13], 5, -1444681467);
+ d = md5_gg(d, a, b, c, x[i + 2], 9, -51403784);
+ c = md5_gg(c, d, a, b, x[i + 7], 14, 1735328473);
+ b = md5_gg(b, c, d, a, x[i + 12], 20, -1926607734);
+
+ a = md5_hh(a, b, c, d, x[i + 5], 4, -378558);
+ d = md5_hh(d, a, b, c, x[i + 8], 11, -2022574463);
+ c = md5_hh(c, d, a, b, x[i + 11], 16, 1839030562);
+ b = md5_hh(b, c, d, a, x[i + 14], 23, -35309556);
+ a = md5_hh(a, b, c, d, x[i + 1], 4, -1530992060);
+ d = md5_hh(d, a, b, c, x[i + 4], 11, 1272893353);
+ c = md5_hh(c, d, a, b, x[i + 7], 16, -155497632);
+ b = md5_hh(b, c, d, a, x[i + 10], 23, -1094730640);
+ a = md5_hh(a, b, c, d, x[i + 13], 4, 681279174);
+ d = md5_hh(d, a, b, c, x[i], 11, -358537222);
+ c = md5_hh(c, d, a, b, x[i + 3], 16, -722521979);
+ b = md5_hh(b, c, d, a, x[i + 6], 23, 76029189);
+ a = md5_hh(a, b, c, d, x[i + 9], 4, -640364487);
+ d = md5_hh(d, a, b, c, x[i + 12], 11, -421815835);
+ c = md5_hh(c, d, a, b, x[i + 15], 16, 530742520);
+ b = md5_hh(b, c, d, a, x[i + 2], 23, -995338651);
+
+ a = md5_ii(a, b, c, d, x[i], 6, -198630844);
+ d = md5_ii(d, a, b, c, x[i + 7], 10, 1126891415);
+ c = md5_ii(c, d, a, b, x[i + 14], 15, -1416354905);
+ b = md5_ii(b, c, d, a, x[i + 5], 21, -57434055);
+ a = md5_ii(a, b, c, d, x[i + 12], 6, 1700485571);
+ d = md5_ii(d, a, b, c, x[i + 3], 10, -1894986606);
+ c = md5_ii(c, d, a, b, x[i + 10], 15, -1051523);
+ b = md5_ii(b, c, d, a, x[i + 1], 21, -2054922799);
+ a = md5_ii(a, b, c, d, x[i + 8], 6, 1873313359);
+ d = md5_ii(d, a, b, c, x[i + 15], 10, -30611744);
+ c = md5_ii(c, d, a, b, x[i + 6], 15, -1560198380);
+ b = md5_ii(b, c, d, a, x[i + 13], 21, 1309151649);
+ a = md5_ii(a, b, c, d, x[i + 4], 6, -145523070);
+ d = md5_ii(d, a, b, c, x[i + 11], 10, -1120210379);
+ c = md5_ii(c, d, a, b, x[i + 2], 15, 718787259);
+ b = md5_ii(b, c, d, a, x[i + 9], 21, -343485551);
+
+ a = safe_add(a, olda);
+ b = safe_add(b, oldb);
+ c = safe_add(c, oldc);
+ d = safe_add(d, oldd);
+ }
+ return [a, b, c, d];
+ }
+
+ /*
+ * Convert an array of little-endian words to a string
+ */
+ function binl2rstr(input) {
+ var i,
+ output = '';
+ for (i = 0; i < input.length * 32; i += 8) {
+ output += String.fromCharCode((input[i >> 5] >>> (i % 32)) & 0xFF);
+ }
+ return output;
+ }
+
+ /*
+ * Convert a raw string to an array of little-endian words
+ * Characters >255 have their high-byte silently ignored.
+ */
+ function rstr2binl(input) {
+ var i,
+ output = [];
+ output[(input.length >> 2) - 1] = undefined;
+ for (i = 0; i < output.length; i += 1) {
+ output[i] = 0;
+ }
+ for (i = 0; i < input.length * 8; i += 8) {
+ output[i >> 5] |= (input.charCodeAt(i / 8) & 0xFF) << (i % 32);
+ }
+ return output;
+ }
+
+ /*
+ * Calculate the MD5 of a raw string
+ */
+ function rstr_md5(s) {
+ return binl2rstr(binl_md5(rstr2binl(s), s.length * 8));
+ }
+
+ /*
+ * Calculate the HMAC-MD5, of a key and some data (raw strings)
+ */
+ function rstr_hmac_md5(key, data) {
+ var i,
+ bkey = rstr2binl(key),
+ ipad = [],
+ opad = [],
+ hash;
+ ipad[15] = opad[15] = undefined;
+ if (bkey.length > 16) {
+ bkey = binl_md5(bkey, key.length * 8);
+ }
+ for (i = 0; i < 16; i += 1) {
+ ipad[i] = bkey[i] ^ 0x36363636;
+ opad[i] = bkey[i] ^ 0x5C5C5C5C;
+ }
+ hash = binl_md5(ipad.concat(rstr2binl(data)), 512 + data.length * 8);
+ return binl2rstr(binl_md5(opad.concat(hash), 512 + 128));
+ }
+
+ /*
+ * Convert a raw string to a hex string
+ */
+ function rstr2hex(input) {
+ var hex_tab = '0123456789abcdef',
+ output = '',
+ x,
+ i;
+ for (i = 0; i < input.length; i += 1) {
+ x = input.charCodeAt(i);
+ output += hex_tab.charAt((x >>> 4) & 0x0F) +
+ hex_tab.charAt(x & 0x0F);
+ }
+ return output;
+ }
+
+ /*
+ * Encode a string as utf-8
+ */
+ function str2rstr_utf8(input) {
+ return unescape(encodeURIComponent(input));
+ }
+
+ /*
+ * Take string arguments and return either raw or hex encoded strings
+ */
+ function raw_md5(s) {
+ return rstr_md5(str2rstr_utf8(s));
+ }
+ function hex_md5(s) {
+ return rstr2hex(raw_md5(s));
+ }
+ function raw_hmac_md5(k, d) {
+ return rstr_hmac_md5(str2rstr_utf8(k), str2rstr_utf8(d));
+ }
+ function hex_hmac_md5(k, d) {
+ return rstr2hex(raw_hmac_md5(k, d));
+ }
+
+ function md5(string, key, raw) {
+ if (!key) {
+ if (!raw) {
+ return hex_md5(string);
+ }
+ return raw_md5(string);
+ }
+ if (!raw) {
+ return hex_hmac_md5(key, string);
+ }
+ return raw_hmac_md5(key, string);
+ }
+
+ if (typeof define === 'function' && define.amd) {
+ define(function () {
+ return md5;
+ });
+ } else {
+ $.md5 = md5;
+ }
+}(Canteen));
diff --git a/test/lib/testHelper.js b/test/lib/testHelper.js
index af7a263..8aba7d7 100644
--- a/test/lib/testHelper.js
+++ b/test/lib/testHelper.js
@@ -56,7 +56,7 @@
* @param {boolean} [opt.autoResize=true]
* @param {Array.<Object>|Object} [opt.button] {text: ..., onClick: ...}, or an array of them.
* @param {Array.<Object>|Object} [opt.buttons] {text: ..., onClick: ...}, or an array of them.
- * @param {boolean} [opt.recordCanvas] 'ut/lib/canteen.js' is required.
+ * @param {boolean} [opt.recordCanvas] 'test/lib/canteen.js' is required.
*/
testHelper.create = function (echarts, domOrId, opt) {
var dom = getDom(domOrId);
@@ -163,7 +163,7 @@
eachCtx(function (zlevel, ctx) {
content.push('Layer zlevel: ' + zlevel, '\n\n');
if (typeof ctx.stack !== 'function') {
- alert('Missing: <script src="ut/lib/canteen.js"></script>');
+ alert('Missing: <script src="test/lib/canteen.js"></script>');
return;
}
var stack = ctx.stack();
@@ -475,7 +475,8 @@
str = preStr + obj + '';
break;
case 'string':
- str = preStr + quotationMark + obj + quotationMark;
+ str = JSON.stringify(obj); // escapse \n\r or others.
+ str = preStr + quotationMark + str.slice(1, str.length - 1) + quotationMark;
break;
default:
str = preStr + obj + '';
@@ -488,7 +489,118 @@
}
};
+ /**
+ * Usage:
+ * ```js
+ * // Print all elements that has `style.text`:
+ * var str = testHelper.stringifyElements(chart, {
+ * attr: ['z', 'z2', 'style.text', 'style.fill', 'style.stroke'],
+ * filter: el => el.style && el.style.text
+ * });
+ * ```
+ *
+ * @param {EChart} chart
+ * @param {Object} [opt]
+ * @param {string|Array.<string>} [opt.attr] Only print the given attrName;
+ * For example: 'z2' or ['z2', 'style.fill', 'style.stroke']
+ * @param {function} [opt.filter] print a subtree only if any satisfied node exists.
+ * param: el, return: boolean
+ * @param {boolean} [opt.preventPrint]
+ */
+ testHelper.stringifyElements = function (chart, opt) {
+ if (!chart) {
+ return;
+ }
+ opt = opt || {};
+ var attrNameList = opt.attr;
+ if (getType(attrNameList) !== 'array') {
+ attrNameList = attrNameList ? [attrNameList] : [];
+ }
+
+ var zr = chart.getZr();
+ var roots = zr.storage.getRoots();
+ var plainRoots = [];
+
+ retrieve(roots, plainRoots);
+
+ var elsStr = printObject(plainRoots, {indent: 2});
+
+ return elsStr;
+
+ // Only retrieve the value of the given attrName.
+ function retrieve(elList, plainNodes) {
+ var anySatisfied = false;
+ for (var i = 0; i < elList.length; i++) {
+ var el = elList[i];
+
+ var thisElSatisfied = !opt.filter || opt.filter(el);
+
+ var plainNode = {};
+
+ copyElment(plainNode, el);
+
+ var textContent = el.getTextContent();
+ if (textContent) {
+ plainNode.textContent = {};
+ copyElment(plainNode.textContent, textContent);
+ }
+
+ var thisSubAnySatisfied = false;
+ if (el.isGroup) {
+ plainNode.children = [];
+ thisSubAnySatisfied = retrieve(el.childrenRef(), plainNode.children);
+ }
+ if (thisElSatisfied || thisSubAnySatisfied) {
+ plainNodes.push(plainNode);
+ anySatisfied = true;
+ }
+ }
+
+ return anySatisfied;
+ }
+
+ function copyElment(plainNode, el) {
+ for (var i = 0; i < attrNameList.length; i++) {
+ var attrName = attrNameList[i];
+ var attrParts = attrName.split('.');
+ var partsLen = attrParts.length;
+ if (!partsLen) {
+ continue;
+ }
+ var elInner = el;
+ var plainInner = plainNode;
+ for (var j = 0; j < partsLen - 1 && elInner; j++) {
+ var attr = attrParts[j];
+ elInner = el[attr];
+ if (elInner) {
+ plainInner = plainInner[attr] || (plainInner[attr] = {});
+ }
+ }
+ var attr = attrParts[partsLen - 1];
+ if (elInner && elInner.hasOwnProperty(attr)) {
+ plainInner[attr] = elInner[attr];
+ }
+ }
+ }
+ };
+
+ /**
+ * Usage:
+ * ```js
+ * // Print all elements that has `style.text`:
+ * testHelper.printElements(chart, {
+ * attr: ['z', 'z2', 'style.text', 'style.fill', 'style.stroke'],
+ * filter: el => el.style && el.style.text
+ * });
+ * ```
+ *
+ * @see `stringifyElements`.
+ */
+ testHelper.printElements = function (chart, opt) {
+ var elsStr = testHelper.stringifyElements(chart, opt);
+ console.log(elsStr);
+ };
function createDataTableHTML(data, opt) {
var sourceFormat = detectSourceFormat(data);
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@echarts.apache.org
For additional commands, e-mail: commits-help@echarts.apache.org
[incubator-echarts] 04/08: fix: fix mktest and test facility
Posted by su...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
sushuang pushed a commit to branch attached-text
in repository https://gitbox.apache.org/repos/asf/incubator-echarts.git
commit 560ea38a10ce90590c16edc1181c6a44ef323204
Author: 100pah <su...@gmail.com>
AuthorDate: Fri Apr 24 00:17:42 2020 +0800
fix: fix mktest and test facility
---
test/build/mktest.js | 22 +++++++++-------------
test/lib/caseFrame.css | 4 ++--
2 files changed, 11 insertions(+), 15 deletions(-)
diff --git a/test/build/mktest.js b/test/build/mktest.js
index 9734e9c..3c618c9 100755
--- a/test/build/mktest.js
+++ b/test/build/mktest.js
@@ -24,11 +24,7 @@ const nodeFS = require('fs');
const assert = require('assert');
const nodePath = require('path');
const commander = require('commander');
-const {color} = require('zrender/build/helper');
-
-const colorFgCyanDim = color('fgCyan', 'dim');
-const colorFgGreen = color('fgGreen');
-const colorFgRed = color('fgRed');
+const chalk = require('chalk');
const testDir = nodePath.resolve(__dirname, '..');
const testTplPath = nodePath.resolve(__dirname, 'mktest-tpl.html');
@@ -38,19 +34,19 @@ const tagDomPlace = '<!-- TPL_DOM_PLACE -->';
const tagJSPlace = '<!-- TPL_JS_PLACE -->';
const manualText = `
- ${colorFgCyanDim('Usage:')}
+ ${chalk.cyan.dim('Usage:')}
# Make a file named "bar-action.html" in directory "echarts/test" with 1 initial chart.
- ${colorFgGreen('npm run mktest bar-action')}
+ ${chalk.green('npm run mktest bar-action')}
# or
- ${colorFgGreen('npm run mktest bar-action.html')}
+ ${chalk.green('npm run mktest bar-action.html')}
# or
- ${colorFgGreen('node ./test/build/mktest bar-action')}
+ ${chalk.green('node ./test/build/mktest bar-action')}
# Make a file named "bar-action.html" in directory "echarts/test" with 5 initial charts.
- ${colorFgGreen('npm run mktest bar-action 5')}
+ ${chalk.green('npm run mktest bar-action 5')}
# or
- ${colorFgGreen('node ./test/build/mktest bar-action 5')}
+ ${chalk.green('node ./test/build/mktest bar-action 5')}
`;
function run() {
@@ -73,7 +69,7 @@ function run() {
nodeFS.writeFileSync(opt.testFilePath, testFileContent, {encoding: 'utf8'});
- console.log(`A test file has been added in: \n${colorFgGreen(opt.testFilePath)}`);
+ console.log(`A test file has been added in: \n${chalk.green(opt.testFilePath)}`);
console.log();
}
@@ -150,7 +146,7 @@ function normalizeInputExt(testFileName) {
}
function printError(msg) {
- console.error(colorFgRed('[ERROR]: ' + msg));
+ console.error(chalk.red('[ERROR]: ' + msg));
}
run();
diff --git a/test/lib/caseFrame.css b/test/lib/caseFrame.css
index 97ad1c7..11816b5 100644
--- a/test/lib/caseFrame.css
+++ b/test/lib/caseFrame.css
@@ -29,7 +29,7 @@
left: 0;
top: 0;
bottom: 0;
- width: 230px;
+ width: 250px;
overflow: auto;
font-size: 13px;
}
@@ -63,7 +63,7 @@
margin: 10px 0;
}
.case-frame .page-content {
- margin-left: 235px;
+ margin-left: 255px;
height: 100%;
padding: 0;
position: relative;
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@echarts.apache.org
For additional commands, e-mail: commits-help@echarts.apache.org
[incubator-echarts] 06/08: test: add test facility.
Posted by su...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
sushuang pushed a commit to branch attached-text
in repository https://gitbox.apache.org/repos/asf/incubator-echarts.git
commit 19bf4d4822677144a1275a64002d27e8b8a36859
Author: 100pah <su...@gmail.com>
AuthorDate: Fri Apr 24 00:46:02 2020 +0800
test: add test facility.
---
test/lib/testHelper.js | 40 +++++++++++++++++++++++++++++++++++++++-
1 file changed, 39 insertions(+), 1 deletion(-)
diff --git a/test/lib/testHelper.js b/test/lib/testHelper.js
index 8aba7d7..d6685d4 100644
--- a/test/lib/testHelper.js
+++ b/test/lib/testHelper.js
@@ -169,7 +169,7 @@
var stack = ctx.stack();
for (var i = 0; i < stack.length; i++) {
var line = stack[i];
- content.push(JSON.stringify(line), '\n');
+ content.push(JSON.stringify(line), ',\n');
}
});
contentAraa.style.display = 'block';
@@ -602,6 +602,44 @@
console.log(elsStr);
};
+ // opt: {record: JSON, width: number, height: number}
+ testHelper.reproduceCanteen = function (opt) {
+ var canvas = document.createElement('canvas');
+ canvas.style.width = opt.width + 'px';
+ canvas.style.height = opt.height + 'px';
+ var dpr = Math.max(window.devicePixelRatio || 1, 1);
+ canvas.width = opt.width * dpr;
+ canvas.height = opt.height * dpr;
+
+ var ctx = canvas.getContext('2d');
+ var record = opt.record;
+
+ for (var i = 0; i < record.length; i++) {
+ var line = record[i];
+ if (line.attr) {
+ if (!line.hasOwnProperty('val')) {
+ alertIllegal(line);
+ }
+ ctx[line.attr] = line.val;
+ }
+ else if (line.method) {
+ if (!line.hasOwnProperty('arguments')) {
+ alertIllegal(line);
+ }
+ ctx[line.method].apply(ctx, line.arguments);
+ }
+ else {
+ alertIllegal(line);
+ }
+ }
+
+ function alertIllegal(line) {
+ throw new Error('Illegal line: ' + JSON.stringify(line));
+ }
+
+ document.body.appendChild(canvas);
+ };
+
function createDataTableHTML(data, opt) {
var sourceFormat = detectSourceFormat(data);
var dataTableLimit = opt.dataTableLimit || DEFAULT_DATA_TABLE_LIMIT;
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@echarts.apache.org
For additional commands, e-mail: commits-help@echarts.apache.org
[incubator-echarts] 01/08: enhance: adjust innerFill/innerStroke
rule
Posted by su...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
sushuang pushed a commit to branch attached-text
in repository https://gitbox.apache.org/repos/asf/incubator-echarts.git
commit 05e35a3d13fd486e30a8d9cf70663ec0b0114305
Author: 100pah <su...@gmail.com>
AuthorDate: Mon Apr 20 22:35:44 2020 +0800
enhance: adjust innerFill/innerStroke rule
---
src/chart/funnel/FunnelView.ts | 2 +-
src/chart/pie/PieView.ts | 2 +-
src/chart/sunburst/SunburstPiece.ts | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/chart/funnel/FunnelView.ts b/src/chart/funnel/FunnelView.ts
index 47e1209..cfed271 100644
--- a/src/chart/funnel/FunnelView.ts
+++ b/src/chart/funnel/FunnelView.ts
@@ -125,7 +125,7 @@ class FunnelPiece extends graphic.Group {
local: true,
inside: !!labelLayout.inside,
insideStroke: visualColor,
- insideFill: 'auto',
+ // insideFill: 'auto',
outsideFill: visualColor
});
diff --git a/src/chart/pie/PieView.ts b/src/chart/pie/PieView.ts
index 020e624..4383b25 100644
--- a/src/chart/pie/PieView.ts
+++ b/src/chart/pie/PieView.ts
@@ -260,7 +260,7 @@ class PiePiece extends graphic.Group {
local: true,
inside: !!labelLayout.inside,
insideStroke: visualColor,
- insideFill: 'auto',
+ // insideFill: 'auto',
outsideFill: visualColor
});
diff --git a/src/chart/sunburst/SunburstPiece.ts b/src/chart/sunburst/SunburstPiece.ts
index 86bf38a..2953bff 100644
--- a/src/chart/sunburst/SunburstPiece.ts
+++ b/src/chart/sunburst/SunburstPiece.ts
@@ -283,7 +283,7 @@ class SunburstPiece extends graphic.Group {
sector.setTextConfig({
inside: labelPosition !== 'outside',
insideStroke: visualColor,
- insideFill: 'auto',
+ // insideFill: 'auto',
outsideFill: visualColor
});
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@echarts.apache.org
For additional commands, e-mail: commits-help@echarts.apache.org
[incubator-echarts] 07/08: tweak
Posted by su...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
sushuang pushed a commit to branch attached-text
in repository https://gitbox.apache.org/repos/asf/incubator-echarts.git
commit b35d7980774dd566523b9cb2b2047eab83b6c3e3
Author: 100pah <su...@gmail.com>
AuthorDate: Sun Apr 26 05:01:40 2020 +0800
tweak
---
src/util/graphic.ts | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/util/graphic.ts b/src/util/graphic.ts
index e701301..724279a 100644
--- a/src/util/graphic.ts
+++ b/src/util/graphic.ts
@@ -803,7 +803,7 @@ export function createTextConfig(
textConfig.insideStroke = opt.autoColor || null;
// Set default stroke, which is useful when label is over other
// messy graphics (like lines) in background.
- textConfig.outsideStroke = 'rgba(255, 255, 255, 0.7)';
+ textConfig.outsideStroke = 'rgba(255, 255, 255, 0.9)';
// if (!textStyle.fill) {
// textConfig.insideFill = 'auto';
// textConfig.outsideFill = opt.autoColor || null;
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@echarts.apache.org
For additional commands, e-mail: commits-help@echarts.apache.org
[incubator-echarts] 08/08: Merge branch 'next' into
custom-series-enhance
Posted by su...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
sushuang pushed a commit to branch attached-text
in repository https://gitbox.apache.org/repos/asf/incubator-echarts.git
commit 3687f4ba2ab5ebd284c34a65c7da7eee9566f23c
Merge: b35d798 a96d971
Author: 100pah <su...@gmail.com>
AuthorDate: Sun Apr 26 05:04:09 2020 +0800
Merge branch 'next' into custom-series-enhance
# Conflicts:
# src/util/graphic.ts
.eslintignore | 3 +-
src/chart/boxplot/boxplotLayout.ts | 2 +-
src/chart/candlestick/candlestickLayout.ts | 2 +-
src/chart/graph/GraphSeries.ts | 46 +++---
src/chart/graph/simpleLayout.ts | 2 +-
src/chart/helper/labelHelper.ts | 2 +-
src/chart/sankey/SankeySeries.ts | 36 +++--
src/chart/sankey/SankeyView.ts | 2 +-
src/component/axisPointer/axisTrigger.ts | 2 +-
src/component/dataZoom/AxisProxy.ts | 4 +-
src/component/tooltip/TooltipView.ts | 10 ++
src/coord/cartesian/Grid.ts | 2 +-
src/coord/polar/polarCreator.ts | 4 +-
src/coord/single/Single.ts | 2 +-
src/data/List.ts | 24 +--
src/echarts.ts | 3 +
src/model/Model.ts | 72 ++++-----
src/model/Series.ts | 8 +-
src/model/mixin/dataFormat.ts | 15 +-
src/util/graphic.ts | 3 -
src/visual/helper.ts | 2 +
src/visual/style.ts | 32 +++-
test/pie-visual.html | 252 +++++++++++++++++++++++++++++
23 files changed, 404 insertions(+), 126 deletions(-)
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@echarts.apache.org
For additional commands, e-mail: commits-help@echarts.apache.org
[incubator-echarts] 02/08: enhance: adjust insideFill/insideStroke
Posted by su...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
sushuang pushed a commit to branch attached-text
in repository https://gitbox.apache.org/repos/asf/incubator-echarts.git
commit 5cb15bc7e679ce968837a891a98fc8fc124cad17
Author: 100pah <su...@gmail.com>
AuthorDate: Mon Apr 20 22:36:55 2020 +0800
enhance: adjust insideFill/insideStroke
---
src/util/graphic.ts | 24 +++++++++++++-----------
1 file changed, 13 insertions(+), 11 deletions(-)
diff --git a/src/util/graphic.ts b/src/util/graphic.ts
index 727fd40..88eecf8 100644
--- a/src/util/graphic.ts
+++ b/src/util/graphic.ts
@@ -799,17 +799,19 @@ export function createTextConfig(
}
// fill and auto is determined by the color of path fill if it's not specified by developers.
- if (!textStyle.fill) {
- textConfig.insideFill = 'auto';
- textConfig.outsideFill = opt.autoColor || null;
- }
- if (!textStyle.stroke) {
- textConfig.insideStroke = 'auto';
- }
- else if (opt.autoColor) {
- // TODO: stroke set to autoColor. if label is inside?
- textConfig.insideStroke = opt.autoColor;
- }
+ textConfig.outsideFill = opt.autoColor || null;
+ textConfig.insideStroke = opt.autoColor || null;
+ // if (!textStyle.fill) {
+ // textConfig.insideFill = 'auto';
+ // textConfig.outsideFill = opt.autoColor || null;
+ // }
+ // if (!textStyle.stroke) {
+ // textConfig.insideStroke = 'auto';
+ // }
+ // else if (opt.autoColor) {
+ // // TODO: stroke set to autoColor. if label is inside?
+ // textConfig.insideStroke = opt.autoColor;
+ // }
return textConfig;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@echarts.apache.org
For additional commands, e-mail: commits-help@echarts.apache.org