@alicloud/console-components-search 0.1.3 → 0.2.2

package/README.md

@@ -1,13 +1,6 @@
 # @alicloud/console-components-search
 
 基础搜索组件： 当前控制台的基础搜索主要针对列表页的搜索场景，此次基础搜索组件主要通过一个简约通用的框架满足控制台针对列表页不同场景下的搜索需求
-按照使用场景分为三种使用场景
-- 场景一：单维度单类别单选 （eg：该功能模块下只支持“实例名称”这唯一类别的搜索）；
-- 场景二：带着多个筛选维度的输入
-
-### SearchTagList
-场景二 需结合SearchTagList使用， SearchTagList用与展示Search已选的筛选条件（以tag的形式），分成两个组件可以更灵活的定位SearchTagList的位置（比如表格场景）
-
 ## install 
 
 ```bash
@@ -17,20 +10,66 @@ tnpm i @alicloud/xconsole-components-search --save-dev
 ## Usage
 
 ```js
-import { Search, IRcSearchProps } from "@alicloud/console-components-search";
-let options = [
+/**
+ * @title 场景1
+ */
+
+ import React from "react";
+ import { Search } from "@alicloud/console-components-search";
+ 
+ let options = [
   {
     label: '实例名称',
     dataIndex: 'name',
     template: 'input',
     templateProps: {
-      placeholder: '默认按实例名称搜索',
+      placeholder: '按实例名称搜索',
       dataSource: []
-    }
+    },
+    groupName:"test"
+  },
+  {
+    label: '网络类型',
+    dataIndex: 'type',
+    template: 'select',
+    templateProps: {
+      placeholder: '请选择网络类型',
+      dataSource: [
+        {label: 'A', value: 'a'},
+        {label: 'B', value: 'b'},
+        {label: 'C', value: 'c'},
+        {label: 'D', value: 'd'},
+      ]
+    },
+    groupName:"test"
+  },
+  {
+    label: '付费类型',
+    dataIndex: 'pay',
+    template: 'multiple',
+    templateProps: {
+      placeholder: '请选择付费类型',
+      dataSource: [
+        {label: 'A', value: 'a'},
+        {label: 'B', value: 'b'},
+        {label: 'C', value: 'c'},
+        {label: 'D', value: 'd'},
+      ]
+    },
+    groupName:"test2"
   }
 ]
 
 let options2 = [
+  {
+    label: '实例名称',
+    dataIndex: 'name',
+    template: 'input',
+    templateProps: {
+      placeholder: '按实例名称搜索',
+      dataSource: []
+    },
+  },
   {
     label: '网络类型',
     dataIndex: 'type',
@@ -43,144 +82,78 @@ let options2 = [
         {label: 'C', value: 'c'},
         {label: 'D', value: 'd'},
       ]
-    }
+    },
+  },
+  {
+    label: '付费类型',
+    dataIndex: 'pay',
+    template: 'multiple',
+    templateProps: {
+      placeholder: '请选择付费类型',
+      dataSource: [
+        {label: 'A', value: 'a'},
+        {label: 'B', value: 'b'},
+        {label: 'C', value: 'c'},
+        {label: 'D', value: 'd'},
+      ]
+    },
   }
 ]
-async function onSuggestAsync (value: string, dataIndex: string) {
-  if (!value) {
-    return [];
-  }
-  return [
-    // {label: value, value: `${dataIndex}-${value}`}
-    `${value}-1`,
-    `${value}-2`,
-    `${value}-3`,
-    `${value}-4`,
-    `${value}-5`,
-  ]
-}
-function onSuggestPromise (value: string, dataIndex: string) {
-  let rtList = [];
-  if (!value) {
-    rtList = [];
-  }
-  rtList = [
-    // {label: value, value: `${dataIndex}-${value}`}
-    `${value}-1`,
-    `${value}-2`,
-    `${value}-3`,
-    `${value}-4`,
-    `${value}-5`,
-  ]
-  return Promise.resolve(rtList)
-}
-
-async function onChange1 (changedFileds:any, allFileds:any) {
-  console.log(`changedFileds:`,  changedFileds, 'allFileds', allFileds)
-}
-
-async function onSearch (allFileds:any) {
-  console.log(`onSearch:`, 'allFileds', allFileds)
-  alert(`提交搜索： ${JSON.stringify(allFileds)}`)
-}
-<div>
-  搜索类型：(async 调用)<br />
-  <Search
-    simple
-    options={options}
-    onSuggest={onSuggestAsync}
-    onChange={onChange1}
-    onSearch={onSearch} 
-  />
-  <br /><br /><br /> 搜索类型：（promise调用）<br />
-  <Search
-    simple
-    options={options}
-    onSuggest={onSuggestPromise}
-    onChange={onChange1}
-    onSearch={onSearch} 
-  />
-  <br /><br /><br /> 单选类型：<br />
-  <Search
-    simple
-    options={options2}
-    onChange={onChange1}
-    onSearch={onSearch}
-  />
-  <br /> 单维度单类别,暂不支持多选
-</div>
 
