ywana-core8 0.0.534 → 0.0.537

package/db/db.json

@@ -1,13 +1,13 @@
 {
   "references": [
     {
+      "id": 1,
       "name": "111111",
       "state": "NOT_CLASSIFIED",
-      "field1": "111111",
+      "field1": "1111114444",
       "field2": "111111",
       "field4": "#ce1212",
-      "field5": {},
-      "id": 1
+      "field5": {}
     },
     {
       "name": "2222",

package/dist/index.cjs

@@ -4924,6 +4924,7 @@ var CollectionPage = function CollectionPage(props) {
       canFilter = _props$canFilter === void 0 ? false : _props$canFilter,
       _props$canAdd = props.canAdd,
       canAdd = _props$canAdd === void 0 ? false : _props$canAdd,
+      searchBy = props.searchBy,
       _props$autosave = props.autosave,
       autosave = _props$autosave === void 0 ? false : _props$autosave,
       _props$delay = props.delay,
@@ -5001,10 +5002,12 @@ var CollectionPage = function CollectionPage(props) {
     icon: icon,
     levels: levels,
     onSelect: onSelect,
-    sorter: sorter
+    sorter: sorter,
+    searchBy: searchBy
   }) : /*#__PURE__*/React__default["default"].createElement(CollectionList, {
     groupBy: groupBy,
-    onSelect: onSelect
+    onSelect: onSelect,
+    searchBy: searchBy
   })), /*#__PURE__*/React__default["default"].createElement("main", {
     key: id,
     className: "collection-page " + className
@@ -5094,7 +5097,9 @@ var CollectionList = function CollectionList(props) {
   };
 
   var groupBy = props.groupBy,
-      onSelect = props.onSelect;
+      onSelect = props.onSelect,
+      _props$searchBy = props.searchBy,
+      searchBy = _props$searchBy === void 0 ? [] : _props$searchBy;
 
   var _useContext2 = React.useContext(PageContext),
       pageContext = _useContext2[0],
@@ -5103,12 +5108,32 @@ var CollectionList = function CollectionList(props) {
   var _pageContext$all = pageContext.all,
       all = _pageContext$all === void 0 ? [] : _pageContext$all;
 
+  var _useState2 = React.useState(),
+      filter = _useState2[0],
+      setFilter = _useState2[1];
+
   function clear() {
     pageContext.clear();
     setPageContext(Object.assign({}, pageContext));
   }
 
-  var items = all ? all.map(function (content) {
+  function changeSearch(id, value) {
+    setFilter(value);
+  }
+
+  function search() {
+    var items = filter ? all.filter(function (item) {
+      var result = searchBy.some(function (fieldName) {
+        var value = item[fieldName];
+        return value ? value.indexOf(filter.toUpperCase()) >= 0 : false;
+      });
+      return result;
+    }) : all;
+    return items;
+  }
+
+  var items = search();
+  var items2 = items.map(function (content) {
     return {
       id: content.id,
       line1: content.name || content.centre || content.tag,
@@ -5116,12 +5141,20 @@ var CollectionList = function CollectionList(props) {
       line2: content.description,
       content: content
     };
-  }) : [];
-  return /*#__PURE__*/React__default["default"].createElement(List, {
-    items: items,
+  });
+  return /*#__PURE__*/React__default["default"].createElement(React.Fragment, null, /*#__PURE__*/React__default["default"].createElement("main", null, /*#__PURE__*/React__default["default"].createElement(List, {
+    items: items2,
     onSelect: select,
     groupBy: groupBy
-  });
+  })), /*#__PURE__*/React__default["default"].createElement("footer", null, /*#__PURE__*/React__default["default"].createElement("div", {
+    className: "search-box"
+  }, /*#__PURE__*/React__default["default"].createElement(TextField, {
+    icon: "search",
+    label: "Search",
+    onChange: changeSearch,
+    outlined: true,
+    className: "search-box"
+  }))));
 };
 /**
  * Collection Tree
@@ -5145,7 +5178,9 @@ var CollectionTree = function CollectionTree(props) {
       icon = _props$icon === void 0 ? "description" : _props$icon,
       levels = props.levels,
       onSelect = props.onSelect,
-      sorter = props.sorter;
+      sorter = props.sorter,
+      _props$searchBy2 = props.searchBy,
+      searchBy = _props$searchBy2 === void 0 ? [] : _props$searchBy2;
 
   var _useContext3 = React.useContext(PageContext),
       pageContext = _useContext3[0],
@@ -5154,16 +5189,16 @@ var CollectionTree = function CollectionTree(props) {
   var _pageContext$all2 = pageContext.all,
       all = _pageContext$all2 === void 0 ? [] : _pageContext$all2;
 
-  var _useState2 = React.useState(),
-      filter = _useState2[0],
-      setFilter = _useState2[1];
+  var _useState3 = React.useState(),
+      filter = _useState3[0],
+      setFilter = _useState3[1];
 
   function clear() {
     pageContext.clear();
     setPageContext(Object.assign({}, pageContext));
   }
 
-  function search(id, value) {
+  function changeSearch(id, value) {
     setFilter(value);
   }
 
@@ -5217,17 +5252,26 @@ var CollectionTree = function CollectionTree(props) {
     });
   }
 
-  var items = sorter ? sorter(all) : all;
-  var items2 = filter ? items.filter(function (item) {
-    return item.name.toUpperCase().indexOf(filter.toUpperCase()) >= 0;
-  }) : items;
+  function search() {
+    var items = filter ? all.filter(function (item) {
+      var result = searchBy.some(function (fieldName) {
+        var value = item[fieldName];
+        return value ? value.indexOf(filter.toUpperCase()) >= 0 : false;
+      });
+      return result;
+    }) : all;
+    return items;
+  }
+
+  var items = search();
+  var items2 = sorter ? sorter(items) : items;
   var nodes = generateNodes(levels, items2);
   return /*#__PURE__*/React__default["default"].createElement(React.Fragment, null, /*#__PURE__*/React__default["default"].createElement("main", null, /*#__PURE__*/React__default["default"].createElement(Tree, null, renderNodes(nodes))), /*#__PURE__*/React__default["default"].createElement("footer", null, /*#__PURE__*/React__default["default"].createElement("div", {
     className: "search-box"
   }, /*#__PURE__*/React__default["default"].createElement(TextField, {
     icon: "search",
     label: "Search",
-    onChange: search,
+    onChange: changeSearch,
     outlined: true,
     className: "search-box"
   }))));
@@ -5273,9 +5317,9 @@ var CollectionEditor = function CollectionEditor(props) {
       delay = _props$delay2 === void 0 ? 1000 : _props$delay2;
   var timer = React.useRef(null);
 
-  var _useState3 = React.useState(selected),
-      form = _useState3[0],
-      setForm = _useState3[1];
+  var _useState4 = React.useState(selected),
+      form = _useState4[0],
+      setForm = _useState4[1];
 
   React.useEffect(function () {
     setForm(selected);