plainheart commented on code in PR #20129:
URL: https://github.com/apache/echarts/pull/20129#discussion_r1674164432
##########
src/component/legend/legendAction.ts:
##########
@@ -17,59 +17,81 @@
* under the License.
*/
-// @ts-nocheck
+import {curry, each, hasOwn} from 'zrender/src/core/util';
+import { EChartsExtensionInstallRegisters } from '../../extension';
+import { Payload } from '../../util/types';
+import type GlobalModel from '../../model/Global';
+import type LegendModel from './LegendModel';
-import {curry, each} from 'zrender/src/core/util';
+type LegendSelectMethodNames = 'select' | 'unSelect' | 'toggleSelected' |
'allSelect' | 'inverseSelect';
-function legendSelectActionHandler(methodName, payload, ecModel) {
- const selectedMap = {};
- const isToggleSelect = methodName === 'toggleSelected';
- let isSelected;
- // Update all legend components
- ecModel.eachComponent('legend', function (legendModel) {
- if (isToggleSelect && isSelected != null) {
- // Force other legend has same selected status
- // Or the first is toggled to true and other are toggled to false
- // In the case one legend has some item unSelected in option. And
if other legend
- // doesn't has the item, they will assume it is selected.
- legendModel[isSelected ? 'select' : 'unSelect'](payload.name);
- }
- else if (methodName === 'allSelect' || methodName === 'inverseSelect')
{
+function legendSelectActionHandler(methodName: LegendSelectMethodNames,
payload: Payload, ecModel: GlobalModel) {
+ const isAllSelect = methodName === 'allSelect' || methodName ===
'inverseSelect';
+ const selectedMap: Record<string, boolean> = {};
+
+ const actionLegendIndices: number[] = [];
+ ecModel.eachComponent({ mainType: 'legend', query: payload }, function
(legendModel: LegendModel) {
+ if (isAllSelect) {
legendModel[methodName]();
}
else {
legendModel[methodName](payload.name);
- isSelected = legendModel.isSelected(payload.name);
}
- const legendData = legendModel.getData();
- each(legendData, function (model) {
- const name = model.get('name');
- // Wrap element
- if (name === '\n' || name === '') {
- return;
- }
- const isItemSelected = legendModel.isSelected(name);
- if (selectedMap.hasOwnProperty(name)) {
- // Unselected if any legend is unselected
- selectedMap[name] = selectedMap[name] && isItemSelected;
- }
- else {
- selectedMap[name] = isItemSelected;
- }
+
+ makeSelectedMap(legendModel, selectedMap);
+
+ actionLegendIndices.push(legendModel.componentIndex);
+ });
+
+ const allSelectedMap: Record<string, boolean> = {};
Review Comment:
已改，不是全选 action 也返回了全部的 selectedMap，毕竟以前一直就是这么做的，突然只返回当前触发该 action 的 legend 的
selectedMap 可能会带来 BC
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
