mooho-base-admin-plus 2.0.48 → 2.0.50
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/package/mooho-base-admin-plus.min.esm.js +152 -76
- package/package/mooho-base-admin-plus.min.js +17 -17
- package/package/style.css +1 -1
- package/package.json +1 -1
- package/public/setting.js +1 -1
- package/src/components/input/dialog-select.vue +8 -2
- package/src/components/input/item-select.vue +3 -3
- package/src/components/view/modal-table.vue +13 -1
- package/src/components/view/view-form-draggable.vue +2 -0
- package/src/components/view/view-form.vue +12 -0
- package/src/components/view/view-table.vue +16 -0
- package/src/i18n/index.js +1 -1
- package/src/mixins/page.js +0 -1
- package/vite.config.js +2 -4
|
@@ -1200,7 +1200,7 @@ function getModuleByNamespace(store2, helper2, namespace) {
|
|
|
1200
1200
|
}
|
|
1201
1201
|
return module;
|
|
1202
1202
|
}
|
|
1203
|
-
/*! js-cookie v3.0.
|
|
1203
|
+
/*! js-cookie v3.0.5 | MIT */
|
|
1204
1204
|
function assign$2(target) {
|
|
1205
1205
|
for (var i3 = 1; i3 < arguments.length; i3++) {
|
|
1206
1206
|
var source2 = arguments[i3];
|
|
@@ -1225,7 +1225,7 @@ var defaultConverter = {
|
|
|
1225
1225
|
}
|
|
1226
1226
|
};
|
|
1227
1227
|
function init$4(converter, defaultAttributes) {
|
|
1228
|
-
function set2(
|
|
1228
|
+
function set2(name, value, attributes) {
|
|
1229
1229
|
if (typeof document === "undefined") {
|
|
1230
1230
|
return;
|
|
1231
1231
|
}
|
|
@@ -1236,7 +1236,7 @@ function init$4(converter, defaultAttributes) {
|
|
|
1236
1236
|
if (attributes.expires) {
|
|
1237
1237
|
attributes.expires = attributes.expires.toUTCString();
|
|
1238
1238
|
}
|
|
1239
|
-
|
|
1239
|
+
name = encodeURIComponent(name).replace(/%(2[346B]|5E|60|7C)/g, decodeURIComponent).replace(/[()]/g, escape);
|
|
1240
1240
|
var stringifiedAttributes = "";
|
|
1241
1241
|
for (var attributeName in attributes) {
|
|
1242
1242
|
if (!attributes[attributeName]) {
|
|
@@ -1248,10 +1248,10 @@ function init$4(converter, defaultAttributes) {
|
|
|
1248
1248
|
}
|
|
1249
1249
|
stringifiedAttributes += "=" + attributes[attributeName].split(";")[0];
|
|
1250
1250
|
}
|
|
1251
|
-
return document.cookie =
|
|
1251
|
+
return document.cookie = name + "=" + converter.write(value, name) + stringifiedAttributes;
|
|
1252
1252
|
}
|
|
1253
|
-
function get3(
|
|
1254
|
-
if (typeof document === "undefined" || arguments.length && !
|
|
1253
|
+
function get3(name) {
|
|
1254
|
+
if (typeof document === "undefined" || arguments.length && !name) {
|
|
1255
1255
|
return;
|
|
1256
1256
|
}
|
|
1257
1257
|
var cookies2 = document.cookie ? document.cookie.split("; ") : [];
|
|
@@ -1260,23 +1260,23 @@ function init$4(converter, defaultAttributes) {
|
|
|
1260
1260
|
var parts = cookies2[i3].split("=");
|
|
1261
1261
|
var value = parts.slice(1).join("=");
|
|
1262
1262
|
try {
|
|
1263
|
-
var
|
|
1264
|
-
jar[
|
|
1265
|
-
if (
|
|
1263
|
+
var found = decodeURIComponent(parts[0]);
|
|
1264
|
+
jar[found] = converter.read(value, found);
|
|
1265
|
+
if (name === found) {
|
|
1266
1266
|
break;
|
|
1267
1267
|
}
|
|
1268
1268
|
} catch (e3) {
|
|
1269
1269
|
}
|
|
1270
1270
|
}
|
|
1271
|
-
return
|
|
1271
|
+
return name ? jar[name] : jar;
|
|
1272
1272
|
}
|
|
1273
1273
|
return Object.create(
|
|
1274
1274
|
{
|
|
1275
1275
|
set: set2,
|
|
1276
1276
|
get: get3,
|
|
1277
|
-
remove: function(
|
|
1277
|
+
remove: function(name, attributes) {
|
|
1278
1278
|
set2(
|
|
1279
|
-
|
|
1279
|
+
name,
|
|
1280
1280
|
"",
|
|
1281
1281
|
assign$2({}, attributes, {
|
|
1282
1282
|
expires: -1
|
|
@@ -35549,7 +35549,12 @@ const _sfc_main$C = {
|
|
|
35549
35549
|
this.$refs.dialogTable.setSelected([]);
|
|
35550
35550
|
}
|
|
35551
35551
|
}
|
|
35552
|
-
|
|
35552
|
+
if (this.param) {
|
|
35553
|
+
this.$refs.dialogTable.open(this.param);
|
|
35554
|
+
} else {
|
|
35555
|
+
this.$refs.dialogTable.clear();
|
|
35556
|
+
this.$refs.dialogTable.opened = true;
|
|
35557
|
+
}
|
|
35553
35558
|
});
|
|
35554
35559
|
}
|
|
35555
35560
|
},
|
|
@@ -35615,7 +35620,8 @@ function _sfc_render$C(_ctx, _cache, $props, $setup, $data, $options) {
|
|
|
35615
35620
|
ref: "dialogTable",
|
|
35616
35621
|
"view-code": $props.source,
|
|
35617
35622
|
selectEnable: $props.multi,
|
|
35618
|
-
|
|
35623
|
+
"check-cross-page": true,
|
|
35624
|
+
"footer-enable": $props.multi
|
|
35619
35625
|
}, {
|
|
35620
35626
|
command: withCtx(({ row }) => [
|
|
35621
35627
|
!$props.multi ? (openBlock(), createBlock(_component_Button, {
|
|
@@ -35654,7 +35660,7 @@ function _sfc_render$C(_ctx, _cache, $props, $setup, $data, $options) {
|
|
|
35654
35660
|
})
|
|
35655
35661
|
]),
|
|
35656
35662
|
_: 1
|
|
35657
|
-
}, 8, ["view-code", "selectEnable", "
|
|
35663
|
+
}, 8, ["view-code", "selectEnable", "footer-enable"])) : createCommentVNode("v-if", true)
|
|
35658
35664
|
]);
|
|
35659
35665
|
}
|
|
35660
35666
|
var DialogSelect = /* @__PURE__ */ _export_sfc(_sfc_main$C, [["render", _sfc_render$C], ["__file", "D:/Project/Mooho/FrontEnd/mooho-base-admin-plus/src/components/input/dialog-select.vue"]]);
|
|
@@ -35820,9 +35826,9 @@ function _sfc_render$B(_ctx, _cache, $props, $setup, $data, $options) {
|
|
|
35820
35826
|
createVNode$1(_component_view_table, {
|
|
35821
35827
|
ref: "selectSourceTable",
|
|
35822
35828
|
"view-code": $props.sourceViewCode,
|
|
35823
|
-
|
|
35824
|
-
|
|
35825
|
-
|
|
35829
|
+
"select-enable": true,
|
|
35830
|
+
"check-cross-page": true,
|
|
35831
|
+
"auto-load": false,
|
|
35826
35832
|
filter: $data.sourceFilter,
|
|
35827
35833
|
height: 480,
|
|
35828
35834
|
onOnSelectChange: $options.selectedChange
|
|
@@ -37034,6 +37040,14 @@ const _sfc_main$w = {
|
|
|
37034
37040
|
item.needClear = true;
|
|
37035
37041
|
});
|
|
37036
37042
|
}
|
|
37043
|
+
} else if (column.controlType === "DialogSelect" || column.controlType === "MultiDialogSelect") {
|
|
37044
|
+
if (param == null) {
|
|
37045
|
+
column.dataSource = [];
|
|
37046
|
+
this.setData(this.data, column.code, null);
|
|
37047
|
+
column.triggers.forEach((item) => {
|
|
37048
|
+
item.needClear = true;
|
|
37049
|
+
});
|
|
37050
|
+
}
|
|
37037
37051
|
} else if (column.controlType === "List") {
|
|
37038
37052
|
if (param != null) {
|
|
37039
37053
|
let res2;
|
|
@@ -42614,6 +42628,13 @@ const _sfc_main$q = {
|
|
|
42614
42628
|
data2._needClear[item.code] = true;
|
|
42615
42629
|
});
|
|
42616
42630
|
}
|
|
42631
|
+
} else if (column.controlType === "DialogSelect" || column.controlType === "MultiDialogSelect") {
|
|
42632
|
+
if (param == null) {
|
|
42633
|
+
this.setData(data2, column.code, null);
|
|
42634
|
+
column.triggers.forEach((item) => {
|
|
42635
|
+
data2._needClear[item.code] = true;
|
|
42636
|
+
});
|
|
42637
|
+
}
|
|
42617
42638
|
}
|
|
42618
42639
|
}
|
|
42619
42640
|
data2._needClear[column.code] = false;
|
|
@@ -43023,6 +43044,10 @@ const _sfc_main$q = {
|
|
|
43023
43044
|
this.loadData(data2);
|
|
43024
43045
|
}
|
|
43025
43046
|
},
|
|
43047
|
+
clear() {
|
|
43048
|
+
this.staticData = [];
|
|
43049
|
+
this.data = [];
|
|
43050
|
+
},
|
|
43026
43051
|
parseDataWithOther(model2, column) {
|
|
43027
43052
|
let expression2 = column.code;
|
|
43028
43053
|
let selectValue = this.parseData(model2, expression2 + "_o");
|
|
@@ -51124,7 +51149,9 @@ function _sfc_render$o(_ctx, _cache, $props, $setup, $data, $options) {
|
|
|
51124
51149
|
column.controlType !== "Placeholder" && column.controlType !== "Title" && column.controlType !== "Table" && column.controlType !== "List" ? (openBlock(), createBlock(_component_FormItem, {
|
|
51125
51150
|
label: $options.getNameI18n(column),
|
|
51126
51151
|
prop: column.code,
|
|
51127
|
-
key: column.code
|
|
51152
|
+
key: column.code,
|
|
51153
|
+
rules: $options.getRules(column),
|
|
51154
|
+
error: column.code == null ? _ctx.$t("Front_Label_Column_Not_Bind") : null
|
|
51128
51155
|
}, {
|
|
51129
51156
|
default: withCtx(() => [
|
|
51130
51157
|
column.controlType === "Custom" ? (openBlock(), createElementBlock(Fragment, { key: 0 }, [], 64)) : column.controlType === "Label" ? (openBlock(), createElementBlock("div", {
|
|
@@ -51496,7 +51523,7 @@ function _sfc_render$o(_ctx, _cache, $props, $setup, $data, $options) {
|
|
|
51496
51523
|
], 64)) : createCommentVNode("v-if", true)
|
|
51497
51524
|
]),
|
|
51498
51525
|
_: 2
|
|
51499
|
-
}, 1032, ["label", "prop"])) : createCommentVNode("v-if", true)
|
|
51526
|
+
}, 1032, ["label", "prop", "rules", "error"])) : createCommentVNode("v-if", true)
|
|
51500
51527
|
], 44, _hoisted_1$f)
|
|
51501
51528
|
]),
|
|
51502
51529
|
_: 1
|
|
@@ -52386,6 +52413,10 @@ const _sfc_main$l = {
|
|
|
52386
52413
|
type: Boolean,
|
|
52387
52414
|
default: false
|
|
52388
52415
|
},
|
|
52416
|
+
checkCrossPage: {
|
|
52417
|
+
type: Boolean,
|
|
52418
|
+
default: false
|
|
52419
|
+
},
|
|
52389
52420
|
treeEnable: {
|
|
52390
52421
|
type: Boolean,
|
|
52391
52422
|
default: false
|
|
@@ -52522,6 +52553,9 @@ const _sfc_main$l = {
|
|
|
52522
52553
|
selectAllCancel() {
|
|
52523
52554
|
this.setSelected([]);
|
|
52524
52555
|
},
|
|
52556
|
+
clear() {
|
|
52557
|
+
this.$refs.table.clear();
|
|
52558
|
+
},
|
|
52525
52559
|
dragDrop(args) {
|
|
52526
52560
|
this.$emit("on-drag-drop", args);
|
|
52527
52561
|
},
|
|
@@ -52600,8 +52634,9 @@ function _sfc_render$l(_ctx, _cache, $props, $setup, $data, $options) {
|
|
|
52600
52634
|
static: this.static,
|
|
52601
52635
|
filter: $data.tableFilter,
|
|
52602
52636
|
"setting-enable": $props.settingEnable,
|
|
52637
|
+
"auto-load": false,
|
|
52603
52638
|
"select-enable": $props.selectEnable,
|
|
52604
|
-
|
|
52639
|
+
"check-cross-page": $props.checkCrossPage,
|
|
52605
52640
|
"tree-enable": $props.treeEnable,
|
|
52606
52641
|
"tree-load": $props.treeLoad,
|
|
52607
52642
|
"has-children": $props.hasChildren,
|
|
@@ -52676,7 +52711,7 @@ function _sfc_render$l(_ctx, _cache, $props, $setup, $data, $options) {
|
|
|
52676
52711
|
})
|
|
52677
52712
|
]),
|
|
52678
52713
|
_: 3
|
|
52679
|
-
}, 8, ["view-code", "static", "filter", "setting-enable", "select-enable", "tree-enable", "tree-load", "has-children", "create-enable", "edit-enable", "remove-enable", "draggable", "filter-enable", "page-enable", "embedded", "before-load-data", "on-search", "summary-method", "page-size-opts", "span-method", "onCreate", "onEdit", "onOnReady", "onOnLoadData", "onAfterInit", "onOnDragDrop"])
|
|
52714
|
+
}, 8, ["view-code", "static", "filter", "setting-enable", "select-enable", "check-cross-page", "tree-enable", "tree-load", "has-children", "create-enable", "edit-enable", "remove-enable", "draggable", "filter-enable", "page-enable", "embedded", "before-load-data", "on-search", "summary-method", "page-size-opts", "span-method", "onCreate", "onEdit", "onOnReady", "onOnLoadData", "onAfterInit", "onOnDragDrop"])
|
|
52680
52715
|
])
|
|
52681
52716
|
]),
|
|
52682
52717
|
_: 3
|
|
@@ -62586,7 +62621,7 @@ function getInstance(id) {
|
|
|
62586
62621
|
function registerPainter(name, Ctor) {
|
|
62587
62622
|
painterCtors[name] = Ctor;
|
|
62588
62623
|
}
|
|
62589
|
-
var version$1 = "5.4.
|
|
62624
|
+
var version$1 = "5.4.3";
|
|
62590
62625
|
var zrender = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
|
|
62591
62626
|
__proto__: null,
|
|
62592
62627
|
init: init$2,
|
|
@@ -63963,16 +63998,16 @@ function pushTokens(block, str, style, wrapInfo, styleName) {
|
|
|
63963
63998
|
}
|
|
63964
63999
|
}
|
|
63965
64000
|
}
|
|
63966
|
-
function
|
|
64001
|
+
function isAlphabeticLetter(ch) {
|
|
63967
64002
|
var code2 = ch.charCodeAt(0);
|
|
63968
|
-
return code2 >=
|
|
64003
|
+
return code2 >= 32 && code2 <= 591 || code2 >= 880 && code2 <= 4351 || code2 >= 4608 && code2 <= 5119 || code2 >= 7680 && code2 <= 8303;
|
|
63969
64004
|
}
|
|
63970
64005
|
var breakCharMap = reduce(",&?/;] ".split(""), function(obj, ch) {
|
|
63971
64006
|
obj[ch] = true;
|
|
63972
64007
|
return obj;
|
|
63973
64008
|
}, {});
|
|
63974
64009
|
function isWordBreakChar(ch) {
|
|
63975
|
-
if (
|
|
64010
|
+
if (isAlphabeticLetter(ch)) {
|
|
63976
64011
|
if (breakCharMap[ch]) {
|
|
63977
64012
|
return true;
|
|
63978
64013
|
}
|
|
@@ -72643,11 +72678,7 @@ function objectRowsCollectDimensions(data2) {
|
|
|
72643
72678
|
while (firstIndex < data2.length && !(obj = data2[firstIndex++])) {
|
|
72644
72679
|
}
|
|
72645
72680
|
if (obj) {
|
|
72646
|
-
|
|
72647
|
-
each$f(obj, function(value, key) {
|
|
72648
|
-
dimensions_1.push(key);
|
|
72649
|
-
});
|
|
72650
|
-
return dimensions_1;
|
|
72681
|
+
return keys(obj);
|
|
72651
72682
|
}
|
|
72652
72683
|
}
|
|
72653
72684
|
function normalizeDimensionsOption(dimensionsDefine) {
|
|
@@ -77768,9 +77799,9 @@ function getImpl(name) {
|
|
|
77768
77799
|
}
|
|
77769
77800
|
return implsStore[name];
|
|
77770
77801
|
}
|
|
77771
|
-
var version = "5.4.
|
|
77802
|
+
var version = "5.4.2";
|
|
77772
77803
|
var dependencies = {
|
|
77773
|
-
zrender: "5.4.
|
|
77804
|
+
zrender: "5.4.3"
|
|
77774
77805
|
};
|
|
77775
77806
|
var TEST_FRAME_REMAIN_TIME = 1;
|
|
77776
77807
|
var PRIORITY_PROCESSOR_SERIES_FILTER = 800;
|
|
@@ -84830,8 +84861,8 @@ function vNodeToString(el, opts) {
|
|
|
84830
84861
|
opts = opts || {};
|
|
84831
84862
|
var S3 = opts.newline ? "\n" : "";
|
|
84832
84863
|
function convertElToString(el2) {
|
|
84833
|
-
var children = el2.children, tag = el2.tag, attrs = el2.attrs;
|
|
84834
|
-
return createElementOpen(tag, attrs) + encodeHTML(
|
|
84864
|
+
var children = el2.children, tag = el2.tag, attrs = el2.attrs, text2 = el2.text;
|
|
84865
|
+
return createElementOpen(tag, attrs) + (tag !== "style" ? encodeHTML(text2) : text2 || "") + (children ? "" + S3 + map$1(children, function(child) {
|
|
84835
84866
|
return convertElToString(child);
|
|
84836
84867
|
}).join(S3) + S3 : "") + createElementClose(tag);
|
|
84837
84868
|
}
|
|
@@ -88364,7 +88395,7 @@ var LineView = function(_super) {
|
|
|
88364
88395
|
var polyline = this._polyline;
|
|
88365
88396
|
var polygon = this._polygon;
|
|
88366
88397
|
var lineGroup = this._lineGroup;
|
|
88367
|
-
var hasAnimation = seriesModel.
|
|
88398
|
+
var hasAnimation = !ecModel.ssr && seriesModel.isAnimationEnabled();
|
|
88368
88399
|
var isAreaChart = !areaStyleModel.isEmpty();
|
|
88369
88400
|
var valueOrigin = areaStyleModel.get("origin");
|
|
88370
88401
|
var dataCoordInfo = prepareDataCoordInfo(coordSys, data2, valueOrigin);
|
|
@@ -88659,8 +88690,8 @@ var LineView = function(_super) {
|
|
|
88659
88690
|
if (isFunction(seriesDuration)) {
|
|
88660
88691
|
seriesDuration = seriesDuration(null);
|
|
88661
88692
|
}
|
|
88662
|
-
var
|
|
88663
|
-
var
|
|
88693
|
+
var seriesDelay = seriesModel.get("animationDelay") || 0;
|
|
88694
|
+
var seriesDelayValue = isFunction(seriesDelay) ? seriesDelay(null) : seriesDelay;
|
|
88664
88695
|
data2.eachItemGraphicEl(function(symbol, idx) {
|
|
88665
88696
|
var el = symbol;
|
|
88666
88697
|
if (el) {
|
|
@@ -88698,7 +88729,7 @@ var LineView = function(_super) {
|
|
|
88698
88729
|
if (isAxisInverse) {
|
|
88699
88730
|
ratio = 1 - ratio;
|
|
88700
88731
|
}
|
|
88701
|
-
var delay = isFunction(
|
|
88732
|
+
var delay = isFunction(seriesDelay) ? seriesDelay(idx) : seriesDuration * ratio + seriesDelayValue;
|
|
88702
88733
|
var symbolPath = el.getSymbolPath();
|
|
88703
88734
|
var text2 = symbolPath.getTextContent();
|
|
88704
88735
|
el.attr({
|
|
@@ -89084,18 +89115,50 @@ var BaseBarSeriesModel = function(_super) {
|
|
|
89084
89115
|
BaseBarSeriesModel2.prototype.getMarkerPosition = function(value, dims, startingAtTick) {
|
|
89085
89116
|
var coordSys = this.coordinateSystem;
|
|
89086
89117
|
if (coordSys && coordSys.clampData) {
|
|
89087
|
-
var
|
|
89118
|
+
var clampData_1 = coordSys.clampData(value);
|
|
89119
|
+
var pt_1 = coordSys.dataToPoint(clampData_1);
|
|
89088
89120
|
if (startingAtTick) {
|
|
89089
89121
|
each$f(coordSys.getAxes(), function(axis, idx) {
|
|
89090
|
-
if (axis.type === "category") {
|
|
89122
|
+
if (axis.type === "category" && dims != null) {
|
|
89091
89123
|
var tickCoords = axis.getTicksCoords();
|
|
89092
|
-
var
|
|
89093
|
-
|
|
89094
|
-
|
|
89124
|
+
var targetTickId = clampData_1[idx];
|
|
89125
|
+
var isEnd = dims[idx] === "x1" || dims[idx] === "y1";
|
|
89126
|
+
if (isEnd) {
|
|
89127
|
+
targetTickId += 1;
|
|
89128
|
+
}
|
|
89129
|
+
if (tickCoords.length < 2) {
|
|
89130
|
+
return;
|
|
89131
|
+
} else if (tickCoords.length === 2) {
|
|
89132
|
+
pt_1[idx] = axis.toGlobalCoord(axis.getExtent()[isEnd ? 1 : 0]);
|
|
89133
|
+
return;
|
|
89095
89134
|
}
|
|
89096
|
-
|
|
89097
|
-
|
|
89098
|
-
|
|
89135
|
+
var leftCoord = void 0;
|
|
89136
|
+
var coord = void 0;
|
|
89137
|
+
var stepTickValue = 1;
|
|
89138
|
+
for (var i3 = 0; i3 < tickCoords.length; i3++) {
|
|
89139
|
+
var tickCoord = tickCoords[i3].coord;
|
|
89140
|
+
var tickValue = i3 === tickCoords.length - 1 ? tickCoords[i3 - 1].tickValue + stepTickValue : tickCoords[i3].tickValue;
|
|
89141
|
+
if (tickValue === targetTickId) {
|
|
89142
|
+
coord = tickCoord;
|
|
89143
|
+
break;
|
|
89144
|
+
} else if (tickValue < targetTickId) {
|
|
89145
|
+
leftCoord = tickCoord;
|
|
89146
|
+
} else if (leftCoord != null && tickValue > targetTickId) {
|
|
89147
|
+
coord = (tickCoord + leftCoord) / 2;
|
|
89148
|
+
break;
|
|
89149
|
+
}
|
|
89150
|
+
if (i3 === 1) {
|
|
89151
|
+
stepTickValue = tickValue - tickCoords[0].tickValue;
|
|
89152
|
+
}
|
|
89153
|
+
}
|
|
89154
|
+
if (coord == null) {
|
|
89155
|
+
if (!leftCoord) {
|
|
89156
|
+
coord = tickCoords[0].coord;
|
|
89157
|
+
} else if (leftCoord) {
|
|
89158
|
+
coord = tickCoords[tickCoords.length - 1].coord;
|
|
89159
|
+
}
|
|
89160
|
+
}
|
|
89161
|
+
pt_1[idx] = axis.toGlobalCoord(coord);
|
|
89099
89162
|
}
|
|
89100
89163
|
});
|
|
89101
89164
|
} else {
|
|
@@ -89382,6 +89445,23 @@ function adjustAngleDistanceX(angle, distance2, isEnd) {
|
|
|
89382
89445
|
function adjustAngleDistanceY(angle, distance2, isEnd) {
|
|
89383
89446
|
return distance2 * Math.cos(angle) * (isEnd ? 1 : -1);
|
|
89384
89447
|
}
|
|
89448
|
+
function getSectorCornerRadius(model2, shape, zeroIfNull) {
|
|
89449
|
+
var cornerRadius = model2.get("borderRadius");
|
|
89450
|
+
if (cornerRadius == null) {
|
|
89451
|
+
return zeroIfNull ? {
|
|
89452
|
+
cornerRadius: 0
|
|
89453
|
+
} : null;
|
|
89454
|
+
}
|
|
89455
|
+
if (!isArray$1(cornerRadius)) {
|
|
89456
|
+
cornerRadius = [cornerRadius, cornerRadius, cornerRadius, cornerRadius];
|
|
89457
|
+
}
|
|
89458
|
+
var dr = Math.abs(shape.r || 0 - shape.r0 || 0);
|
|
89459
|
+
return {
|
|
89460
|
+
cornerRadius: map$1(cornerRadius, function(cr) {
|
|
89461
|
+
return parsePercent$1(cr, dr);
|
|
89462
|
+
})
|
|
89463
|
+
};
|
|
89464
|
+
}
|
|
89385
89465
|
var mathMax$4 = Math.max;
|
|
89386
89466
|
var mathMin$4 = Math.min;
|
|
89387
89467
|
function getClipArea(coord, data2) {
|
|
@@ -89474,6 +89554,8 @@ var BarView = function(_super) {
|
|
|
89474
89554
|
bgEl.useStyle(backgroundModel.getItemStyle());
|
|
89475
89555
|
if (coord.type === "cartesian2d") {
|
|
89476
89556
|
bgEl.setShape("r", barBorderRadius);
|
|
89557
|
+
} else {
|
|
89558
|
+
bgEl.setShape("cornerRadius", barBorderRadius);
|
|
89477
89559
|
}
|
|
89478
89560
|
bgEls[dataIndex] = bgEl;
|
|
89479
89561
|
return bgEl;
|
|
@@ -89522,6 +89604,8 @@ var BarView = function(_super) {
|
|
|
89522
89604
|
bgEl.useStyle(backgroundModel.getItemStyle());
|
|
89523
89605
|
if (coord.type === "cartesian2d") {
|
|
89524
89606
|
bgEl.setShape("r", barBorderRadius);
|
|
89607
|
+
} else {
|
|
89608
|
+
bgEl.setShape("cornerRadius", barBorderRadius);
|
|
89525
89609
|
}
|
|
89526
89610
|
bgEls[newIndex2] = bgEl;
|
|
89527
89611
|
}
|
|
@@ -89820,7 +89904,7 @@ var elementCreator = {
|
|
|
89820
89904
|
var sectorShape = sector.shape;
|
|
89821
89905
|
var animateProperty = isRadial ? "r" : "endAngle";
|
|
89822
89906
|
var animateTarget = {};
|
|
89823
|
-
sectorShape[animateProperty] = isRadial ?
|
|
89907
|
+
sectorShape[animateProperty] = isRadial ? layout2.r0 : layout2.startAngle;
|
|
89824
89908
|
animateTarget[animateProperty] = layout2[animateProperty];
|
|
89825
89909
|
(isUpdate ? updateProps$1 : initProps)(sector, {
|
|
89826
89910
|
shape: animateTarget
|
|
@@ -89947,7 +90031,13 @@ function createPolarPositionMapping(isRadial) {
|
|
|
89947
90031
|
function updateStyle(el, data2, dataIndex, itemModel, layout2, seriesModel, isHorizontalOrRadial, isPolar) {
|
|
89948
90032
|
var style = data2.getItemVisual(dataIndex, "style");
|
|
89949
90033
|
if (!isPolar) {
|
|
89950
|
-
|
|
90034
|
+
var borderRadius = itemModel.get(["itemStyle", "borderRadius"]) || 0;
|
|
90035
|
+
el.setShape("r", borderRadius);
|
|
90036
|
+
} else if (!seriesModel.get("roundCap")) {
|
|
90037
|
+
var sectorShape = el.shape;
|
|
90038
|
+
var cornerRadius = getSectorCornerRadius(itemModel.getModel("itemStyle"), sectorShape, true);
|
|
90039
|
+
extend(sectorShape, cornerRadius);
|
|
90040
|
+
el.setShape(sectorShape);
|
|
89951
90041
|
}
|
|
89952
90042
|
el.useStyle(style);
|
|
89953
90043
|
var cursorStyle = itemModel.getShallow("cursor");
|
|
@@ -90686,23 +90776,6 @@ function pieLabelLayout(seriesModel) {
|
|
|
90686
90776
|
}
|
|
90687
90777
|
}
|
|
90688
90778
|
}
|
|
90689
|
-
function getSectorCornerRadius(model2, shape, zeroIfNull) {
|
|
90690
|
-
var cornerRadius = model2.get("borderRadius");
|
|
90691
|
-
if (cornerRadius == null) {
|
|
90692
|
-
return zeroIfNull ? {
|
|
90693
|
-
cornerRadius: 0
|
|
90694
|
-
} : null;
|
|
90695
|
-
}
|
|
90696
|
-
if (!isArray$1(cornerRadius)) {
|
|
90697
|
-
cornerRadius = [cornerRadius, cornerRadius, cornerRadius, cornerRadius];
|
|
90698
|
-
}
|
|
90699
|
-
var dr = Math.abs(shape.r || 0 - shape.r0 || 0);
|
|
90700
|
-
return {
|
|
90701
|
-
cornerRadius: map$1(cornerRadius, function(cr) {
|
|
90702
|
-
return parsePercent$1(cr, dr);
|
|
90703
|
-
})
|
|
90704
|
-
};
|
|
90705
|
-
}
|
|
90706
90779
|
var PiePiece = function(_super) {
|
|
90707
90780
|
__extends(PiePiece2, _super);
|
|
90708
90781
|
function PiePiece2(data2, idx, startAngle) {
|
|
@@ -109343,7 +109416,7 @@ var SunburstPiece = function(_super) {
|
|
|
109343
109416
|
if (firstCreate) {
|
|
109344
109417
|
sector.setShape(sectorShape);
|
|
109345
109418
|
sector.shape.r = layout2.r0;
|
|
109346
|
-
|
|
109419
|
+
initProps(sector, {
|
|
109347
109420
|
shape: {
|
|
109348
109421
|
r: layout2.r
|
|
109349
109422
|
}
|
|
@@ -109435,8 +109508,8 @@ var SunburstPiece = function(_super) {
|
|
|
109435
109508
|
var rotateType = getLabelAttr(labelStateModel, "rotate");
|
|
109436
109509
|
var rotate2 = 0;
|
|
109437
109510
|
if (rotateType === "radial") {
|
|
109438
|
-
rotate2 = -midAngle;
|
|
109439
|
-
if (rotate2
|
|
109511
|
+
rotate2 = normalizeRadian(-midAngle);
|
|
109512
|
+
if (rotate2 > Math.PI / 2 && rotate2 < Math.PI * 1.5) {
|
|
109440
109513
|
rotate2 += Math.PI;
|
|
109441
109514
|
}
|
|
109442
109515
|
} else if (rotateType === "tangential") {
|
|
@@ -117365,6 +117438,7 @@ var TooltipHTMLContent = function() {
|
|
|
117365
117438
|
this._show = false;
|
|
117366
117439
|
this._styleCoord = [0, 0, 0, 0];
|
|
117367
117440
|
this._enterable = true;
|
|
117441
|
+
this._alwaysShowContent = false;
|
|
117368
117442
|
this._firstShow = true;
|
|
117369
117443
|
this._longHide = true;
|
|
117370
117444
|
if (env$1.wxa) {
|
|
@@ -117417,6 +117491,7 @@ var TooltipHTMLContent = function() {
|
|
|
117417
117491
|
}
|
|
117418
117492
|
var alwaysShowContent = tooltipModel.get("alwaysShowContent");
|
|
117419
117493
|
alwaysShowContent && this._moveIfResized();
|
|
117494
|
+
this._alwaysShowContent = alwaysShowContent;
|
|
117420
117495
|
this.el.className = tooltipModel.get("className") || "";
|
|
117421
117496
|
};
|
|
117422
117497
|
TooltipHTMLContent2.prototype.show = function(tooltipModel, nearPointColor) {
|
|
@@ -117498,7 +117573,7 @@ var TooltipHTMLContent = function() {
|
|
|
117498
117573
|
}, 500);
|
|
117499
117574
|
};
|
|
117500
117575
|
TooltipHTMLContent2.prototype.hideLater = function(time2) {
|
|
117501
|
-
if (this._show && !(this._inContent && this._enterable)) {
|
|
117576
|
+
if (this._show && !(this._inContent && this._enterable) && !this._alwaysShowContent) {
|
|
117502
117577
|
if (time2) {
|
|
117503
117578
|
this._hideDelay = time2;
|
|
117504
117579
|
this._show = false;
|
|
@@ -117521,6 +117596,7 @@ var TooltipRichContent = function() {
|
|
|
117521
117596
|
function TooltipRichContent2(api2) {
|
|
117522
117597
|
this._show = false;
|
|
117523
117598
|
this._styleCoord = [0, 0, 0, 0];
|
|
117599
|
+
this._alwaysShowContent = false;
|
|
117524
117600
|
this._enterable = true;
|
|
117525
117601
|
this._zr = api2.getZr();
|
|
117526
117602
|
makeStyleCoord(this._styleCoord, this._zr, api2.getWidth() / 2, api2.getHeight() / 2);
|
|
@@ -117528,6 +117604,7 @@ var TooltipRichContent = function() {
|
|
|
117528
117604
|
TooltipRichContent2.prototype.update = function(tooltipModel) {
|
|
117529
117605
|
var alwaysShowContent = tooltipModel.get("alwaysShowContent");
|
|
117530
117606
|
alwaysShowContent && this._moveIfResized();
|
|
117607
|
+
this._alwaysShowContent = alwaysShowContent;
|
|
117531
117608
|
};
|
|
117532
117609
|
TooltipRichContent2.prototype.show = function() {
|
|
117533
117610
|
if (this._hideTimeout) {
|
|
@@ -117620,7 +117697,7 @@ var TooltipRichContent = function() {
|
|
|
117620
117697
|
this._show = false;
|
|
117621
117698
|
};
|
|
117622
117699
|
TooltipRichContent2.prototype.hideLater = function(time2) {
|
|
117623
|
-
if (this._show && !(this._inContent && this._enterable)) {
|
|
117700
|
+
if (this._show && !(this._inContent && this._enterable) && !this._alwaysShowContent) {
|
|
117624
117701
|
if (time2) {
|
|
117625
117702
|
this._hideDelay = time2;
|
|
117626
117703
|
this._show = false;
|
|
@@ -117692,7 +117769,6 @@ var TooltipView = function(_super) {
|
|
|
117692
117769
|
this._tooltipModel = tooltipModel;
|
|
117693
117770
|
this._ecModel = ecModel;
|
|
117694
117771
|
this._api = api2;
|
|
117695
|
-
this._alwaysShowContent = tooltipModel.get("alwaysShowContent");
|
|
117696
117772
|
var tooltipContent = this._tooltipContent;
|
|
117697
117773
|
tooltipContent.update(tooltipModel);
|
|
117698
117774
|
tooltipContent.setEnterable(tooltipModel.get("enterable"));
|
|
@@ -117806,7 +117882,7 @@ var TooltipView = function(_super) {
|
|
|
117806
117882
|
};
|
|
117807
117883
|
TooltipView2.prototype.manuallyHideTip = function(tooltipModel, ecModel, api2, payload) {
|
|
117808
117884
|
var tooltipContent = this._tooltipContent;
|
|
117809
|
-
if (
|
|
117885
|
+
if (this._tooltipModel) {
|
|
117810
117886
|
tooltipContent.hideLater(this._tooltipModel.get("hideDelay"));
|
|
117811
117887
|
}
|
|
117812
117888
|
this._lastX = this._lastY = this._lastDataByCoordSys = null;
|
|
@@ -120194,8 +120270,8 @@ function dataTransform(seriesModel, item) {
|
|
|
120194
120270
|
}
|
|
120195
120271
|
var data2 = seriesModel.getData();
|
|
120196
120272
|
var coordSys = seriesModel.coordinateSystem;
|
|
120197
|
-
var dims = coordSys.dimensions;
|
|
120198
|
-
if (!hasXAndY(item) && !isArray$1(item.coord) &&
|
|
120273
|
+
var dims = coordSys && coordSys.dimensions;
|
|
120274
|
+
if (!hasXAndY(item) && !isArray$1(item.coord) && isArray$1(dims)) {
|
|
120199
120275
|
var axisInfo = getAxisInfo(item, data2, coordSys, seriesModel);
|
|
120200
120276
|
item = clone$4(item);
|
|
120201
120277
|
if (item.type && markerTypeCalculator[item.type] && axisInfo.baseAxis && axisInfo.valueAxis) {
|
|
@@ -120208,7 +120284,7 @@ function dataTransform(seriesModel, item) {
|
|
|
120208
120284
|
item.coord = [item.xAxis != null ? item.xAxis : item.radiusAxis, item.yAxis != null ? item.yAxis : item.angleAxis];
|
|
120209
120285
|
}
|
|
120210
120286
|
}
|
|
120211
|
-
if (item.coord == null) {
|
|
120287
|
+
if (item.coord == null || !isArray$1(dims)) {
|
|
120212
120288
|
item.coord = [];
|
|
120213
120289
|
} else {
|
|
120214
120290
|
var coord = item.coord;
|