hqchart 1.1.15474 → 1.1.15480
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/lib/umychart.vue.js +9 -9
- package/package.json +1 -1
- package/src/jscommon/umychart.complier.js +4 -4
- package/src/jscommon/umychart.report.js +77 -50
- package/src/jscommon/umychart.uniapp.h5/umychart.uniapp.h5.js +82 -55
- package/src/jscommon/umychart.version.js +1 -1
- package/src/jscommon/umychart.vue/umychart.vue.js +82 -55
package/lib/umychart.vue.js
CHANGED
|
@@ -10844,9 +10844,9 @@ NonAsciiIdentifierStart:/[\xAA\xB5\xBA\xC0-\xD6\xD8-\xF6\xF8-\u02C1\u02C6-\u02D1
|
|
|
10844
10844
|
NonAsciiIdentifierPart:/[\xAA\xB5\xB7\xBA\xC0-\xD6\xD8-\xF6\xF8-\u02C1\u02C6-\u02D1\u02E0-\u02E4\u02EC\u02EE\u0300-\u0374\u0376\u0377\u037A-\u037D\u037F\u0386-\u038A\u038C\u038E-\u03A1\u03A3-\u03F5\u03F7-\u0481\u0483-\u0487\u048A-\u052F\u0531-\u0556\u0559\u0561-\u0587\u0591-\u05BD\u05BF\u05C1\u05C2\u05C4\u05C5\u05C7\u05D0-\u05EA\u05F0-\u05F2\u0610-\u061A\u0620-\u0669\u066E-\u06D3\u06D5-\u06DC\u06DF-\u06E8\u06EA-\u06FC\u06FF\u0710-\u074A\u074D-\u07B1\u07C0-\u07F5\u07FA\u0800-\u082D\u0840-\u085B\u08A0-\u08B4\u08E3-\u0963\u0966-\u096F\u0971-\u0983\u0985-\u098C\u098F\u0990\u0993-\u09A8\u09AA-\u09B0\u09B2\u09B6-\u09B9\u09BC-\u09C4\u09C7\u09C8\u09CB-\u09CE\u09D7\u09DC\u09DD\u09DF-\u09E3\u09E6-\u09F1\u0A01-\u0A03\u0A05-\u0A0A\u0A0F\u0A10\u0A13-\u0A28\u0A2A-\u0A30\u0A32\u0A33\u0A35\u0A36\u0A38\u0A39\u0A3C\u0A3E-\u0A42\u0A47\u0A48\u0A4B-\u0A4D\u0A51\u0A59-\u0A5C\u0A5E\u0A66-\u0A75\u0A81-\u0A83\u0A85-\u0A8D\u0A8F-\u0A91\u0A93-\u0AA8\u0AAA-\u0AB0\u0AB2\u0AB3\u0AB5-\u0AB9\u0ABC-\u0AC5\u0AC7-\u0AC9\u0ACB-\u0ACD\u0AD0\u0AE0-\u0AE3\u0AE6-\u0AEF\u0AF9\u0B01-\u0B03\u0B05-\u0B0C\u0B0F\u0B10\u0B13-\u0B28\u0B2A-\u0B30\u0B32\u0B33\u0B35-\u0B39\u0B3C-\u0B44\u0B47\u0B48\u0B4B-\u0B4D\u0B56\u0B57\u0B5C\u0B5D\u0B5F-\u0B63\u0B66-\u0B6F\u0B71\u0B82\u0B83\u0B85-\u0B8A\u0B8E-\u0B90\u0B92-\u0B95\u0B99\u0B9A\u0B9C\u0B9E\u0B9F\u0BA3\u0BA4\u0BA8-\u0BAA\u0BAE-\u0BB9\u0BBE-\u0BC2\u0BC6-\u0BC8\u0BCA-\u0BCD\u0BD0\u0BD7\u0BE6-\u0BEF\u0C00-\u0C03\u0C05-\u0C0C\u0C0E-\u0C10\u0C12-\u0C28\u0C2A-\u0C39\u0C3D-\u0C44\u0C46-\u0C48\u0C4A-\u0C4D\u0C55\u0C56\u0C58-\u0C5A\u0C60-\u0C63\u0C66-\u0C6F\u0C81-\u0C83\u0C85-\u0C8C\u0C8E-\u0C90\u0C92-\u0CA8\u0CAA-\u0CB3\u0CB5-\u0CB9\u0CBC-\u0CC4\u0CC6-\u0CC8\u0CCA-\u0CCD\u0CD5\u0CD6\u0CDE\u0CE0-\u0CE3\u0CE6-\u0CEF\u0CF1\u0CF2\u0D01-\u0D03\u0D05-\u0D0C\u0D0E-\u0D10\u0D12-\u0D3A\u0D3D-\u0D44\u0D46-\u0D48\u0D4A-\u0D4E\u0D57\u0D5F-\u0D63\u0D66-\u0D6F\u0D7A-\u0D7F\u0D82\u0D83\u0D85-\u0D96\u0D9A-\u0DB1\u0DB3-\u0DBB\u0DBD\u0DC0-\u0DC6\u0DCA\u0DCF-\u0DD4\u0DD6\u0DD8-\u0DDF\u0DE6-\u0DEF\u0DF2\u0DF3\u0E01-\u0E3A\u0E40-\u0E4E\u0E50-\u0E59\u0E81\u0E82\u0E84\u0E87\u0E88\u0E8A\u0E8D\u0E94-\u0E97\u0E99-\u0E9F\u0EA1-\u0EA3\u0EA5\u0EA7\u0EAA\u0EAB\u0EAD-\u0EB9\u0EBB-\u0EBD\u0EC0-\u0EC4\u0EC6\u0EC8-\u0ECD\u0ED0-\u0ED9\u0EDC-\u0EDF\u0F00\u0F18\u0F19\u0F20-\u0F29\u0F35\u0F37\u0F39\u0F3E-\u0F47\u0F49-\u0F6C\u0F71-\u0F84\u0F86-\u0F97\u0F99-\u0FBC\u0FC6\u1000-\u1049\u1050-\u109D\u10A0-\u10C5\u10C7\u10CD\u10D0-\u10FA\u10FC-\u1248\u124A-\u124D\u1250-\u1256\u1258\u125A-\u125D\u1260-\u1288\u128A-\u128D\u1290-\u12B0\u12B2-\u12B5\u12B8-\u12BE\u12C0\u12C2-\u12C5\u12C8-\u12D6\u12D8-\u1310\u1312-\u1315\u1318-\u135A\u135D-\u135F\u1369-\u1371\u1380-\u138F\u13A0-\u13F5\u13F8-\u13FD\u1401-\u166C\u166F-\u167F\u1681-\u169A\u16A0-\u16EA\u16EE-\u16F8\u1700-\u170C\u170E-\u1714\u1720-\u1734\u1740-\u1753\u1760-\u176C\u176E-\u1770\u1772\u1773\u1780-\u17D3\u17D7\u17DC\u17DD\u17E0-\u17E9\u180B-\u180D\u1810-\u1819\u1820-\u1877\u1880-\u18AA\u18B0-\u18F5\u1900-\u191E\u1920-\u192B\u1930-\u193B\u1946-\u196D\u1970-\u1974\u1980-\u19AB\u19B0-\u19C9\u19D0-\u19DA\u1A00-\u1A1B\u1A20-\u1A5E\u1A60-\u1A7C\u1A7F-\u1A89\u1A90-\u1A99\u1AA7\u1AB0-\u1ABD\u1B00-\u1B4B\u1B50-\u1B59\u1B6B-\u1B73\u1B80-\u1BF3\u1C00-\u1C37\u1C40-\u1C49\u1C4D-\u1C7D\u1CD0-\u1CD2\u1CD4-\u1CF6\u1CF8\u1CF9\u1D00-\u1DF5\u1DFC-\u1F15\u1F18-\u1F1D\u1F20-\u1F45\u1F48-\u1F4D\u1F50-\u1F57\u1F59\u1F5B\u1F5D\u1F5F-\u1F7D\u1F80-\u1FB4\u1FB6-\u1FBC\u1FBE\u1FC2-\u1FC4\u1FC6-\u1FCC\u1FD0-\u1FD3\u1FD6-\u1FDB\u1FE0-\u1FEC\u1FF2-\u1FF4\u1FF6-\u1FFC\u200C\u200D\u203F\u2040\u2054\u2071\u207F\u2090-\u209C\u20D0-\u20DC\u20E1\u20E5-\u20F0\u2102\u2107\u210A-\u2113\u2115\u2118-\u211D\u2124\u2126\u2128\u212A-\u2139\u213C-\u213F\u2145-\u2149\u214E\u2160-\u2188\u2C00-\u2C2E\u2C30-\u2C5E\u2C60-\u2CE4\u2CEB-\u2CF3\u2D00-\u2D25\u2D27\u2D2D\u2D30-\u2D67\u2D6F\u2D7F-\u2D96\u2DA0-\u2DA6\u2DA8-\u2DAE\u2DB0-\u2DB6\u2DB8-\u2DBE\u2DC0-\u2DC6\u2DC8-\u2DCE\u2DD0-\u2DD6\u2DD8-\u2DDE\u2DE0-\u2DFF\u3005-\u3007\u3021-\u302F\u3031-\u3035\u3038-\u303C\u3041-\u3096\u3099-\u309F\u30A1-\u30FA\u30FC-\u30FF\u3105-\u312D\u3131-\u318E\u31A0-\u31BA\u31F0-\u31FF\u3400-\u4DB5\u4E00-\u9FD5\uA000-\uA48C\uA4D0-\uA4FD\uA500-\uA60C\uA610-\uA62B\uA640-\uA66F\uA674-\uA67D\uA67F-\uA6F1\uA717-\uA71F\uA722-\uA788\uA78B-\uA7AD\uA7B0-\uA7B7\uA7F7-\uA827\uA840-\uA873\uA880-\uA8C4\uA8D0-\uA8D9\uA8E0-\uA8F7\uA8FB\uA8FD\uA900-\uA92D\uA930-\uA953\uA960-\uA97C\uA980-\uA9C0\uA9CF-\uA9D9\uA9E0-\uA9FE\uAA00-\uAA36\uAA40-\uAA4D\uAA50-\uAA59\uAA60-\uAA76\uAA7A-\uAAC2\uAADB-\uAADD\uAAE0-\uAAEF\uAAF2-\uAAF6\uAB01-\uAB06\uAB09-\uAB0E\uAB11-\uAB16\uAB20-\uAB26\uAB28-\uAB2E\uAB30-\uAB5A\uAB5C-\uAB65\uAB70-\uABEA\uABEC\uABED\uABF0-\uABF9\uAC00-\uD7A3\uD7B0-\uD7C6\uD7CB-\uD7FB\uF900-\uFA6D\uFA70-\uFAD9\uFB00-\uFB06\uFB13-\uFB17\uFB1D-\uFB28\uFB2A-\uFB36\uFB38-\uFB3C\uFB3E\uFB40\uFB41\uFB43\uFB44\uFB46-\uFBB1\uFBD3-\uFD3D\uFD50-\uFD8F\uFD92-\uFDC7\uFDF0-\uFDFB\uFE00-\uFE0F\uFE20-\uFE2F\uFE33\uFE34\uFE4D-\uFE4F\uFE70-\uFE74\uFE76-\uFEFC\uFF10-\uFF19\uFF21-\uFF3A\uFF3F\uFF41-\uFF5A\uFF66-\uFFBE\uFFC2-\uFFC7\uFFCA-\uFFCF\uFFD2-\uFFD7\uFFDA-\uFFDC]|\uD800[\uDC00-\uDC0B\uDC0D-\uDC26\uDC28-\uDC3A\uDC3C\uDC3D\uDC3F-\uDC4D\uDC50-\uDC5D\uDC80-\uDCFA\uDD40-\uDD74\uDDFD\uDE80-\uDE9C\uDEA0-\uDED0\uDEE0\uDF00-\uDF1F\uDF30-\uDF4A\uDF50-\uDF7A\uDF80-\uDF9D\uDFA0-\uDFC3\uDFC8-\uDFCF\uDFD1-\uDFD5]|\uD801[\uDC00-\uDC9D\uDCA0-\uDCA9\uDD00-\uDD27\uDD30-\uDD63\uDE00-\uDF36\uDF40-\uDF55\uDF60-\uDF67]|\uD802[\uDC00-\uDC05\uDC08\uDC0A-\uDC35\uDC37\uDC38\uDC3C\uDC3F-\uDC55\uDC60-\uDC76\uDC80-\uDC9E\uDCE0-\uDCF2\uDCF4\uDCF5\uDD00-\uDD15\uDD20-\uDD39\uDD80-\uDDB7\uDDBE\uDDBF\uDE00-\uDE03\uDE05\uDE06\uDE0C-\uDE13\uDE15-\uDE17\uDE19-\uDE33\uDE38-\uDE3A\uDE3F\uDE60-\uDE7C\uDE80-\uDE9C\uDEC0-\uDEC7\uDEC9-\uDEE6\uDF00-\uDF35\uDF40-\uDF55\uDF60-\uDF72\uDF80-\uDF91]|\uD803[\uDC00-\uDC48\uDC80-\uDCB2\uDCC0-\uDCF2]|\uD804[\uDC00-\uDC46\uDC66-\uDC6F\uDC7F-\uDCBA\uDCD0-\uDCE8\uDCF0-\uDCF9\uDD00-\uDD34\uDD36-\uDD3F\uDD50-\uDD73\uDD76\uDD80-\uDDC4\uDDCA-\uDDCC\uDDD0-\uDDDA\uDDDC\uDE00-\uDE11\uDE13-\uDE37\uDE80-\uDE86\uDE88\uDE8A-\uDE8D\uDE8F-\uDE9D\uDE9F-\uDEA8\uDEB0-\uDEEA\uDEF0-\uDEF9\uDF00-\uDF03\uDF05-\uDF0C\uDF0F\uDF10\uDF13-\uDF28\uDF2A-\uDF30\uDF32\uDF33\uDF35-\uDF39\uDF3C-\uDF44\uDF47\uDF48\uDF4B-\uDF4D\uDF50\uDF57\uDF5D-\uDF63\uDF66-\uDF6C\uDF70-\uDF74]|\uD805[\uDC80-\uDCC5\uDCC7\uDCD0-\uDCD9\uDD80-\uDDB5\uDDB8-\uDDC0\uDDD8-\uDDDD\uDE00-\uDE40\uDE44\uDE50-\uDE59\uDE80-\uDEB7\uDEC0-\uDEC9\uDF00-\uDF19\uDF1D-\uDF2B\uDF30-\uDF39]|\uD806[\uDCA0-\uDCE9\uDCFF\uDEC0-\uDEF8]|\uD808[\uDC00-\uDF99]|\uD809[\uDC00-\uDC6E\uDC80-\uDD43]|[\uD80C\uD840-\uD868\uD86A-\uD86C\uD86F-\uD872][\uDC00-\uDFFF]|\uD80D[\uDC00-\uDC2E]|\uD811[\uDC00-\uDE46]|\uD81A[\uDC00-\uDE38\uDE40-\uDE5E\uDE60-\uDE69\uDED0-\uDEED\uDEF0-\uDEF4\uDF00-\uDF36\uDF40-\uDF43\uDF50-\uDF59\uDF63-\uDF77\uDF7D-\uDF8F]|\uD81B[\uDF00-\uDF44\uDF50-\uDF7E\uDF8F-\uDF9F]|\uD82C[\uDC00\uDC01]|\uD82F[\uDC00-\uDC6A\uDC70-\uDC7C\uDC80-\uDC88\uDC90-\uDC99\uDC9D\uDC9E]|\uD834[\uDD65-\uDD69\uDD6D-\uDD72\uDD7B-\uDD82\uDD85-\uDD8B\uDDAA-\uDDAD\uDE42-\uDE44]|\uD835[\uDC00-\uDC54\uDC56-\uDC9C\uDC9E\uDC9F\uDCA2\uDCA5\uDCA6\uDCA9-\uDCAC\uDCAE-\uDCB9\uDCBB\uDCBD-\uDCC3\uDCC5-\uDD05\uDD07-\uDD0A\uDD0D-\uDD14\uDD16-\uDD1C\uDD1E-\uDD39\uDD3B-\uDD3E\uDD40-\uDD44\uDD46\uDD4A-\uDD50\uDD52-\uDEA5\uDEA8-\uDEC0\uDEC2-\uDEDA\uDEDC-\uDEFA\uDEFC-\uDF14\uDF16-\uDF34\uDF36-\uDF4E\uDF50-\uDF6E\uDF70-\uDF88\uDF8A-\uDFA8\uDFAA-\uDFC2\uDFC4-\uDFCB\uDFCE-\uDFFF]|\uD836[\uDE00-\uDE36\uDE3B-\uDE6C\uDE75\uDE84\uDE9B-\uDE9F\uDEA1-\uDEAF]|\uD83A[\uDC00-\uDCC4\uDCD0-\uDCD6]|\uD83B[\uDE00-\uDE03\uDE05-\uDE1F\uDE21\uDE22\uDE24\uDE27\uDE29-\uDE32\uDE34-\uDE37\uDE39\uDE3B\uDE42\uDE47\uDE49\uDE4B\uDE4D-\uDE4F\uDE51\uDE52\uDE54\uDE57\uDE59\uDE5B\uDE5D\uDE5F\uDE61\uDE62\uDE64\uDE67-\uDE6A\uDE6C-\uDE72\uDE74-\uDE77\uDE79-\uDE7C\uDE7E\uDE80-\uDE89\uDE8B-\uDE9B\uDEA1-\uDEA3\uDEA5-\uDEA9\uDEAB-\uDEBB]|\uD869[\uDC00-\uDED6\uDF00-\uDFFF]|\uD86D[\uDC00-\uDF34\uDF40-\uDFFF]|\uD86E[\uDC00-\uDC1D\uDC20-\uDFFF]|\uD873[\uDC00-\uDEA1]|\uD87E[\uDC00-\uDE1D]|\uDB40[\uDD00-\uDDEF]/};var Character={FromCodePoint:function FromCodePoint(cp){return cp<0x10000?String.fromCharCode(cp):String.fromCharCode(0xD800+(cp-0x10000>>10))+String.fromCharCode(0xDC00+(cp-0x10000&1023));},//是否是空格 https://tc39.github.io/ecma262/#sec-white-space
|
|
10845
10845
|
IsWhiteSpace:function IsWhiteSpace(cp){return cp===0x20||cp===0x09||cp===0x0B||cp===0x0C||cp===0xA0||cp>=0x1680&&[0x1680,0x2000,0x2001,0x2002,0x2003,0x2004,0x2005,0x2006,0x2007,0x2008,0x2009,0x200A,0x202F,0x205F,0x3000,0xFEFF].indexOf(cp)>=0;},//是否换行 https://tc39.github.io/ecma262/#sec-line-terminators
|
|
10846
10846
|
IsLineTerminator:function IsLineTerminator(cp){return cp===0x0A||cp===0x0D||cp===0x2028||cp===0x2029;},// https://tc39.github.io/ecma262/#sec-names-and-keywords
|
|
10847
|
-
IsIdentifierStart:function IsIdentifierStart(cp){return cp===0x24||cp===0x5F||cp>=0x41&&cp<=0x5A||cp>=0x61&&cp<=0x7A||cp===0x5C||//【】▲▼
|
|
10848
|
-
cp===0x3010||cp===0x3011||cp===0x25B2||cp===0x25BC||cp>=0x80&&Regex.NonAsciiIdentifierStart.test(Character.FromCodePoint(cp));},IsIdentifierPart:function IsIdentifierPart(cp){return cp===0x24||cp===0x5F||cp>=0x41&&cp<=0x5A||cp>=0x61&&cp<=0x7A||cp>=0x30&&cp<=0x39||cp===0x5C||cp===0x23||//【】▲▼
|
|
10849
|
-
cp===0x3010||cp===0x3011||cp===0x25B2||cp===0x25BC||cp>=0x80&&Regex.NonAsciiIdentifierPart.test(Character.FromCodePoint(cp));},// https://tc39.github.io/ecma262/#sec-literals-numeric-literals
|
|
10847
|
+
IsIdentifierStart:function IsIdentifierStart(cp){return cp===0x24||cp===0x5F||cp>=0x41&&cp<=0x5A||cp>=0x61&&cp<=0x7A||cp===0x5C||//【】▲▼ ↓↑←→
|
|
10848
|
+
cp===0x3010||cp===0x3011||cp===0x25B2||cp===0x25BC||cp>=0x2190&&cp<=0x2193||cp>=0x80&&Regex.NonAsciiIdentifierStart.test(Character.FromCodePoint(cp));},IsIdentifierPart:function IsIdentifierPart(cp){return cp===0x24||cp===0x5F||cp>=0x41&&cp<=0x5A||cp>=0x61&&cp<=0x7A||cp>=0x30&&cp<=0x39||cp===0x5C||cp===0x23||//【】▲▼ ↓↑←→
|
|
10849
|
+
cp===0x3010||cp===0x3011||cp===0x25B2||cp===0x25BC||cp>=0x2190&&cp<=0x2193||cp>=0x80&&Regex.NonAsciiIdentifierPart.test(Character.FromCodePoint(cp));},// https://tc39.github.io/ecma262/#sec-literals-numeric-literals
|
|
10850
10850
|
IsDecimalDigit:function IsDecimalDigit(cp){return cp>=0x30&&cp<=0x39;// 0..9
|
|
10851
10851
|
},IsHexDigit:function IsHexDigit(cp){return cp>=0x30&&cp<=0x39||cp>=0x41&&cp<=0x46||cp>=0x61&&cp<=0x66;// a..f
|
|
10852
10852
|
},IsOctalDigit:function IsOctalDigit(cp){return cp>=0x30&&cp<=0x37;// 0..7
|
|
@@ -14079,10 +14079,10 @@ if(IFrameSplitOperator.IsNumber(item[36]))stock.Date=item[36];//日期
|
|
|
14079
14079
|
if(IFrameSplitOperator.IsBool(item[37]))stock.Checked=item[37];//1,3,5,10,15 涨速%
|
|
14080
14080
|
if(IFrameSplitOperator.IsNumber(item[43]))stock.RSpeed1M=item[43];if(IFrameSplitOperator.IsNumber(item[44]))stock.RSpeed3M=item[44];if(IFrameSplitOperator.IsNumber(item[45]))stock.RSpeed5M=item[45];if(IFrameSplitOperator.IsNumber(item[46]))stock.RSpeed10M=item[46];if(IFrameSplitOperator.IsNumber(item[47]))stock.RSpeed15M=item[47];if(item[80]||item[80]===null)stock.BGColor=item[80];//整行背景色
|
|
14081
14081
|
if(item[JSCHART_DATA_FIELD_ID.REPORT_EXTENDDATA])stock.ExtendDataV2=item[JSCHART_DATA_FIELD_ID.REPORT_EXTENDDATA];//扩展数据2
|
|
14082
|
-
//10个数值型 101-199
|
|
14083
|
-
if(
|
|
14084
|
-
if(
|
|
14085
|
-
if(
|
|
14082
|
+
function __Temp_IsNumberOrObject(value){if(IFrameSplitOperator.IsNumber(value))return true;if(IFrameSplitOperator.IsObject(value))return true;return false;}function __Temp_IsStringOrObject(value){if(IFrameSplitOperator.IsString(value))return true;if(IFrameSplitOperator.IsObject(value))return true;return false;}//10个数值型 101-199
|
|
14083
|
+
if(__Temp_IsNumberOrObject(item[101]))stock.ReserveNumber1=item[101];if(__Temp_IsNumberOrObject(item[102]))stock.ReserveNumber2=item[102];if(__Temp_IsNumberOrObject(item[103]))stock.ReserveNumber3=item[103];if(__Temp_IsNumberOrObject(item[104]))stock.ReserveNumber4=item[104];if(__Temp_IsNumberOrObject(item[105]))stock.ReserveNumber5=item[105];if(__Temp_IsNumberOrObject(item[106]))stock.ReserveNumber6=item[106];if(__Temp_IsNumberOrObject(item[107]))stock.ReserveNumber7=item[107];if(__Temp_IsNumberOrObject(item[108]))stock.ReserveNumber8=item[108];if(__Temp_IsNumberOrObject(item[109]))stock.ReserveNumber9=item[109];if(__Temp_IsNumberOrObject(item[110]))stock.ReserveNumber10=item[110];if(__Temp_IsNumberOrObject(item[111]))stock.ReserveNumber11=item[111];if(__Temp_IsNumberOrObject(item[112]))stock.ReserveNumber12=item[112];if(__Temp_IsNumberOrObject(item[113]))stock.ReserveNumber13=item[113];if(__Temp_IsNumberOrObject(item[114]))stock.ReserveNumber14=item[114];if(__Temp_IsNumberOrObject(item[115]))stock.ReserveNumber15=item[115];if(__Temp_IsNumberOrObject(item[116]))stock.ReserveNumber16=item[116];if(__Temp_IsNumberOrObject(item[117]))stock.ReserveNumber17=item[117];if(__Temp_IsNumberOrObject(item[118]))stock.ReserveNumber18=item[118];if(__Temp_IsNumberOrObject(item[119]))stock.ReserveNumber19=item[119];if(__Temp_IsNumberOrObject(item[120]))stock.ReserveNumber20=item[120];//10个字符型 201-299
|
|
14084
|
+
if(__Temp_IsStringOrObject(item[201]))stock.ReserveString1=item[201];if(__Temp_IsStringOrObject(item[202]))stock.ReserveString2=item[202];if(__Temp_IsStringOrObject(item[203]))stock.ReserveString3=item[203];if(__Temp_IsStringOrObject(item[204]))stock.ReserveString4=item[204];if(__Temp_IsStringOrObject(item[205]))stock.ReserveString5=item[205];if(__Temp_IsStringOrObject(item[206]))stock.ReserveString6=item[206];if(__Temp_IsStringOrObject(item[207]))stock.ReserveString7=item[207];if(__Temp_IsStringOrObject(item[208]))stock.ReserveString8=item[208];if(__Temp_IsStringOrObject(item[209]))stock.ReserveString9=item[209];if(__Temp_IsStringOrObject(item[210]))stock.ReserveString10=item[210];if(__Temp_IsStringOrObject(item[211]))stock.ReserveString11=item[211];if(__Temp_IsStringOrObject(item[212]))stock.ReserveString12=item[212];if(__Temp_IsStringOrObject(item[213]))stock.ReserveString13=item[213];if(__Temp_IsStringOrObject(item[214]))stock.ReserveString14=item[214];if(__Temp_IsStringOrObject(item[215]))stock.ReserveString15=item[215];if(__Temp_IsStringOrObject(item[216]))stock.ReserveString16=item[216];if(__Temp_IsStringOrObject(item[217]))stock.ReserveString17=item[217];if(__Temp_IsStringOrObject(item[218]))stock.ReserveString18=item[218];if(__Temp_IsStringOrObject(item[219]))stock.ReserveString19=item[219];if(__Temp_IsStringOrObject(item[220]))stock.ReserveString20=item[220];//10个进度条 301-350 { Value:, BGColor: }
|
|
14085
|
+
if(__Temp_IsNumberOrObject(item[301]))stock.ReserveProgressBar1=item[301];if(__Temp_IsNumberOrObject(item[302]))stock.ReserveProgressBar2=item[302];if(__Temp_IsNumberOrObject(item[303]))stock.ReserveProgressBar3=item[303];if(__Temp_IsNumberOrObject(item[304]))stock.ReserveProgressBar4=item[304];if(__Temp_IsNumberOrObject(item[305]))stock.ReserveProgressBar5=item[305];if(__Temp_IsNumberOrObject(item[306]))stock.ReserveProgressBar6=item[306];if(__Temp_IsNumberOrObject(item[307]))stock.ReserveProgressBar7=item[307];if(__Temp_IsNumberOrObject(item[308]))stock.ReserveProgressBar8=item[308];if(__Temp_IsNumberOrObject(item[309]))stock.ReserveProgressBar9=item[309];if(__Temp_IsNumberOrObject(item[310]))stock.ReserveProgressBar10=item[310];//10个按钮 351-400 { Title, Enable:, BGColor, TextColor: }
|
|
14086
14086
|
if(IFrameSplitOperator.IsObject(item[351]))stock.ReserveButton1=item[351];if(IFrameSplitOperator.IsObject(item[352]))stock.ReserveButton2=item[352];if(IFrameSplitOperator.IsObject(item[353]))stock.ReserveButton3=item[353];if(IFrameSplitOperator.IsObject(item[354]))stock.ReserveButton4=item[354];if(IFrameSplitOperator.IsObject(item[355]))stock.ReserveButton5=item[355];if(IFrameSplitOperator.IsObject(item[356]))stock.ReserveButton6=item[356];if(IFrameSplitOperator.IsObject(item[357]))stock.ReserveButton7=item[357];if(IFrameSplitOperator.IsObject(item[358]))stock.ReserveButton8=item[358];if(IFrameSplitOperator.IsObject(item[359]))stock.ReserveButton9=item[359];if(IFrameSplitOperator.IsObject(item[360]))stock.ReserveButton10=item[360];//10个日期时间类型 401-499 { Value:Date, BGColor }
|
|
14087
14087
|
if(IFrameSplitOperator.IsObject(item[401]))stock.ReserveDateTime1=item[401];if(IFrameSplitOperator.IsObject(item[402]))stock.ReserveDateTime2=item[402];if(IFrameSplitOperator.IsObject(item[403]))stock.ReserveDateTime3=item[403];if(IFrameSplitOperator.IsObject(item[404]))stock.ReserveDateTime4=item[404];if(IFrameSplitOperator.IsObject(item[405]))stock.ReserveDateTime5=item[405];if(IFrameSplitOperator.IsObject(item[406]))stock.ReserveDateTime6=item[406];if(IFrameSplitOperator.IsObject(item[407]))stock.ReserveDateTime7=item[407];if(IFrameSplitOperator.IsObject(item[408]))stock.ReserveDateTime8=item[408];if(IFrameSplitOperator.IsObject(item[409]))stock.ReserveDateTime9=item[409];if(IFrameSplitOperator.IsObject(item[410]))stock.ReserveDateTime10=item[410];};this.GetSymbolNoSuffix=function(symbol){var index=symbol.lastIndexOf(".");if(index>0)return symbol.substring(0,index);else return symbol;};this.CancelAutoUpdate=function()//关闭停止更新
|
|
14088
14088
|
{if(typeof this.AutoUpdateTimer=='number'){clearTimeout(this.AutoUpdateTimer);this.AutoUpdateTimer=null;}};this.AutoUpdate=function(waitTime)//waitTime 更新时间
|
|
@@ -14450,7 +14450,7 @@ if(!drawInfo.Tooltip){drawInfo.Tooltip={Type:1,Data:{AryText:[{Text:drawInfo.Tex
|
|
|
14450
14450
|
switch(column.FormatType){case 1:drawInfo.Text=value.toFixed(column.Decimal);break;case 2:drawInfo.Text=IFrameSplitOperator.FormatValueThousandsString(value,column.Decimal);break;case 3:drawInfo.Text=this.FormatVolString(value);break;default:drawInfo.Text=IFrameSplitOperator.FormatValueString(value,column.Decimal);break;}//颜色
|
|
14451
14451
|
switch(column.ColorType){case 1:drawInfo.TextColor=this.GetUpDownColor(value,0);break;case 2:if(!IFrameSplitOperator.IsNumber(data.Stock.YClose))drawInfo.TextColor=this.UnchagneColor;else drawInfo.TextColor=this.GetUpDownColor(value,data.Stock.YClose);break;default:break;}};this.GetCustomDateTimeDrawInfo=function(data,column,drawInfo){var value=this.GetExtendData(data,column);if(!IFrameSplitOperator.IsNumber(value))return;if(column.ValueType==0){if(column.FormatType==1)drawInfo.Text=IFrameSplitOperator.FormatDateString(value,"YYYY/MM/DD");else drawInfo.Text=IFrameSplitOperator.FormatDateString(value);}};this.GetCustomIconDrawInfo=function(data,column,drawInfo){if(column.IsDrawCallback)//外部处理输出格式
|
|
14452
14452
|
{this.GetCustomIconData(column,data.Symbol,drawInfo,data);return;}};this.GetCustomCheckBoxDrawInfo=function(data,column,drawInfo){var checkData=this.GetExtendData(data,column);if(!checkData)return;if(!IFrameSplitOperator.IsBool(checkData.Checked))return;drawInfo.Checked=checkData.Checked;drawInfo.Enable=true;drawInfo.Data=checkData;if(IFrameSplitOperator.IsBool(checkData.DisableCheckBox))drawInfo.Enable=!checkData.DisableCheckBox;drawInfo.CheckBox=column.CheckBox;};this.GetCustomButtonDrawInfo=function(data,column,drawInfo){var buttonData=this.GetExtendData(data,column);if(!buttonData)return;drawInfo.Text=buttonData.Title;drawInfo.Button=column.Button;drawInfo.Font=column.Button.Font;drawInfo.Enable=true;drawInfo.Data=buttonData;if(IFrameSplitOperator.IsBool(buttonData.Enable))drawInfo.Enable=buttonData.Enable;};this.GetCustomProgressBarDrawInfo=function(data,column,drawInfo){var barData=this.GetExtendData(data,column);if(!barData)return;drawInfo.Text=barData.Title;drawInfo.ProgressBar=column.ProgressBar;drawInfo.Enable=true;drawInfo.Value=barData.Value;//占比
|
|
14453
|
-
drawInfo.Data=barData;if(IFrameSplitOperator.IsBool(barData.Enable))drawInfo.Enable=barData.Enable;if(barData.TextColor)drawInfo.TextColor=barData.TextColor;if(barData.BarColor)drawInfo.BarColor=barData.BarColor;if(barData.BGColor)drawInfo.BGColor=barData.BGColor;};this.GetCustomLinkDrawInfo=function(data,column,drawInfo){var linkData=this.GetExtendData(data,column);if(!linkData)return;drawInfo.Text=linkData.Title;drawInfo.Link=column.Link;drawInfo.Enable=true;drawInfo.Data=linkData;drawInfo.MaxText=column.MaxText;if(IFrameSplitOperator.IsBool(linkData.Enable))drawInfo.Enable=linkData.Enable;if(linkData.TextColor)drawInfo.TextColor=linkData.TextColor;};this.FormatReserveNumber=function(column,data,drawInfo){if(column.DefaultText)drawInfo.Text=column.DefaultText;var fieldName=MAP_COLUMN_FIELD.get(column.Type);if(!data||!fieldName)return;var value=data[fieldName];if(!IFrameSplitOperator.IsNumber(value))return;if(IFrameSplitOperator.IsNumber(column.ColorType)){if(column.ColorType==1){drawInfo.TextColor=this.GetUpDownColor(value,0);}else if(column.ColorType==2){drawInfo.TextColor=this.GetUpDownColorV2(value,0);}else if(column.ColorType==3){drawInfo.TextColor=this.GetUpDownColor(value,data.YClose);}}var text=value.toFixed(column.FloatPrecision);if(column.Format&&IFrameSplitOperator.IsNumber(column.Format.Type)){var format=column.Format;switch(format.Type){case 1://原始数据
|
|
14453
|
+
drawInfo.Data=barData;if(IFrameSplitOperator.IsBool(barData.Enable))drawInfo.Enable=barData.Enable;if(barData.TextColor)drawInfo.TextColor=barData.TextColor;if(barData.BarColor)drawInfo.BarColor=barData.BarColor;if(barData.BGColor)drawInfo.BGColor=barData.BGColor;};this.GetCustomLinkDrawInfo=function(data,column,drawInfo){var linkData=this.GetExtendData(data,column);if(!linkData)return;drawInfo.Text=linkData.Title;drawInfo.Link=column.Link;drawInfo.Enable=true;drawInfo.Data=linkData;drawInfo.MaxText=column.MaxText;if(IFrameSplitOperator.IsBool(linkData.Enable))drawInfo.Enable=linkData.Enable;if(linkData.TextColor)drawInfo.TextColor=linkData.TextColor;};this.FormatReserveNumber=function(column,data,drawInfo){if(column.DefaultText)drawInfo.Text=column.DefaultText;var fieldName=MAP_COLUMN_FIELD.get(column.Type);if(!data||!fieldName)return;var value=data[fieldName];var compareValue=null;if(IFrameSplitOperator.IsObject(data[fieldName])){var item=data[fieldName];if(IFrameSplitOperator.IsNumber(item.Value))value=item.Value;if(IFrameSplitOperator.IsNumber(item.CompareValue))compareValue=item.CompareValue;}if(!IFrameSplitOperator.IsNumber(value))return;if(IFrameSplitOperator.IsNumber(column.ColorType)){if(column.ColorType==1){drawInfo.TextColor=this.GetUpDownColor(value,0);}else if(column.ColorType==2){drawInfo.TextColor=this.GetUpDownColorV2(value,0);}else if(column.ColorType==3){drawInfo.TextColor=this.GetUpDownColor(value,data.YClose);}else if(column.ColorType==4){if(IFrameSplitOperator.IsNumber(compareValue))drawInfo.TextColor=this.GetUpDownColor(value,compareValue);}}var text=value.toFixed(column.FloatPrecision);if(column.Format&&IFrameSplitOperator.IsNumber(column.Format.Type)){var format=column.Format;switch(format.Type){case 1://原始数据
|
|
14454
14454
|
text=value.toFixed(column.FloatPrecision);break;case 2://千分位分割
|
|
14455
14455
|
text=IFrameSplitOperator.FormatValueThousandsString(value,column.FloatPrecision);break;case 3:var exfloatPrecision=1;if(IFrameSplitOperator.IsNumber(format.ExFloatPrecision))exfloatPrecision=format.ExFloatPrecision;text=IFrameSplitOperator.FormatValueStringV2(value,column.FloatPrecision,exfloatPrecision);break;}}if(column.StringFormat&&text){text=column.StringFormat.replace("{0}",text);}drawInfo.Text=text;};this.FormatReserveString=function(column,data,drawInfo){if(column.DefaultText)drawInfo.Text=column.DefaultText;var fieldName=MAP_COLUMN_FIELD.get(column.Type);if(!data||!fieldName)return;var item=data[fieldName];if(IFrameSplitOperator.IsObject(item)){if(item.Text)drawInfo.Text=item.Text;if(item.TextColor)drawInfo.TextColor=item.TextColor;if(item.BGColor)drawInfo.BGColor=item.BGColor;if(IFrameSplitOperator.IsNonEmptyArray(item.AryText))drawInfo.AryText=item.AryText;if(item.Tooltip&&IFrameSplitOperator.IsNonEmptyArray(item.Tooltip.AryText)){drawInfo.Tooltip={Type:4,Data:{AryText:item.Tooltip.AryText,EnableCallback:item.Tooltip.EnableCallback}};}}else if(IFrameSplitOperator.IsString(item)){drawInfo.Text=item;}};this.GetReserveDateTimePreItem=function(colIndex){if(!this.CreateTempCache)return null;if(!this.TempCache.MapReserveDateTime)return null;var mapData=this.TempCache.MapReserveDateTime;if(!mapData.has(colIndex))return null;return mapData.get(colIndex);};this.SetReserveDateTimePreItem=function(colIndex,data){if(!this.CreateTempCache)return false;if(!this.TempCache.MapReserveDateTime)return false;var mapData=this.TempCache.MapReserveDateTime;if(mapData.has(colIndex)){var item=mapData.get(colIndex);item.PreItem.Date=data.Date;}else{mapData.set(colIndex,{PreItem:{Date:data.Date}});}return true;};this.FormatReserveDateTime=function(column,data,drawInfo){if(column.DefaultText)drawInfo.Text=column.DefaultText;var fieldName=MAP_COLUMN_FIELD.get(column.Type);if(!data||!fieldName)return;var item=data[fieldName];if(!IFrameSplitOperator.IsObject(item))return;var cacheItem=this.GetReserveDateTimePreItem(drawInfo.ColumnIndex);if(item.DateTime){var date=item.DateTime.getFullYear()*10000+(item.DateTime.getMonth()+1)*100+item.DateTime.getDate();var format=column.DateTimeFormat;if(cacheItem&&cacheItem.PreItem&&date==cacheItem.PreItem.Date){if(column.SubDateTimeFormat)format=column.SubDateTimeFormat;}else{this.SetReserveDateTimePreItem(drawInfo.ColumnIndex,{Date:date});}drawInfo.Text=IFrameSplitOperator.FormatDateTimeStringV2(item.DateTime,format);}if(item.TextColor)drawInfo.TextColor=item.TextColor;if(item.BGColor)drawInfo.BGColor=item.BGColor;};this.FormatReserveProgressBar=function(column,data,drawInfo){var fieldName=MAP_COLUMN_FIELD.get(column.Type);if(!data||!fieldName)return;var item=data[fieldName];if(IFrameSplitOperator.IsNumber(item)){drawInfo.ProgressBar=column.ProgressBar;drawInfo.Enable=true;drawInfo.Value=item;//占比
|
|
14456
14456
|
drawInfo.Data={Value:item};}else if(IFrameSplitOperator.IsObject(item)){if(item.Title)drawInfo.Text=item.Title;drawInfo.ProgressBar=column.ProgressBar;drawInfo.Enable=true;drawInfo.Value=item.Value;//占比
|
|
@@ -16093,7 +16093,7 @@ text=value.toFixed(dec);break;case 2://千分位分割
|
|
|
16093
16093
|
text=IFrameSplitOperator.FormatValueThousandsString(value,dec);break;case 3:var exfloatPrecision=1;if(IFrameSplitOperator.IsNumber(format.ExFloatPrecision))exfloatPrecision=format.ExFloatPrecision;text=IFrameSplitOperator.FormatValueStringV2(value,dec,exfloatPrecision);break;}}}if(column.StringFormat&&text)text=column.StringFormat.replace('{Value}',text);return text;};this.GetPriceColor=function(price){var upperSymbol=null;if(this.Data.Symbol)upperSymbol=this.Data.Symbol.toUpperCase();if(MARKET_SUFFIX_NAME.IsChinaFutures(upperSymbol)){if(!IFrameSplitOperator.IsNumber(this.Data.YFClose))return this.UnchangeColor;return this.GetUpDownColor(price,this.Data.YFClose);}else{if(!IFrameSplitOperator.IsNumber(this.Data.YClose))return this.UnchangeColor;return this.GetUpDownColor(price,this.Data.YClose);}};this.GetUpDownColor=function(price,price2){if(price>price2)return this.UpColor;else if(price<price2)return this.DownColor;else return this.UnchangeColor;};}/********************************************************************************
|
|
16094
16094
|
* 版本信息输出
|
|
16095
16095
|
*
|
|
16096
|
-
*/var HQCHART_VERSION="1.1.
|
|
16096
|
+
*/var HQCHART_VERSION="1.1.15479";function PrintHQChartVersion(){var logo='\n\n*************************************************************************************************************************************************************************** \n* \n* :%@@- \n* :@@@@- \n* =@@@@ :#@@@ .:+#@@@#=: :=*@@@@@@#+-. *@@@@. \n* :@@@@@ .@@@@@ .#@@@@@@@@@@@- +@@@@@@@@@@@@@+ @@@@@ -%@@* \n* +@@@@% #@@@@# *@@@@@@@@@@@@@@%. =@@@@@@@@@@@@@@@- @@@@@ -@@@@+ \n* %@@@@* @@@@@+ .%@@@@@@@@@@@@@@@@%: #@@@@@@@@@@@@@@@% @@@@# *@@@@= \n* @@@@@= @@@@@- .%@@@@@@@*++*%@@@@@@% .%@@@@@@@%*+==+**= -@@@@+ #@@@@- \n* @@@@@. @@@@@. #@@@@@%= =@@@@@@* %@@@@@@#: *@@@@- :::. .-+*###+: ::: .+##+: -%%@@@@@%%%% \n* .@@@@@ .@@@@@. +@@@@@% .@@@@@@ *@@@@@@: %@@@@: +@@@@@%. :%@@@@@@@@@@: *@@@ :@@@@@* @@@@@@@@@@@@ \n* :@@@@@ :@@@@@ @@@@@% :@@@@@+ @@@@@@: %@@@@-@@@@@@@@@. @@@@@@@@@@@@@. :@@@%-@@@@@@.:@@@@@@@@@@@# \n* -@@@@% -@@@@@ =@@@@@. %@@@@% %@@@@@- %@@@@@@@@@@@@@@* %@@@@@@@@@@@@+ -@@@@@@@@@@# -@@@@@@@@@@@. \n* +@@@@%=========#@@@@% @@@@@# :@@@@@ .@@@@@% @@@@@@@@%@@@@@@@ -%+:. .#@@@@* +@@@@@@@%%@. .::+@@@@#:: \n* #@@@@@@@@@@@@@@@@@@@# .@@@@@ .@@@@@ :@@@@@. @@@@@@#. #@@@@@. -@@@@* #@@@@@@: *@@@@+ \n* %@@@@@@@@@@@@@@@@@@@+ :@@@@@ .@@@@@ -@@@@@ @@@@@+ @@@@@. :@@@@* @@@@@% #@@@@- \n* @@@@@@@@@@@@@@@@@@@@: :@@@@% :@@@@@ +@@@@% -@@@@+ @@@@@ -@@@@+ @@@@@. @@@@@. \n* .@@@@@@@@@@@@@@@@@@@@ :@@@@% -@@@@% *@@@@% #@@@@. @@@@@ .=*#%%%@@@@@= :@@@@# @@@@@. \n* -@@@@@:::::::::=@@@@@ :@@@@@ @@@@@* +@@@@% @@@@@ @@@@% -#@@@@@@@@@@@@: -@@@@* @@@@@ \n* =@@@@% =@@@@% .@@@@@ :@@@@@. -@@@@% @@@@@ .@@@@* +@@@@@@@@@@@@@@. =@@@@+ .@@@@@ \n* +@@@@# +@@@@# @@@@@# %@@@@% :@@@@@ .@@@@% =@@@@= -@@@@@*-:..%@@@@ +@@@@= :@@@@# \n* *@@@@* *@@@@* +@@@@@: #@@@@@+ .@@@@@@ :@@@@% *@@@@- @@@@@. @@@@% #@@@@: =@@@@+ \n* %@@@@= %@@@@+ @@@@@@- .%@@@@@# #@@@@@# :@@@@% #@@@@: @@@@% @@@@* %@@@@. #@@@@- \n* @@@@@- @@@@@= =@@@@@@#=...-*@@@@@@@: @@@@@@%=. :+**. :@@@@* %@@@@. .@@@@* *@@@@= @@@@@ %@@@@+ \n* .@@@@@: .@@@@@: *@@@@@@@@@@@@@@@@@@@# =@@@@@@@@%%%@@@@@@ +@@@@- @@@@@ .@@@@@: :%@@@@@- .@@@@% %@@@@@*+- \n* :@@@@@ :@@@@@ +@@@@@@@@@@@@@@@@@@@# =@@@@@@@@@@@@@@@@% %@@@@ @@@@@ @@@@@@@@@@@@@@@: -@@@@* *@@@@@@@@- \n* =@@@@@ -@@@@@ :@@@@@@@@@@@@@@@@@@@# :@@@@@@@@@@@@@@@% @@@@@ %@@@% #@@@@@@@@@#@@@@. +@@@@- .@@@@@@@@# \n* *@@@@# =@@@@% :#@@@@@@@#: :@@@@@= =@@@@@@@@@@@+. @@@@@ :@@@+ *@@@@@@@- %@@@ *@@@= =@@@@@@@* \n* =++++- -++++= .:::. .=*+: :-=+++=:. ****= .=+. .-++=: :+++ -+=: .-=+=:. \n* \n* \n* HQChart \n* Ver: '+HQCHART_VERSION+' \n* License: Apache License 2.0 \n* Source: https://github.com/jones2000/HQChart\n*\n************************************************************************************************************************************************************************** \n ';console.log(logo);}PrintHQChartVersion();//把给外界调用的方法暴露出来
|
|
16097
16097
|
exports.default=(_jsChartInit$jsChartS={jsChartInit:JSChart.Init,jsChartStyle:JSChart.SetStyle,// IsIndexSymbol:IsIndexSymbol,
|
|
16098
16098
|
// BaseIndex:BaseIndex,
|
|
16099
16099
|
// ChartLine:ChartLine,
|
package/package.json
CHANGED
|
@@ -305,8 +305,8 @@ var Character =
|
|
|
305
305
|
(cp >= 0x41 && cp <= 0x5A) ||
|
|
306
306
|
(cp >= 0x61 && cp <= 0x7A) ||
|
|
307
307
|
(cp === 0x5C) ||
|
|
308
|
-
//【】▲▼
|
|
309
|
-
(cp===0x3010 || cp===0x3011 || cp===0x25B2 || cp===0x25BC) ||
|
|
308
|
+
//【】▲▼ ↓↑←→
|
|
309
|
+
(cp===0x3010 || cp===0x3011 || cp===0x25B2 || cp===0x25BC) || (cp>=0x2190 && cp<=0x2193) ||
|
|
310
310
|
((cp >= 0x80) && Regex.NonAsciiIdentifierStart.test(Character.FromCodePoint(cp)));
|
|
311
311
|
},
|
|
312
312
|
|
|
@@ -317,8 +317,8 @@ var Character =
|
|
|
317
317
|
(cp >= 0x61 && cp <= 0x7A) ||
|
|
318
318
|
(cp >= 0x30 && cp <= 0x39) ||
|
|
319
319
|
(cp === 0x5C) || (cp===0x23) ||
|
|
320
|
-
//【】▲▼
|
|
321
|
-
(cp===0x3010 || cp===0x3011 || cp===0x25B2 || cp===0x25BC) ||
|
|
320
|
+
//【】▲▼ ↓↑←→
|
|
321
|
+
(cp===0x3010 || cp===0x3011 || cp===0x25B2 || cp===0x25BC) || (cp>=0x2190 && cp<=0x2193) ||
|
|
322
322
|
((cp >= 0x80) && Regex.NonAsciiIdentifierPart.test(Character.FromCodePoint(cp)));
|
|
323
323
|
},
|
|
324
324
|
|
|
@@ -1876,61 +1876,75 @@ function JSReportChartContainer(uielement)
|
|
|
1876
1876
|
if (item[80] || item[80]===null) stock.BGColor=item[80]; //整行背景色
|
|
1877
1877
|
if (item[JSCHART_DATA_FIELD_ID.REPORT_EXTENDDATA]) stock.ExtendDataV2=item[JSCHART_DATA_FIELD_ID.REPORT_EXTENDDATA]; //扩展数据2
|
|
1878
1878
|
|
|
1879
|
+
function __Temp_IsNumberOrObject(value)
|
|
1880
|
+
{
|
|
1881
|
+
if (IFrameSplitOperator.IsNumber(value)) return true;
|
|
1882
|
+
if (IFrameSplitOperator.IsObject(value)) return true;
|
|
1883
|
+
return false;
|
|
1884
|
+
}
|
|
1885
|
+
|
|
1886
|
+
function __Temp_IsStringOrObject(value)
|
|
1887
|
+
{
|
|
1888
|
+
if (IFrameSplitOperator.IsString(value)) return true;
|
|
1889
|
+
if (IFrameSplitOperator.IsObject(value)) return true;
|
|
1890
|
+
return false;
|
|
1891
|
+
}
|
|
1892
|
+
|
|
1879
1893
|
//10个数值型 101-199
|
|
1880
|
-
if (
|
|
1881
|
-
if (
|
|
1882
|
-
if (
|
|
1883
|
-
if (
|
|
1884
|
-
if (
|
|
1885
|
-
if (
|
|
1886
|
-
if (
|
|
1887
|
-
if (
|
|
1888
|
-
if (
|
|
1889
|
-
if (
|
|
1890
|
-
if (
|
|
1891
|
-
if (
|
|
1892
|
-
if (
|
|
1893
|
-
if (
|
|
1894
|
-
if (
|
|
1895
|
-
if (
|
|
1896
|
-
if (
|
|
1897
|
-
if (
|
|
1898
|
-
if (
|
|
1899
|
-
if (
|
|
1894
|
+
if (__Temp_IsNumberOrObject(item[101])) stock.ReserveNumber1=item[101];
|
|
1895
|
+
if (__Temp_IsNumberOrObject(item[102])) stock.ReserveNumber2=item[102];
|
|
1896
|
+
if (__Temp_IsNumberOrObject(item[103])) stock.ReserveNumber3=item[103];
|
|
1897
|
+
if (__Temp_IsNumberOrObject(item[104])) stock.ReserveNumber4=item[104];
|
|
1898
|
+
if (__Temp_IsNumberOrObject(item[105])) stock.ReserveNumber5=item[105];
|
|
1899
|
+
if (__Temp_IsNumberOrObject(item[106])) stock.ReserveNumber6=item[106];
|
|
1900
|
+
if (__Temp_IsNumberOrObject(item[107])) stock.ReserveNumber7=item[107];
|
|
1901
|
+
if (__Temp_IsNumberOrObject(item[108])) stock.ReserveNumber8=item[108];
|
|
1902
|
+
if (__Temp_IsNumberOrObject(item[109])) stock.ReserveNumber9=item[109];
|
|
1903
|
+
if (__Temp_IsNumberOrObject(item[110])) stock.ReserveNumber10=item[110];
|
|
1904
|
+
if (__Temp_IsNumberOrObject(item[111])) stock.ReserveNumber11=item[111];
|
|
1905
|
+
if (__Temp_IsNumberOrObject(item[112])) stock.ReserveNumber12=item[112];
|
|
1906
|
+
if (__Temp_IsNumberOrObject(item[113])) stock.ReserveNumber13=item[113];
|
|
1907
|
+
if (__Temp_IsNumberOrObject(item[114])) stock.ReserveNumber14=item[114];
|
|
1908
|
+
if (__Temp_IsNumberOrObject(item[115])) stock.ReserveNumber15=item[115];
|
|
1909
|
+
if (__Temp_IsNumberOrObject(item[116])) stock.ReserveNumber16=item[116];
|
|
1910
|
+
if (__Temp_IsNumberOrObject(item[117])) stock.ReserveNumber17=item[117];
|
|
1911
|
+
if (__Temp_IsNumberOrObject(item[118])) stock.ReserveNumber18=item[118];
|
|
1912
|
+
if (__Temp_IsNumberOrObject(item[119])) stock.ReserveNumber19=item[119];
|
|
1913
|
+
if (__Temp_IsNumberOrObject(item[120])) stock.ReserveNumber20=item[120];
|
|
1900
1914
|
|
|
1901
1915
|
//10个字符型 201-299
|
|
1902
|
-
if (
|
|
1903
|
-
if (
|
|
1904
|
-
if (
|
|
1905
|
-
if (
|
|
1906
|
-
if (
|
|
1907
|
-
if (
|
|
1908
|
-
if (
|
|
1909
|
-
if (
|
|
1910
|
-
if (
|
|
1911
|
-
if (
|
|
1912
|
-
if (
|
|
1913
|
-
if (
|
|
1914
|
-
if (
|
|
1915
|
-
if (
|
|
1916
|
-
if (
|
|
1917
|
-
if (
|
|
1918
|
-
if (
|
|
1919
|
-
if (
|
|
1920
|
-
if (
|
|
1921
|
-
if (
|
|
1916
|
+
if (__Temp_IsStringOrObject(item[201])) stock.ReserveString1=item[201];
|
|
1917
|
+
if (__Temp_IsStringOrObject(item[202])) stock.ReserveString2=item[202];
|
|
1918
|
+
if (__Temp_IsStringOrObject(item[203])) stock.ReserveString3=item[203];
|
|
1919
|
+
if (__Temp_IsStringOrObject(item[204])) stock.ReserveString4=item[204];
|
|
1920
|
+
if (__Temp_IsStringOrObject(item[205])) stock.ReserveString5=item[205];
|
|
1921
|
+
if (__Temp_IsStringOrObject(item[206])) stock.ReserveString6=item[206];
|
|
1922
|
+
if (__Temp_IsStringOrObject(item[207])) stock.ReserveString7=item[207];
|
|
1923
|
+
if (__Temp_IsStringOrObject(item[208])) stock.ReserveString8=item[208];
|
|
1924
|
+
if (__Temp_IsStringOrObject(item[209])) stock.ReserveString9=item[209];
|
|
1925
|
+
if (__Temp_IsStringOrObject(item[210])) stock.ReserveString10=item[210];
|
|
1926
|
+
if (__Temp_IsStringOrObject(item[211])) stock.ReserveString11=item[211];
|
|
1927
|
+
if (__Temp_IsStringOrObject(item[212])) stock.ReserveString12=item[212];
|
|
1928
|
+
if (__Temp_IsStringOrObject(item[213])) stock.ReserveString13=item[213];
|
|
1929
|
+
if (__Temp_IsStringOrObject(item[214])) stock.ReserveString14=item[214];
|
|
1930
|
+
if (__Temp_IsStringOrObject(item[215])) stock.ReserveString15=item[215];
|
|
1931
|
+
if (__Temp_IsStringOrObject(item[216])) stock.ReserveString16=item[216];
|
|
1932
|
+
if (__Temp_IsStringOrObject(item[217])) stock.ReserveString17=item[217];
|
|
1933
|
+
if (__Temp_IsStringOrObject(item[218])) stock.ReserveString18=item[218];
|
|
1934
|
+
if (__Temp_IsStringOrObject(item[219])) stock.ReserveString19=item[219];
|
|
1935
|
+
if (__Temp_IsStringOrObject(item[220])) stock.ReserveString20=item[220];
|
|
1922
1936
|
|
|
1923
1937
|
//10个进度条 301-350 { Value:, BGColor: }
|
|
1924
|
-
if (
|
|
1925
|
-
if (
|
|
1926
|
-
if (
|
|
1927
|
-
if (
|
|
1928
|
-
if (
|
|
1929
|
-
if (
|
|
1930
|
-
if (
|
|
1931
|
-
if (
|
|
1932
|
-
if (
|
|
1933
|
-
if (
|
|
1938
|
+
if (__Temp_IsNumberOrObject(item[301])) stock.ReserveProgressBar1=item[301];
|
|
1939
|
+
if (__Temp_IsNumberOrObject(item[302])) stock.ReserveProgressBar2=item[302];
|
|
1940
|
+
if (__Temp_IsNumberOrObject(item[303])) stock.ReserveProgressBar3=item[303];
|
|
1941
|
+
if (__Temp_IsNumberOrObject(item[304])) stock.ReserveProgressBar4=item[304];
|
|
1942
|
+
if (__Temp_IsNumberOrObject(item[305])) stock.ReserveProgressBar5=item[305];
|
|
1943
|
+
if (__Temp_IsNumberOrObject(item[306])) stock.ReserveProgressBar6=item[306];
|
|
1944
|
+
if (__Temp_IsNumberOrObject(item[307])) stock.ReserveProgressBar7=item[307];
|
|
1945
|
+
if (__Temp_IsNumberOrObject(item[308])) stock.ReserveProgressBar8=item[308];
|
|
1946
|
+
if (__Temp_IsNumberOrObject(item[309])) stock.ReserveProgressBar9=item[309];
|
|
1947
|
+
if (__Temp_IsNumberOrObject(item[310])) stock.ReserveProgressBar10=item[310];
|
|
1934
1948
|
|
|
1935
1949
|
//10个按钮 351-400 { Title, Enable:, BGColor, TextColor: }
|
|
1936
1950
|
if (IFrameSplitOperator.IsObject(item[351])) stock.ReserveButton1=item[351];
|
|
@@ -7900,6 +7914,14 @@ function ChartReport()
|
|
|
7900
7914
|
if (!data || !fieldName) return;
|
|
7901
7915
|
|
|
7902
7916
|
var value=data[fieldName];
|
|
7917
|
+
var compareValue=null;
|
|
7918
|
+
if (IFrameSplitOperator.IsObject(data[fieldName]))
|
|
7919
|
+
{
|
|
7920
|
+
var item=data[fieldName];
|
|
7921
|
+
if (IFrameSplitOperator.IsNumber(item.Value)) value=item.Value;
|
|
7922
|
+
if (IFrameSplitOperator.IsNumber(item.CompareValue)) compareValue=item.CompareValue;
|
|
7923
|
+
}
|
|
7924
|
+
|
|
7903
7925
|
if (!IFrameSplitOperator.IsNumber(value)) return;
|
|
7904
7926
|
|
|
7905
7927
|
if (IFrameSplitOperator.IsNumber(column.ColorType))
|
|
@@ -7916,6 +7938,11 @@ function ChartReport()
|
|
|
7916
7938
|
{
|
|
7917
7939
|
drawInfo.TextColor=this.GetUpDownColor(value,data.YClose);
|
|
7918
7940
|
}
|
|
7941
|
+
else if (column.ColorType==4)
|
|
7942
|
+
{
|
|
7943
|
+
if (IFrameSplitOperator.IsNumber(compareValue))
|
|
7944
|
+
drawInfo.TextColor=this.GetUpDownColor(value,compareValue);
|
|
7945
|
+
}
|
|
7919
7946
|
}
|
|
7920
7947
|
|
|
7921
7948
|
var text=value.toFixed(column.FloatPrecision);
|
|
@@ -111809,8 +111809,8 @@ var Character =
|
|
|
111809
111809
|
(cp >= 0x41 && cp <= 0x5A) ||
|
|
111810
111810
|
(cp >= 0x61 && cp <= 0x7A) ||
|
|
111811
111811
|
(cp === 0x5C) ||
|
|
111812
|
-
//【】▲▼
|
|
111813
|
-
(cp===0x3010 || cp===0x3011 || cp===0x25B2 || cp===0x25BC) ||
|
|
111812
|
+
//【】▲▼ ↓↑←→
|
|
111813
|
+
(cp===0x3010 || cp===0x3011 || cp===0x25B2 || cp===0x25BC) || (cp>=0x2190 && cp<=0x2193) ||
|
|
111814
111814
|
((cp >= 0x80) && Regex.NonAsciiIdentifierStart.test(Character.FromCodePoint(cp)));
|
|
111815
111815
|
},
|
|
111816
111816
|
|
|
@@ -111821,8 +111821,8 @@ var Character =
|
|
|
111821
111821
|
(cp >= 0x61 && cp <= 0x7A) ||
|
|
111822
111822
|
(cp >= 0x30 && cp <= 0x39) ||
|
|
111823
111823
|
(cp === 0x5C) || (cp===0x23) ||
|
|
111824
|
-
//【】▲▼
|
|
111825
|
-
(cp===0x3010 || cp===0x3011 || cp===0x25B2 || cp===0x25BC) ||
|
|
111824
|
+
//【】▲▼ ↓↑←→
|
|
111825
|
+
(cp===0x3010 || cp===0x3011 || cp===0x25B2 || cp===0x25BC) || (cp>=0x2190 && cp<=0x2193) ||
|
|
111826
111826
|
((cp >= 0x80) && Regex.NonAsciiIdentifierPart.test(Character.FromCodePoint(cp)));
|
|
111827
111827
|
},
|
|
111828
111828
|
|
|
@@ -144413,61 +144413,75 @@ function JSReportChartContainer(uielement)
|
|
|
144413
144413
|
if (item[80] || item[80]===null) stock.BGColor=item[80]; //整行背景色
|
|
144414
144414
|
if (item[JSCHART_DATA_FIELD_ID.REPORT_EXTENDDATA]) stock.ExtendDataV2=item[JSCHART_DATA_FIELD_ID.REPORT_EXTENDDATA]; //扩展数据2
|
|
144415
144415
|
|
|
144416
|
+
function __Temp_IsNumberOrObject(value)
|
|
144417
|
+
{
|
|
144418
|
+
if (IFrameSplitOperator.IsNumber(value)) return true;
|
|
144419
|
+
if (IFrameSplitOperator.IsObject(value)) return true;
|
|
144420
|
+
return false;
|
|
144421
|
+
}
|
|
144422
|
+
|
|
144423
|
+
function __Temp_IsStringOrObject(value)
|
|
144424
|
+
{
|
|
144425
|
+
if (IFrameSplitOperator.IsString(value)) return true;
|
|
144426
|
+
if (IFrameSplitOperator.IsObject(value)) return true;
|
|
144427
|
+
return false;
|
|
144428
|
+
}
|
|
144429
|
+
|
|
144416
144430
|
//10个数值型 101-199
|
|
144417
|
-
if (
|
|
144418
|
-
if (
|
|
144419
|
-
if (
|
|
144420
|
-
if (
|
|
144421
|
-
if (
|
|
144422
|
-
if (
|
|
144423
|
-
if (
|
|
144424
|
-
if (
|
|
144425
|
-
if (
|
|
144426
|
-
if (
|
|
144427
|
-
if (
|
|
144428
|
-
if (
|
|
144429
|
-
if (
|
|
144430
|
-
if (
|
|
144431
|
-
if (
|
|
144432
|
-
if (
|
|
144433
|
-
if (
|
|
144434
|
-
if (
|
|
144435
|
-
if (
|
|
144436
|
-
if (
|
|
144431
|
+
if (__Temp_IsNumberOrObject(item[101])) stock.ReserveNumber1=item[101];
|
|
144432
|
+
if (__Temp_IsNumberOrObject(item[102])) stock.ReserveNumber2=item[102];
|
|
144433
|
+
if (__Temp_IsNumberOrObject(item[103])) stock.ReserveNumber3=item[103];
|
|
144434
|
+
if (__Temp_IsNumberOrObject(item[104])) stock.ReserveNumber4=item[104];
|
|
144435
|
+
if (__Temp_IsNumberOrObject(item[105])) stock.ReserveNumber5=item[105];
|
|
144436
|
+
if (__Temp_IsNumberOrObject(item[106])) stock.ReserveNumber6=item[106];
|
|
144437
|
+
if (__Temp_IsNumberOrObject(item[107])) stock.ReserveNumber7=item[107];
|
|
144438
|
+
if (__Temp_IsNumberOrObject(item[108])) stock.ReserveNumber8=item[108];
|
|
144439
|
+
if (__Temp_IsNumberOrObject(item[109])) stock.ReserveNumber9=item[109];
|
|
144440
|
+
if (__Temp_IsNumberOrObject(item[110])) stock.ReserveNumber10=item[110];
|
|
144441
|
+
if (__Temp_IsNumberOrObject(item[111])) stock.ReserveNumber11=item[111];
|
|
144442
|
+
if (__Temp_IsNumberOrObject(item[112])) stock.ReserveNumber12=item[112];
|
|
144443
|
+
if (__Temp_IsNumberOrObject(item[113])) stock.ReserveNumber13=item[113];
|
|
144444
|
+
if (__Temp_IsNumberOrObject(item[114])) stock.ReserveNumber14=item[114];
|
|
144445
|
+
if (__Temp_IsNumberOrObject(item[115])) stock.ReserveNumber15=item[115];
|
|
144446
|
+
if (__Temp_IsNumberOrObject(item[116])) stock.ReserveNumber16=item[116];
|
|
144447
|
+
if (__Temp_IsNumberOrObject(item[117])) stock.ReserveNumber17=item[117];
|
|
144448
|
+
if (__Temp_IsNumberOrObject(item[118])) stock.ReserveNumber18=item[118];
|
|
144449
|
+
if (__Temp_IsNumberOrObject(item[119])) stock.ReserveNumber19=item[119];
|
|
144450
|
+
if (__Temp_IsNumberOrObject(item[120])) stock.ReserveNumber20=item[120];
|
|
144437
144451
|
|
|
144438
144452
|
//10个字符型 201-299
|
|
144439
|
-
if (
|
|
144440
|
-
if (
|
|
144441
|
-
if (
|
|
144442
|
-
if (
|
|
144443
|
-
if (
|
|
144444
|
-
if (
|
|
144445
|
-
if (
|
|
144446
|
-
if (
|
|
144447
|
-
if (
|
|
144448
|
-
if (
|
|
144449
|
-
if (
|
|
144450
|
-
if (
|
|
144451
|
-
if (
|
|
144452
|
-
if (
|
|
144453
|
-
if (
|
|
144454
|
-
if (
|
|
144455
|
-
if (
|
|
144456
|
-
if (
|
|
144457
|
-
if (
|
|
144458
|
-
if (
|
|
144453
|
+
if (__Temp_IsStringOrObject(item[201])) stock.ReserveString1=item[201];
|
|
144454
|
+
if (__Temp_IsStringOrObject(item[202])) stock.ReserveString2=item[202];
|
|
144455
|
+
if (__Temp_IsStringOrObject(item[203])) stock.ReserveString3=item[203];
|
|
144456
|
+
if (__Temp_IsStringOrObject(item[204])) stock.ReserveString4=item[204];
|
|
144457
|
+
if (__Temp_IsStringOrObject(item[205])) stock.ReserveString5=item[205];
|
|
144458
|
+
if (__Temp_IsStringOrObject(item[206])) stock.ReserveString6=item[206];
|
|
144459
|
+
if (__Temp_IsStringOrObject(item[207])) stock.ReserveString7=item[207];
|
|
144460
|
+
if (__Temp_IsStringOrObject(item[208])) stock.ReserveString8=item[208];
|
|
144461
|
+
if (__Temp_IsStringOrObject(item[209])) stock.ReserveString9=item[209];
|
|
144462
|
+
if (__Temp_IsStringOrObject(item[210])) stock.ReserveString10=item[210];
|
|
144463
|
+
if (__Temp_IsStringOrObject(item[211])) stock.ReserveString11=item[211];
|
|
144464
|
+
if (__Temp_IsStringOrObject(item[212])) stock.ReserveString12=item[212];
|
|
144465
|
+
if (__Temp_IsStringOrObject(item[213])) stock.ReserveString13=item[213];
|
|
144466
|
+
if (__Temp_IsStringOrObject(item[214])) stock.ReserveString14=item[214];
|
|
144467
|
+
if (__Temp_IsStringOrObject(item[215])) stock.ReserveString15=item[215];
|
|
144468
|
+
if (__Temp_IsStringOrObject(item[216])) stock.ReserveString16=item[216];
|
|
144469
|
+
if (__Temp_IsStringOrObject(item[217])) stock.ReserveString17=item[217];
|
|
144470
|
+
if (__Temp_IsStringOrObject(item[218])) stock.ReserveString18=item[218];
|
|
144471
|
+
if (__Temp_IsStringOrObject(item[219])) stock.ReserveString19=item[219];
|
|
144472
|
+
if (__Temp_IsStringOrObject(item[220])) stock.ReserveString20=item[220];
|
|
144459
144473
|
|
|
144460
144474
|
//10个进度条 301-350 { Value:, BGColor: }
|
|
144461
|
-
if (
|
|
144462
|
-
if (
|
|
144463
|
-
if (
|
|
144464
|
-
if (
|
|
144465
|
-
if (
|
|
144466
|
-
if (
|
|
144467
|
-
if (
|
|
144468
|
-
if (
|
|
144469
|
-
if (
|
|
144470
|
-
if (
|
|
144475
|
+
if (__Temp_IsNumberOrObject(item[301])) stock.ReserveProgressBar1=item[301];
|
|
144476
|
+
if (__Temp_IsNumberOrObject(item[302])) stock.ReserveProgressBar2=item[302];
|
|
144477
|
+
if (__Temp_IsNumberOrObject(item[303])) stock.ReserveProgressBar3=item[303];
|
|
144478
|
+
if (__Temp_IsNumberOrObject(item[304])) stock.ReserveProgressBar4=item[304];
|
|
144479
|
+
if (__Temp_IsNumberOrObject(item[305])) stock.ReserveProgressBar5=item[305];
|
|
144480
|
+
if (__Temp_IsNumberOrObject(item[306])) stock.ReserveProgressBar6=item[306];
|
|
144481
|
+
if (__Temp_IsNumberOrObject(item[307])) stock.ReserveProgressBar7=item[307];
|
|
144482
|
+
if (__Temp_IsNumberOrObject(item[308])) stock.ReserveProgressBar8=item[308];
|
|
144483
|
+
if (__Temp_IsNumberOrObject(item[309])) stock.ReserveProgressBar9=item[309];
|
|
144484
|
+
if (__Temp_IsNumberOrObject(item[310])) stock.ReserveProgressBar10=item[310];
|
|
144471
144485
|
|
|
144472
144486
|
//10个按钮 351-400 { Title, Enable:, BGColor, TextColor: }
|
|
144473
144487
|
if (IFrameSplitOperator.IsObject(item[351])) stock.ReserveButton1=item[351];
|
|
@@ -150437,6 +150451,14 @@ function ChartReport()
|
|
|
150437
150451
|
if (!data || !fieldName) return;
|
|
150438
150452
|
|
|
150439
150453
|
var value=data[fieldName];
|
|
150454
|
+
var compareValue=null;
|
|
150455
|
+
if (IFrameSplitOperator.IsObject(data[fieldName]))
|
|
150456
|
+
{
|
|
150457
|
+
var item=data[fieldName];
|
|
150458
|
+
if (IFrameSplitOperator.IsNumber(item.Value)) value=item.Value;
|
|
150459
|
+
if (IFrameSplitOperator.IsNumber(item.CompareValue)) compareValue=item.CompareValue;
|
|
150460
|
+
}
|
|
150461
|
+
|
|
150440
150462
|
if (!IFrameSplitOperator.IsNumber(value)) return;
|
|
150441
150463
|
|
|
150442
150464
|
if (IFrameSplitOperator.IsNumber(column.ColorType))
|
|
@@ -150453,6 +150475,11 @@ function ChartReport()
|
|
|
150453
150475
|
{
|
|
150454
150476
|
drawInfo.TextColor=this.GetUpDownColor(value,data.YClose);
|
|
150455
150477
|
}
|
|
150478
|
+
else if (column.ColorType==4)
|
|
150479
|
+
{
|
|
150480
|
+
if (IFrameSplitOperator.IsNumber(compareValue))
|
|
150481
|
+
drawInfo.TextColor=this.GetUpDownColor(value,compareValue);
|
|
150482
|
+
}
|
|
150456
150483
|
}
|
|
150457
150484
|
|
|
150458
150485
|
var text=value.toFixed(column.FloatPrecision);
|
|
@@ -156529,7 +156556,7 @@ function ScrollBarBGChart()
|
|
|
156529
156556
|
|
|
156530
156557
|
|
|
156531
156558
|
|
|
156532
|
-
var HQCHART_VERSION="1.1.
|
|
156559
|
+
var HQCHART_VERSION="1.1.15479";
|
|
156533
156560
|
|
|
156534
156561
|
function PrintHQChartVersion()
|
|
156535
156562
|
{
|
|
@@ -111853,8 +111853,8 @@ var Character =
|
|
|
111853
111853
|
(cp >= 0x41 && cp <= 0x5A) ||
|
|
111854
111854
|
(cp >= 0x61 && cp <= 0x7A) ||
|
|
111855
111855
|
(cp === 0x5C) ||
|
|
111856
|
-
//【】▲▼
|
|
111857
|
-
(cp===0x3010 || cp===0x3011 || cp===0x25B2 || cp===0x25BC) ||
|
|
111856
|
+
//【】▲▼ ↓↑←→
|
|
111857
|
+
(cp===0x3010 || cp===0x3011 || cp===0x25B2 || cp===0x25BC) || (cp>=0x2190 && cp<=0x2193) ||
|
|
111858
111858
|
((cp >= 0x80) && Regex.NonAsciiIdentifierStart.test(Character.FromCodePoint(cp)));
|
|
111859
111859
|
},
|
|
111860
111860
|
|
|
@@ -111865,8 +111865,8 @@ var Character =
|
|
|
111865
111865
|
(cp >= 0x61 && cp <= 0x7A) ||
|
|
111866
111866
|
(cp >= 0x30 && cp <= 0x39) ||
|
|
111867
111867
|
(cp === 0x5C) || (cp===0x23) ||
|
|
111868
|
-
//【】▲▼
|
|
111869
|
-
(cp===0x3010 || cp===0x3011 || cp===0x25B2 || cp===0x25BC) ||
|
|
111868
|
+
//【】▲▼ ↓↑←→
|
|
111869
|
+
(cp===0x3010 || cp===0x3011 || cp===0x25B2 || cp===0x25BC) || (cp>=0x2190 && cp<=0x2193) ||
|
|
111870
111870
|
((cp >= 0x80) && Regex.NonAsciiIdentifierPart.test(Character.FromCodePoint(cp)));
|
|
111871
111871
|
},
|
|
111872
111872
|
|
|
@@ -144457,61 +144457,75 @@ function JSReportChartContainer(uielement)
|
|
|
144457
144457
|
if (item[80] || item[80]===null) stock.BGColor=item[80]; //整行背景色
|
|
144458
144458
|
if (item[JSCHART_DATA_FIELD_ID.REPORT_EXTENDDATA]) stock.ExtendDataV2=item[JSCHART_DATA_FIELD_ID.REPORT_EXTENDDATA]; //扩展数据2
|
|
144459
144459
|
|
|
144460
|
+
function __Temp_IsNumberOrObject(value)
|
|
144461
|
+
{
|
|
144462
|
+
if (IFrameSplitOperator.IsNumber(value)) return true;
|
|
144463
|
+
if (IFrameSplitOperator.IsObject(value)) return true;
|
|
144464
|
+
return false;
|
|
144465
|
+
}
|
|
144466
|
+
|
|
144467
|
+
function __Temp_IsStringOrObject(value)
|
|
144468
|
+
{
|
|
144469
|
+
if (IFrameSplitOperator.IsString(value)) return true;
|
|
144470
|
+
if (IFrameSplitOperator.IsObject(value)) return true;
|
|
144471
|
+
return false;
|
|
144472
|
+
}
|
|
144473
|
+
|
|
144460
144474
|
//10个数值型 101-199
|
|
144461
|
-
if (
|
|
144462
|
-
if (
|
|
144463
|
-
if (
|
|
144464
|
-
if (
|
|
144465
|
-
if (
|
|
144466
|
-
if (
|
|
144467
|
-
if (
|
|
144468
|
-
if (
|
|
144469
|
-
if (
|
|
144470
|
-
if (
|
|
144471
|
-
if (
|
|
144472
|
-
if (
|
|
144473
|
-
if (
|
|
144474
|
-
if (
|
|
144475
|
-
if (
|
|
144476
|
-
if (
|
|
144477
|
-
if (
|
|
144478
|
-
if (
|
|
144479
|
-
if (
|
|
144480
|
-
if (
|
|
144475
|
+
if (__Temp_IsNumberOrObject(item[101])) stock.ReserveNumber1=item[101];
|
|
144476
|
+
if (__Temp_IsNumberOrObject(item[102])) stock.ReserveNumber2=item[102];
|
|
144477
|
+
if (__Temp_IsNumberOrObject(item[103])) stock.ReserveNumber3=item[103];
|
|
144478
|
+
if (__Temp_IsNumberOrObject(item[104])) stock.ReserveNumber4=item[104];
|
|
144479
|
+
if (__Temp_IsNumberOrObject(item[105])) stock.ReserveNumber5=item[105];
|
|
144480
|
+
if (__Temp_IsNumberOrObject(item[106])) stock.ReserveNumber6=item[106];
|
|
144481
|
+
if (__Temp_IsNumberOrObject(item[107])) stock.ReserveNumber7=item[107];
|
|
144482
|
+
if (__Temp_IsNumberOrObject(item[108])) stock.ReserveNumber8=item[108];
|
|
144483
|
+
if (__Temp_IsNumberOrObject(item[109])) stock.ReserveNumber9=item[109];
|
|
144484
|
+
if (__Temp_IsNumberOrObject(item[110])) stock.ReserveNumber10=item[110];
|
|
144485
|
+
if (__Temp_IsNumberOrObject(item[111])) stock.ReserveNumber11=item[111];
|
|
144486
|
+
if (__Temp_IsNumberOrObject(item[112])) stock.ReserveNumber12=item[112];
|
|
144487
|
+
if (__Temp_IsNumberOrObject(item[113])) stock.ReserveNumber13=item[113];
|
|
144488
|
+
if (__Temp_IsNumberOrObject(item[114])) stock.ReserveNumber14=item[114];
|
|
144489
|
+
if (__Temp_IsNumberOrObject(item[115])) stock.ReserveNumber15=item[115];
|
|
144490
|
+
if (__Temp_IsNumberOrObject(item[116])) stock.ReserveNumber16=item[116];
|
|
144491
|
+
if (__Temp_IsNumberOrObject(item[117])) stock.ReserveNumber17=item[117];
|
|
144492
|
+
if (__Temp_IsNumberOrObject(item[118])) stock.ReserveNumber18=item[118];
|
|
144493
|
+
if (__Temp_IsNumberOrObject(item[119])) stock.ReserveNumber19=item[119];
|
|
144494
|
+
if (__Temp_IsNumberOrObject(item[120])) stock.ReserveNumber20=item[120];
|
|
144481
144495
|
|
|
144482
144496
|
//10个字符型 201-299
|
|
144483
|
-
if (
|
|
144484
|
-
if (
|
|
144485
|
-
if (
|
|
144486
|
-
if (
|
|
144487
|
-
if (
|
|
144488
|
-
if (
|
|
144489
|
-
if (
|
|
144490
|
-
if (
|
|
144491
|
-
if (
|
|
144492
|
-
if (
|
|
144493
|
-
if (
|
|
144494
|
-
if (
|
|
144495
|
-
if (
|
|
144496
|
-
if (
|
|
144497
|
-
if (
|
|
144498
|
-
if (
|
|
144499
|
-
if (
|
|
144500
|
-
if (
|
|
144501
|
-
if (
|
|
144502
|
-
if (
|
|
144497
|
+
if (__Temp_IsStringOrObject(item[201])) stock.ReserveString1=item[201];
|
|
144498
|
+
if (__Temp_IsStringOrObject(item[202])) stock.ReserveString2=item[202];
|
|
144499
|
+
if (__Temp_IsStringOrObject(item[203])) stock.ReserveString3=item[203];
|
|
144500
|
+
if (__Temp_IsStringOrObject(item[204])) stock.ReserveString4=item[204];
|
|
144501
|
+
if (__Temp_IsStringOrObject(item[205])) stock.ReserveString5=item[205];
|
|
144502
|
+
if (__Temp_IsStringOrObject(item[206])) stock.ReserveString6=item[206];
|
|
144503
|
+
if (__Temp_IsStringOrObject(item[207])) stock.ReserveString7=item[207];
|
|
144504
|
+
if (__Temp_IsStringOrObject(item[208])) stock.ReserveString8=item[208];
|
|
144505
|
+
if (__Temp_IsStringOrObject(item[209])) stock.ReserveString9=item[209];
|
|
144506
|
+
if (__Temp_IsStringOrObject(item[210])) stock.ReserveString10=item[210];
|
|
144507
|
+
if (__Temp_IsStringOrObject(item[211])) stock.ReserveString11=item[211];
|
|
144508
|
+
if (__Temp_IsStringOrObject(item[212])) stock.ReserveString12=item[212];
|
|
144509
|
+
if (__Temp_IsStringOrObject(item[213])) stock.ReserveString13=item[213];
|
|
144510
|
+
if (__Temp_IsStringOrObject(item[214])) stock.ReserveString14=item[214];
|
|
144511
|
+
if (__Temp_IsStringOrObject(item[215])) stock.ReserveString15=item[215];
|
|
144512
|
+
if (__Temp_IsStringOrObject(item[216])) stock.ReserveString16=item[216];
|
|
144513
|
+
if (__Temp_IsStringOrObject(item[217])) stock.ReserveString17=item[217];
|
|
144514
|
+
if (__Temp_IsStringOrObject(item[218])) stock.ReserveString18=item[218];
|
|
144515
|
+
if (__Temp_IsStringOrObject(item[219])) stock.ReserveString19=item[219];
|
|
144516
|
+
if (__Temp_IsStringOrObject(item[220])) stock.ReserveString20=item[220];
|
|
144503
144517
|
|
|
144504
144518
|
//10个进度条 301-350 { Value:, BGColor: }
|
|
144505
|
-
if (
|
|
144506
|
-
if (
|
|
144507
|
-
if (
|
|
144508
|
-
if (
|
|
144509
|
-
if (
|
|
144510
|
-
if (
|
|
144511
|
-
if (
|
|
144512
|
-
if (
|
|
144513
|
-
if (
|
|
144514
|
-
if (
|
|
144519
|
+
if (__Temp_IsNumberOrObject(item[301])) stock.ReserveProgressBar1=item[301];
|
|
144520
|
+
if (__Temp_IsNumberOrObject(item[302])) stock.ReserveProgressBar2=item[302];
|
|
144521
|
+
if (__Temp_IsNumberOrObject(item[303])) stock.ReserveProgressBar3=item[303];
|
|
144522
|
+
if (__Temp_IsNumberOrObject(item[304])) stock.ReserveProgressBar4=item[304];
|
|
144523
|
+
if (__Temp_IsNumberOrObject(item[305])) stock.ReserveProgressBar5=item[305];
|
|
144524
|
+
if (__Temp_IsNumberOrObject(item[306])) stock.ReserveProgressBar6=item[306];
|
|
144525
|
+
if (__Temp_IsNumberOrObject(item[307])) stock.ReserveProgressBar7=item[307];
|
|
144526
|
+
if (__Temp_IsNumberOrObject(item[308])) stock.ReserveProgressBar8=item[308];
|
|
144527
|
+
if (__Temp_IsNumberOrObject(item[309])) stock.ReserveProgressBar9=item[309];
|
|
144528
|
+
if (__Temp_IsNumberOrObject(item[310])) stock.ReserveProgressBar10=item[310];
|
|
144515
144529
|
|
|
144516
144530
|
//10个按钮 351-400 { Title, Enable:, BGColor, TextColor: }
|
|
144517
144531
|
if (IFrameSplitOperator.IsObject(item[351])) stock.ReserveButton1=item[351];
|
|
@@ -150481,6 +150495,14 @@ function ChartReport()
|
|
|
150481
150495
|
if (!data || !fieldName) return;
|
|
150482
150496
|
|
|
150483
150497
|
var value=data[fieldName];
|
|
150498
|
+
var compareValue=null;
|
|
150499
|
+
if (IFrameSplitOperator.IsObject(data[fieldName]))
|
|
150500
|
+
{
|
|
150501
|
+
var item=data[fieldName];
|
|
150502
|
+
if (IFrameSplitOperator.IsNumber(item.Value)) value=item.Value;
|
|
150503
|
+
if (IFrameSplitOperator.IsNumber(item.CompareValue)) compareValue=item.CompareValue;
|
|
150504
|
+
}
|
|
150505
|
+
|
|
150484
150506
|
if (!IFrameSplitOperator.IsNumber(value)) return;
|
|
150485
150507
|
|
|
150486
150508
|
if (IFrameSplitOperator.IsNumber(column.ColorType))
|
|
@@ -150497,6 +150519,11 @@ function ChartReport()
|
|
|
150497
150519
|
{
|
|
150498
150520
|
drawInfo.TextColor=this.GetUpDownColor(value,data.YClose);
|
|
150499
150521
|
}
|
|
150522
|
+
else if (column.ColorType==4)
|
|
150523
|
+
{
|
|
150524
|
+
if (IFrameSplitOperator.IsNumber(compareValue))
|
|
150525
|
+
drawInfo.TextColor=this.GetUpDownColor(value,compareValue);
|
|
150526
|
+
}
|
|
150500
150527
|
}
|
|
150501
150528
|
|
|
150502
150529
|
var text=value.toFixed(column.FloatPrecision);
|
|
@@ -171475,7 +171502,7 @@ function ChartStockData()
|
|
|
171475
171502
|
|
|
171476
171503
|
|
|
171477
171504
|
|
|
171478
|
-
var HQCHART_VERSION="1.1.
|
|
171505
|
+
var HQCHART_VERSION="1.1.15479";
|
|
171479
171506
|
|
|
171480
171507
|
function PrintHQChartVersion()
|
|
171481
171508
|
{
|