npm - amis - Versions diffs - 2.5.0-rc.0 → 2.5.0 - Mend

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import InputDateRange, { DateRangeControlSchema } from './InputDateRange';
 /**
  * YearRange 年份范围控件

package/lib/renderers/Form/InputYearRange.js CHANGED Viewed

@@ -1,5 +1,5 @@
 /**
- * amis v2.5.0-rc.0
+ * amis v2.5.0
  * Copyright 2018-2022 baidu
  */

package/lib/renderers/Form/JSONSchema.js CHANGED Viewed

@@ -1,5 +1,5 @@
 /**
- * amis v2.5.0-rc.0
+ * amis v2.5.0
  * Copyright 2018-2022 baidu
  */

package/lib/renderers/Form/JSONSchemaEditor.js CHANGED Viewed

@@ -1,5 +1,5 @@
 /**
- * amis v2.5.0-rc.0
+ * amis v2.5.0
  * Copyright 2018-2022 baidu
  */

package/lib/renderers/Form/ListSelect.js CHANGED Viewed

@@ -1,5 +1,5 @@
 /**
- * amis v2.5.0-rc.0
+ * amis v2.5.0
  * Copyright 2018-2022 baidu
  */

package/lib/renderers/Form/LocationPicker.js CHANGED Viewed

@@ -1,5 +1,5 @@
 /**
- * amis v2.5.0-rc.0
+ * amis v2.5.0
  * Copyright 2018-2022 baidu
  */

package/lib/renderers/Form/MatrixCheckboxes.js CHANGED Viewed

@@ -1,5 +1,5 @@
 /**
- * amis v2.5.0-rc.0
+ * amis v2.5.0
  * Copyright 2018-2022 baidu
  */

package/lib/renderers/Form/NestedSelect.js CHANGED Viewed

@@ -1,5 +1,5 @@
 /**
- * amis v2.5.0-rc.0
+ * amis v2.5.0
  * Copyright 2018-2022 baidu
  */

package/lib/renderers/Form/Picker.js CHANGED Viewed

@@ -1,5 +1,5 @@
 /**
- * amis v2.5.0-rc.0
+ * amis v2.5.0
  * Copyright 2018-2022 baidu
  */
@@ -10,19 +10,23 @@ Object.defineProperty(exports, '__esModule', { value: true });
 var tslib = require('tslib');
 var React = require('react');
 var cx = require('classnames');
+var omit = require('lodash/omit');
 var find = require('lodash/find');
 var isEqual = require('lodash/isEqual');
 var findIndex = require('lodash/findIndex');
 var amisCore = require('amis-core');
 var amisUi = require('amis-ui');
+var intersectionWith = require('lodash/intersectionWith');
 function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
 var React__default = /*#__PURE__*/_interopDefaultLegacy(React);
 var cx__default = /*#__PURE__*/_interopDefaultLegacy(cx);
+var omit__default = /*#__PURE__*/_interopDefaultLegacy(omit);
 var find__default = /*#__PURE__*/_interopDefaultLegacy(find);
 var isEqual__default = /*#__PURE__*/_interopDefaultLegacy(isEqual);
 var findIndex__default = /*#__PURE__*/_interopDefaultLegacy(findIndex);
