@alicloud/console-components-search 0.2.37-alpha.5 → 0.2.37-alpha.7

package/demos/demo1.demo.tsx

@@ -58,6 +58,121 @@ const options2 = [
   },
 ];
 
+const intl = (a) => a;
+
+const options3 = [
+  {
+    dataIndex: 'SourceIp',
+    label: intl('flow_analysis.prop.enum', { value: 'SourceIp' }),
+    template: 'input',
+    // groupName: intl('flow_analysis.prop.enum', { value: 'SourceIp' }),
+    children: [
+      {
+        dataIndex: 'SourceIp_equal',
+        label: intl('flow_analysis.prop.enum', { value: 'SourceIp_equal' }),
+        template: 'input',
+      }, {
+        dataIndex: 'SourceIp_like',
+        label: intl('flow_analysis.prop.enum', { value: 'SourceIp_like' }),
+        template: 'input',
+      },
+      {
+        dataIndex: 'SourceIp_notlike',
+        label: intl('flow_analysis.prop.enum', { value: 'SourceIp_notlike' }),
+        template: 'input',
+        // groupName: intl('flow_analysis.prop.enum', { value: 'SourceIp' }),
+      },
+    ],
+  },
+  {
+    dataIndex: 'DestinationIp_equal',
+    label: intl('flow_analysis.prop.enum', { value: 'DestinationIp_equal' }),
+    labelEx: (
+      <div>
+        <span>
+          {intl('flow_analysis.prop.enum', { value: 'DestinationIp_equal' })}
+        </span>
+        <span>
+          {intl('tr_flow_log.search.operator.enum', { value: 'equal' })}
+        </span>
+      </div>
+    ),
+    template: 'input',
+    groupName: intl('flow_analysis.prop.enum', { value: 'DestinationIp' }),
+  },
+  {
+    dataIndex: 'DestinationIp_like',
+    label: intl('flow_analysis.prop.enum', { value: 'DestinationIp_like' }),
+    labelEx: (
+      <div>
+        <span>
+          {intl('flow_analysis.prop.enum', { value: 'DestinationIp_like' })}
+        </span>
+        <span>
+          {intl('tr_flow_log.search.operator.enum', { value: 'like' })}
+        </span>
+      </div>
+    ),
+    template: 'input',
+    groupName: intl('flow_analysis.prop.enum', { value: 'DestinationIp' }),
+  },
+  {
+    dataIndex: 'DestinationIp_notlike',
+    label: intl('flow_analysis.prop.enum', { value: 'DestinationIp_notlike' }),
+    labelEx: (
+      <div>
+        <span>
+          {intl('flow_analysis.prop.enum', { value: 'DestinationIp_notlike' })}
+        </span>
+        <span>
+          {intl('tr_flow_log.search.operator.enum', { value: 'notlike' })}
+        </span>
+      </div>
+    ),
+    template: 'input',
+    groupName: intl('flow_analysis.prop.enum', { value: 'DestinationIp' }),
+  },
+  {
+    dataIndex: 'Dscp',
+    label: intl('flow_analysis.prop.enum', { value: 'Dscp' }),
+    template: 'input',
+    groupName: intl('flow_analysis.prop.enum', { value: 'Dscp' }),
+  },
+  {
+    dataIndex: 'Protocol',
+    label: intl('flow_analysis.prop.enum', { value: 'Protocol' }),
+    template: 'select',
+    templateProps: {
+      dataSource: [
+        0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24,
+        25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47,
+        48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 62, 64, 65, 66, 67, 69, 70, 71, 72, 73,
+        74, 75, 76, 77, 78, 79, 80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95, 96,
+        97, 98, 100, 101, 102, 103, 104, 105, 106, 107, 108, 109, 110, 111, 112, 113, 115, 116, 117,
+        118, 119, 120, 121, 122, 123, 124, 125, 126, 127, 128, 129, 130, 131, 132, 133, 134, 135,
+        136, 137, 138, 139, 140, 141, 142, 143, 144, 145, 146, 147, 255,
+      ].map((item) => ({
+        label: intl('flow_analyzer.detail.protocol.enum', { value: item }),
+        value: String(item),
+      })),
+    },
+    groupName: intl('flow_analysis.prop.enum', { value: 'Protocol' }),
+  },
+  {
+    dataIndex: 'DestinationPort',
+    label: intl('flow_analysis.prop.enum', { value: 'DestinationPort' }),
+    template: 'input',
+    groupName: intl('flow_analysis.prop.enum', { value: 'DestinationPort' }),
+  },
+  {
+    dataIndex: 'SourcePort',
+    label: intl('flow_analysis.prop.enum', { value: 'SourcePort' }),
+    template: 'input',
+    groupName: intl('flow_analysis.prop.enum', { value: 'SourcePort' }),
+  },
+];
+
+
 const Demo1: React.FC<{}> = (props) => {
   const [filters, setFilters] = useState<any>([
     { label: '实例名称', value: 'xxxxxx', dataIndex: 'name' },
@@ -108,9 +223,10 @@ const Demo1: React.FC<{}> = (props) => {
         <Search
           defaultDataIndex="name"
           // defaultSelectedDataIndex="name"
-          options={options}
+          options={options3}
           prefixSelectMode="cascader"
           onSearch={(value, dataIndex, extra) => {
+            console.log(value, dataIndex, extra);
             // @ts-ignore
             setFilters([...filters, extra]);
           }}

package/dist/index.js

@@ -90277,15 +90277,28 @@ var normalizeSelectDataSource = function (title, list) {
         },
     ];
 };
+var flatOption = function (opts) {
+    if (opts === void 0) { opts = []; }
+    var flattened = [];
+    opts.forEach(function (item) {
+        if (item.children) {
+            flattened.push.apply(flattened, flatOption(item.children));
+        }
+        else {
+            flattened.push(item);
+        }
+    });
+    return flattened;
+};
 var normalizeSearchOptions = function (dataIndex, value, options) {
-    var _a, _b, _c;
-    var opt = options === null || options === void 0 ? void 0 : options.find(function (o) { return getDataIndex(o) === dataIndex; });
+    var _a, _b, _c, _d;
+    var opt = (_a = flatOption(options)) === null || _a === void 0 ? void 0 : _a.find(function (o) { return getDataIndex(o) === dataIndex; });
     var valueLabel = value;
     if ((opt === null || opt === void 0 ? void 0 : opt.template) === 'select') {
-        valueLabel = (_b = (_a = opt.templateProps) === null || _a === void 0 ? void 0 : _a.dataSource.find(function (d) { return d.value === value; })) === null || _b === void 0 ? void 0 : _b.label;
+        valueLabel = (_c = (_b = opt.templateProps) === null || _b === void 0 ? void 0 : _b.dataSource.find(function (d) { return d.value === value; })) === null || _c === void 0 ? void 0 : _c.label;
     }
     if ((opt === null || opt === void 0 ? void 0 : opt.template) === 'multiple') {
-        valueLabel = (_c = opt.templateProps) === null || _c === void 0 ? void 0 : _c.dataSource.filter(function (d) { return value === null || value === void 0 ? void 0 : value.includes(d.value); }).map(function (d) { return d.label; }).join('/');
+        valueLabel = (_d = opt.templateProps) === null || _d === void 0 ? void 0 : _d.dataSource.filter(function (d) { return value === null || value === void 0 ? void 0 : value.includes(d.value); }).map(function (d) { return d.label; }).join('/');
     }
     return {
         label: opt === null || opt === void 0 ? void 0 : opt.label,
@@ -90337,7 +90350,7 @@ var ComplexSearch = function (props) {
      */
     var handlerFilterTypeChange = function (type, resetValue) {
         if (resetValue === void 0) { resetValue = true; }
-        setSelectedFilterType(options.find(function (o) { return getDataIndex(o) === type; }));
+        setSelectedFilterType(flatOption(options).find(function (o) { return getDataIndex(o) === type; }));
         resetValue && reset();
     };
     /**

package/es/ComplexSearch/index.js

@@ -84,8 +84,21 @@ var normalizeSelectDataSource = function normalizeSelectDataSource(title, list)
     children: _toConsumableArray(list)
   }];
 };
+var _flatOption = function flatOption() {
+  var opts = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : [];
+  var flattened = [];
+  opts.forEach(function (item) {
+    if (item.children) {
+      flattened.push.apply(flattened, _toConsumableArray(_flatOption(item.children)));
+    } else {
+      flattened.push(item);
+    }
+  });
+  return flattened;
+};
 var normalizeSearchOptions = function normalizeSearchOptions(dataIndex, value, options) {
-  var opt = options === null || options === void 0 ? void 0 : options.find(function (o) {
+  var _flatOption2;
+  var opt = (_flatOption2 = _flatOption(options)) === null || _flatOption2 === void 0 ? void 0 : _flatOption2.find(function (o) {
     return getDataIndex(o) === dataIndex;
   });
   var valueLabel = value;
@@ -184,7 +197,7 @@ var ComplexSearch = function ComplexSearch(props) {
    */
   var handlerFilterTypeChange = function handlerFilterTypeChange(type) {
     var resetValue = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : true;
-    setSelectedFilterType(options.find(function (o) {
+    setSelectedFilterType(_flatOption(options).find(function (o) {
       return getDataIndex(o) === type;
     }));
     resetValue && reset();

package/lib/ComplexSearch/index.js

@@ -93,8 +93,21 @@ var normalizeSelectDataSource = function normalizeSelectDataSource(title, list)
     children: (0, _toConsumableArray2.default)(list)
   }];
 };
+var _flatOption = function flatOption() {
+  var opts = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : [];
+  var flattened = [];
+  opts.forEach(function (item) {
+    if (item.children) {
+      flattened.push.apply(flattened, (0, _toConsumableArray2.default)(_flatOption(item.children)));
+    } else {
+      flattened.push(item);
+    }
+  });
+  return flattened;
+};
 var normalizeSearchOptions = function normalizeSearchOptions(dataIndex, value, options) {
-  var opt = options === null || options === void 0 ? void 0 : options.find(function (o) {
+  var _flatOption2;
+  var opt = (_flatOption2 = _flatOption(options)) === null || _flatOption2 === void 0 ? void 0 : _flatOption2.find(function (o) {
     return getDataIndex(o) === dataIndex;
   });
   var valueLabel = value;
@@ -193,7 +206,7 @@ var ComplexSearch = function ComplexSearch(props) {
    */
   var handlerFilterTypeChange = function handlerFilterTypeChange(type) {
     var resetValue = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : true;
-    setSelectedFilterType(options.find(function (o) {
+    setSelectedFilterType(_flatOption(options).find(function (o) {
       return getDataIndex(o) === type;
     }));
     resetValue && reset();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@alicloud/console-components-search",
-  "version": "0.2.37-alpha.5",
+  "version": "0.2.37-alpha.7",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",
   "license": "MIT",