-```
-
-## 使用场景
-
-### 场景一：单维度单类别单选 （eg：该功能模块下只支持“实例名称”这唯一类别的搜索）；
-
-1、用户点击输入框直接输入要搜索的内容；<br>
-2、场景一只提供‘input’类型和‘select’类型；<br>
-3、模糊搜索的回调函数支持async 和 promise 调用；<br>
-
-[$XView](http://localhost:3333/?entryKey=demo1&consoleOSId=console-fe-test-rc-search-doc)
-
-> 场景一的已选值在基础搜索组件上展示， 无需引用“searchTagList”组件
-<br>
 
-### 场景二：单维度多类别单选（eg：该功能模块下只支持“实例名称”这唯一类别的搜索网络类型包括多个子类别）；
-
-1、用户点击输入框激活下拉类别列表<br>
-2、当用户直接输入内容的时候，列表消失<br>
-3、用户点击类别后，在搜索框内生成类别Tag<br>
-4、如果该类别有子类别/推荐项，顺次自动下拉展开<br>
-5、当用户完成该类别搜索后，搜索框默认保留该类别Tag<br>
-6、用户点击类别后，在搜索框内生成类别Tag<br>
-7、如果该类别有子类别/推荐项，顺次自动下拉展开<br>
-8、当用户完成该类别搜索后，搜索框默认保留该类别Tag<br>
-
-[$XView](http://localhost:3333/?entryKey=demo2&consoleOSId=console-fe-test-rc-search-doc)
-
-> 场景二：单维度单类别单选，同一类别下，用户切换子类别内容筛选条件区域的Tag直接被替换。当内容为空时点击输入框里面的叉， 可清除当前类别，回到初始状态。场景三的已选值在基础搜索组件外展示， 需引用“searchTagList”组件
-
-<br>
-
-### 场景三：多维度多类别（eg：该功能模块下支持“网络类型”这一类别和其他同等类别的交集搜索）；
+ const Demo1: React.FC<{}> = (props) => {
+ 
+   return (
+    <div>
+      <Search
+        defaultDataIndex="name"
+        options={options2}
+        onSearch={(value, dataIndex) => {
+          console.log(value, dataIndex)
+        }}
+        suggestions={[{label: '实例名称', children: ['222222']}, '33333333']}
+      />
+      <br/><br/>
+
+      <div>搜索条件成组</div>
+      <Search
+        defaultDataIndex="name"
+        options={options}
+        onSearch={(value, dataIndex) => {
+          console.log(value, dataIndex)
+        }}
+        suggestions={[{label: '实例名称', children: ['222222']}, '33333333']}
+      />
+    </div>
+   );
+ };
+ 
+ export default Demo1;
+ 
+```
 
-1、多维度单类别单选，同一类别下，用户切换子类别内容<br>
-2、筛选条件区域的Tag直接被替换；用户选择不同类别会<br>
-3、生成新的筛选Tag出现在筛选区<br>
+## Demo
 