+var intersectionWith__default = /*#__PURE__*/_interopDefaultLegacy(intersectionWith);
 var PickerControl = /** @class */ (function (_super) {
     tslib.__extends(PickerControl, _super);
@@ -264,20 +268,27 @@ var PickerControl = /** @class */ (function (_super) {
             multiple: multiple,
             onSelect: embed
                 ? function (selectedItems, unSelectedItems) {
+                    // 选择行后，crud 会给出连续多次事件，且selectedItems会变化，会导致初始化和点击无效
                     // 过滤掉一些无用事件，否则会导致 value 错误
                     if (!Array.isArray(selectedItems) ||
                         !Array.isArray(unSelectedItems) ||
                         (!selectedItems.length && !unSelectedItems.length)) {
                         return;
                     }
-                    else if (selectedItems
-                        .map(function (item) { return item[valueField || 'value']; })
-                        .sort()
-                        .join(',') ===
-                        selectedOptions
-                            .map(function (item) { return item[valueField || 'value']; })
-                            .sort()
-                            .join(',')) {
+                    // 取交集，判断是否是无效事件，需要考虑顺序问题
+                    var intersections = intersectionWith__default["default"](selectedItems, selectedOptions, function (a, b) {
+                        // 需要考虑没有配置 valueField，而且值里面又没有 value 字段的情况
+                        var aValue = a[valueField || 'value'];
+                        var bValue = b[valueField || 'value'];
+                        return aValue || bValue
+                            ? aValue === bValue
+                            : // selectedOptions 中有 Options 自动添加的 value 字段，所以去掉后才能比较
+                                isEqual__default["default"](omit__default["default"](a, 'value'), omit__default["default"](b, 'value'));
+                    });
+                    if (
+                    // 前后数量都一样说明是重复事件
+                    intersections.length === selectedItems.length &&
+                        intersections.length === selectedOptions.length) {
                         return;
                     }
                     _this.handleChange(selectedItems);

package/lib/renderers/Form/Radios.js CHANGED Viewed

@@ -1,5 +1,5 @@
 /**
- * amis v2.5.0-rc.0
+ * amis v2.5.0
  * Copyright 2018-2022 baidu
  */

package/lib/renderers/Form/Select.js CHANGED Viewed

@@ -1,5 +1,5 @@
 /**
- * amis v2.5.0-rc.0
+ * amis v2.5.0
  * Copyright 2018-2022 baidu
  */

package/lib/renderers/Form/Static.js CHANGED Viewed

@@ -1,5 +1,5 @@
 /**
- * amis v2.5.0-rc.0
+ * amis v2.5.0
  * Copyright 2018-2022 baidu
  */

package/lib/renderers/Form/StaticHoc.js CHANGED Viewed

@@ -1,5 +1,5 @@
 /**
- * amis v2.5.0-rc.0
+ * amis v2.5.0
  * Copyright 2018-2022 baidu
  */

package/lib/renderers/Form/Switch.js CHANGED Viewed

@@ -1,5 +1,5 @@
 /**
- * amis v2.5.0-rc.0
+ * amis v2.5.0
  * Copyright 2018-2022 baidu
  */

package/lib/renderers/Form/TabsTransfer.d.ts CHANGED Viewed

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import { OptionsControlProps } from 'amis-core';
 import { BaseTransferRenderer, TransferControlSchema } from './Transfer';
 import { Option } from 'amis-core';
@@ -22,7 +23,7 @@ export declare class BaseTabsTransferRenderer<T extends OptionsControlProps = Ta
     handleChange(value: Array<Option> | Option, optionModified?: boolean): Promise<void>;
 }
 export declare class TabsTransferRenderer extends BaseTabsTransferRenderer<TabsTransferProps> {
-    optionItemRender(option: any, states: ItemRenderStates): any;
+    optionItemRender(option: any, states: ItemRenderStates): JSX.Element;
     doAction(action: ActionObject, args: any): void;
     render(): JSX.Element;
 }

package/lib/renderers/Form/TabsTransfer.js CHANGED Viewed

@@ -1,5 +1,5 @@
 /**
- * amis v2.5.0-rc.0
+ * amis v2.5.0
  * Copyright 2018-2022 baidu
  */

package/lib/renderers/Form/TabsTransferPicker.d.ts CHANGED Viewed

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import { OptionsControlProps } from 'amis-core';
 import { BaseTabsTransferRenderer } from './TabsTransfer';
 import { TabsTransferControlSchema } from './TabsTransfer';
@@ -18,7 +19,7 @@ interface BaseTransferState {
 export declare class TabsTransferPickerRenderer extends BaseTabsTransferRenderer<TabsTransferProps> {
     state: BaseTransferState;
     dispatchEvent(name: string): void;
-    optionItemRender(option: any, states: ItemRenderStates): any;
+    optionItemRender(option: any, states: ItemRenderStates): JSX.Element;
     doAction(action: ActionObject): void;
     render(): JSX.Element;
 }

package/lib/renderers/Form/TabsTransferPicker.js CHANGED Viewed

@@ -1,5 +1,5 @@
 /**
- * amis v2.5.0-rc.0
+ * amis v2.5.0
  * Copyright 2018-2022 baidu
  */

package/lib/renderers/Form/Textarea.js CHANGED Viewed

@@ -1,5 +1,5 @@
 /**
- * amis v2.5.0-rc.0
+ * amis v2.5.0
  * Copyright 2018-2022 baidu
  */

package/lib/renderers/Form/Transfer.d.ts CHANGED Viewed

@@ -111,8 +111,8 @@ export declare class BaseTransferRenderer<T extends OptionsControlProps = BaseTr
     option2value(option: Option): Option;
     handleSearch(term: string, cancelExecutor: Function): Promise<any[]>;
     handleResultSearch(term: string, item: Option): boolean;
-    optionItemRender(option: Option, states: ItemRenderStates): any;
-    resultItemRender(option: Option, states: ItemRenderStates): any;
+    optionItemRender(option: Option, states: ItemRenderStates): JSX.Element;
+    resultItemRender(option: Option, states: ItemRenderStates): JSX.Element;
     renderCell(column: {
         name: string;
         label: string;

package/lib/renderers/Form/Transfer.js CHANGED Viewed

@@ -1,5 +1,5 @@
 /**
- * amis v2.5.0-rc.0
+ * amis v2.5.0
  * Copyright 2018-2022 baidu
  */

package/lib/renderers/Form/TransferPicker.d.ts CHANGED Viewed

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import { OptionsControlProps } from 'amis-core';
 import { BaseTransferRenderer, TransferControlSchema } from './Transfer';
 import { ActionObject } from 'amis-core';

package/lib/renderers/Form/TransferPicker.js CHANGED Viewed

@@ -1,5 +1,5 @@
 /**
- * amis v2.5.0-rc.0
+ * amis v2.5.0
  * Copyright 2018-2022 baidu
  */

package/lib/renderers/Form/TreeSelect.js CHANGED Viewed

@@ -1,5 +1,5 @@
 /**
- * amis v2.5.0-rc.0
+ * amis v2.5.0
  * Copyright 2018-2022 baidu
  */

package/lib/renderers/Form/UUID.js CHANGED Viewed

@@ -1,5 +1,5 @@
 /**
- * amis v2.5.0-rc.0
+ * amis v2.5.0
  * Copyright 2018-2022 baidu
  */

package/lib/renderers/Form/UserSelect.js CHANGED Viewed

@@ -1,5 +1,5 @@
 /**
- * amis v2.5.0-rc.0
+ * amis v2.5.0
  * Copyright 2018-2022 baidu
  */

package/lib/renderers/Grid.js CHANGED Viewed

@@ -1,5 +1,5 @@
 /**
- * amis v2.5.0-rc.0
+ * amis v2.5.0
  * Copyright 2018-2022 baidu
  */

package/lib/renderers/Grid2D.js CHANGED Viewed

@@ -1,5 +1,5 @@
 /**
- * amis v2.5.0-rc.0
+ * amis v2.5.0
  * Copyright 2018-2022 baidu
  */

package/lib/renderers/GridNav.js CHANGED Viewed

@@ -1,5 +1,5 @@
 /**
- * amis v2.5.0-rc.0
+ * amis v2.5.0
  * Copyright 2018-2022 baidu
  */

package/lib/renderers/HBox.js CHANGED Viewed

@@ -1,5 +1,5 @@
 /**
- * amis v2.5.0-rc.0
+ * amis v2.5.0
  * Copyright 2018-2022 baidu
  */

package/lib/renderers/IFrame.js CHANGED Viewed

@@ -1,5 +1,5 @@
 /**
- * amis v2.5.0-rc.0
+ * amis v2.5.0
  * Copyright 2018-2022 baidu
  */

package/lib/renderers/Icon.js CHANGED Viewed

@@ -1,5 +1,5 @@
 /**
- * amis v2.5.0-rc.0
+ * amis v2.5.0
  * Copyright 2018-2022 baidu
  */