-[$XView](http://localhost:3333/?entryKey=demo3&consoleOSId=console-fe-test-rc-search-doc)
 
-> 场景三的已选值在基础搜索组件外展示， 需引用“searchTagList”组件
+[$XView](https://xconsole.aliyun-inc.com/demo-playground?consoleOSId=console-fe-test-rc-search-doc&servePath=https%3A%2F%2Fopensource-microapp.oss-cn-hangzhou.aliyuncs.com%2Fapp%2Fbreezr-docs%2Fconsole-fe-test-rc-search-doc%2F-latest%2F&entryKey=demo1 )
 
 <br>
 
-### 无默认分类, 默认多类别搜索；
-
-1、当开发者没有指定默认类别且用户没有选择类别的时候；<br>
-2、模糊搜索的回调函数将使用onSuggestNoDataIndex，返回<br>
-3、开发者可返回多组类别的模糊搜索结果
-[$XView](http://localhost:3333/?entryKey=demo4&consoleOSId=console-fe-test-rc-search-doc)
-
-
 ## API
 
-## rc-search
+### rc-search
 
 基础搜索组件的参数
-[$XView](http://localhost:3333/?entryKey=types%2FIRcSearchProps&consoleOSId=console-fe-test-rc-search-doc)
+[$XView](https://xconsole.aliyun-inc.com/demo-playground?servePath=https%3A%2F%2Fopensource-microapp.oss-cn-hangzhou.aliyuncs.com%2Fapp%2Fbreezr-docs%2Fconsole-fe-test-rc-search-doc%2F-latest%2F&consoleOSId=console-fe-test-rc-search-doc&entryKey=types%2FIRcSearchProps)
 
-## options
+### options
 
 配置组件类别的options
 [$XView](http://localhost:3333/?entryKey=types%2FIRcSearchOptions&consoleOSId=console-fe-test-rc-search-doc)
+### SearchFilter
 
-## tags
-
-场景二、三， 需要与SearchTagList共同使用时的参数
-[$XView](http://localhost:3333/?entryKey=types%2FIRcSearchTagItemProps&consoleOSId=console-fe-test-rc-search-doc)
-
-## SearchTagList
-
-场景二、三， 需要与Search共同使用时的参数
 [$XView](http://localhost:3333/?entryKey=types%2FIRcSearchTagListProps&consoleOSId=console-fe-test-rc-search-doc)
 
+## IRcSearchTagItemProps
+
+[$XView](http://localhost:3333/?entryKey=types%2FIRcSearchTagItemProps&consoleOSId=console-fe-test-rc-search-doc)

package/demos/demo1.demo.tsx

@@ -1,39 +1,64 @@
 /**
- * @title 场景一
- * @describe 场景一：single-single：单维度单类别单选.
+ * @title 场景1
  */
 
 import React from "react";
-import { Search, IRcSearchProps } from "@alicloud/console-components-search";
-
-// interface IProps {}
-
-let options = [
+import { Search, SearchFilter } from "@alicloud/console-components-search";
+import { useState } from "react";
+ 
+ let options = [
   {
     label: '实例名称',
     dataIndex: 'name',
     template: 'input',
     templateProps: {
-      placeholder: '默认按实例名称搜索',
+      placeholder: '按实例名称搜索',
       dataSource: []
-    }
+    },
+    groupName:"test"
+  },
+  {
+    label: '网络类型',
+    dataIndex: 'type',
+    template: 'select',
+    templateProps: {
+      placeholder: '请选择网络类型',
+      dataSource: [
+        {label: 'A', value: 'a'},
+        {label: 'B', value: 'b'},
+        {label: 'C', value: 'c'},
+        {label: 'D', value: 'd'},
+      ]
+    },
+    groupName:"test"
+  },
+  {
+    label: '付费类型',
+    dataIndex: 'pay',
+    template: 'multiple',
+    templateProps: {
+      placeholder: '请选择付费类型',
+      dataSource: [
+        {label: 'A', value: 'a'},
+        {label: 'B', value: 'b'},
+        {label: 'C', value: 'c'},
+        {label: 'D', value: 'd'},
+      ]
+    },
+    groupName:"test2"
   }
 ]
 
-let noFuzzyoptions = [
+let options2 = [
   {
     label: '实例名称',
     dataIndex: 'name',
     template: 'input',
     templateProps: {
-      placeholder: '默认按实例名称搜索',
-      dataSource: [],
-      fuzzyDisable: true // 不支持模糊搜索 
-    }
-  }
-]
-
-let options2 = [
+      placeholder: '按实例名称搜索',
+      dataSource: []
+    },
+  },
   {
     label: '网络类型',
     dataIndex: 'type',
@@ -46,86 +71,71 @@ let options2 = [
         {label: 'C', value: 'c'},
         {label: 'D', value: 'd'},
       ]
-    }
+    },
+  },
+  {
+    label: '付费类型',
+    dataIndex: 'pay',
+    template: 'multiple',
+    templateProps: {
+      placeholder: '请选择付费类型',
+      dataSource: [
+        {label: 'A', value: 'a'},
+        {label: 'B', value: 'b'},
+        {label: 'C', value: 'c'},
+        {label: 'D', value: 'd'},
+      ]
+    },
   }
 ]
 
-const Demo1: React.FC<IRcSearchProps> = (props) => {
-
-  async function onSuggestAsync (value: string, dataIndex: string) {
-    if (!value) {
-      return [];
-    }
-    return [
-      // {label: value, value: `${dataIndex}-${value}`}
-      `${value}-1`,
-      `${value}-2`,
-      `${value}-3`,
-      `${value}-4`,
-      `${value}-5`,
-    ]
-  }
-  function onSuggestPromise (value: string, dataIndex: string) {
-    let rtList = [];
-    if (!value) {
-      rtList = [];
-    }
-    rtList = [
-      // {label: value, value: `${dataIndex}-${value}`}
-      `${value}-1`,
-      `${value}-2`,
-      `${value}-3`,
-      `${value}-4`,
-      `${value}-5`,
-    ]
-    return Promise.resolve(rtList)
-  }
-
-  async function onChange1 (changedFileds:any, allFileds:any) {
-    console.log(`changedFileds:`,  changedFileds, 'allFileds', allFileds)
-  }
 
-  async function onSearch (allFileds:any) {
-    alert(JSON.stringify(allFileds))
-  }
-
-  return (
+ const Demo1: React.FC<{}> = (props) => {
+   const [filters, setFilters] = useState<any>([]);
+   console.log(filters)
+   return (
     <div>
-      搜索类型：(async 调用)<br />
       <Search
-        simple
-        options={options}
-        onSuggest={onSuggestAsync}
-        onSearch={onSearch}
+        defaultDataIndex="name"
+        options={options2}
+        onSearch={(value, dataIndex) => {
+          console.log(value, dataIndex)
+        }}
+        suggestions={[{label: '实例名称', children: ['222222']}, '33333333']}
       />
-      <br /><br /><br />
-      搜索类型：（promise调用）<br />
+      <br/><br/>
+
+      <div>搜索条件成组</div>
       <Search
-        simple
-        resourceType="demo"
+        defaultDataIndex="name"
         options={options}
-        onSuggest={onSuggestPromise}
-        onSearch={onSearch} 
-      />
-      <br /><br /><br />
-      搜索类型：（不支持模糊搜索 fuzzyDisable: true）<br />
-      <Search
-        simple
-        options={noFuzzyoptions}
-        onSuggest={onSuggestPromise}
-        onSearch={onSearch} 
+        onSearch={(value, dataIndex, extra) => {
+          //@ts-ignore
+          setFilters([...filters, extra])
+        }}
+        suggestions={[{label: '实例名称', children: ['222222']}, '33333333']}
       />
-      <br /><br /><br />
-      单选类型：<br />
-      <Search
-        simple
-        options={options2}
-        onSearch={onSearch}
-      />
-      <br />
-      单维度单类别,暂不支持多选
-    </div>
-  );
-};
 
-export default Demo1;
+      <div style={{marginTop: 8}}>
+        <SearchFilter
+          dataSource={filters}
+          onChange={(deletedFilter, list)=> {
+            setFilters(list)
+          }}
+        />
+      </div>
+
+      <div style={{marginTop: 8}}>
+        <SearchFilter
+          dataSource={[
+            {label: '实例名称', value: 'xxxxxx', dataIndex: 'name'},
+            {label: '实例名称', value: {tagKey: 'xxxx', tagValue: 'xxxxxx'}, dataIndex: 'name'}
+          ]}
+        />
+      </div>
+    </div>
+   );
+ };
+ 
+ export default Demo1;
+