ywana-core8 0.0.576 → 0.0.577

package/dist/index.umd.js

@@ -7370,11 +7370,11 @@
         children = props.children;
 
     var _useContext = React.useContext(PageContext),
+        pageContext = _useContext[0],
         setPageContext = _useContext[1];
 
     var context = TableContext$1(url, field, host, urlQuery, params);
-    var _pageContext = pageContext,
-        selected = _pageContext.selected;
+    var selected = pageContext.selected;
     var timer = React.useRef(null);
 
     var _useState = React.useState(selected),
@@ -7695,16 +7695,6 @@
 
 
   var TableFilters$1 = function TableFilters(props) {
-    var reload = function reload() {
-      try {
-        return Promise.resolve(pageContext.load(form)).then(function () {
-          setPageContext(Object.assign({}, pageContext));
-        });
-      } catch (e) {
-        return Promise.reject(e);
-      }
-    };
-
     var change = function change(next) {
       try {
         setForm(next);
@@ -7748,10 +7738,13 @@
       return filterSchema;
     }, [schema]);
     React.useEffect(function () {
-      if (filters) setForm(filters);
+      if (filters && !equal__default["default"](filters, form)) setForm(filters);
     }, [filters]);
     React.useEffect(function () {
-      reload();
+      if (pageContext.changeFilters && !equal__default["default"](filters, form)) {
+        pageContext.changeFilters(form);
+        setPageContext(Object.assign({}, pageContext));
+      }
     }, [form]);
 
     function clear() {
@@ -7820,7 +7813,7 @@
     var remove = function remove(id) {
       try {
         return Promise.resolve(site.confirm("Are you sure ?")).then(function (confirm) {
-          var _temp5 = function () {
+          var _temp7 = function () {
             if (confirm) {
               return Promise.resolve(pageContext.remove(id)).then(function () {
                 pageContext.clear();
@@ -7829,7 +7822,7 @@
             }
           }();
 
-          if (_temp5 && _temp5.then) return _temp5.then(function () {});
+          if (_temp7 && _temp7.then) return _temp7.then(function () {});
         });
       } catch (e) {
         return Promise.reject(e);
@@ -7843,7 +7836,8 @@
         setPageContext = _useContext5[1];
 
     var _pageContext$all = pageContext.all,
-        all = _pageContext$all === void 0 ? [] : _pageContext$all;
+        all = _pageContext$all === void 0 ? [] : _pageContext$all,
+        filters = pageContext.filters;
     var icon = props.icon,
         title = props.title,
         schema = props.schema,
@@ -7851,7 +7845,8 @@
         canDelete = props.canDelete,
         filter = props.filter,
         actions = props.actions,
-        className = props.className;
+        className = props.className,
+        tabbedBy = props.tabbedBy;
 
     var _useState4 = React.useState(props.groupBy),
         groupBy = _useState4[0],
@@ -7863,6 +7858,21 @@
     React.useEffect(function () {
       try {
         var _temp4 = function () {
+          if (filters) {
+            return Promise.resolve(pageContext.load(filters)).then(function () {
+              setPageContext(Object.assign({}, pageContext));
+            });
+          }
+        }();
+
+        return Promise.resolve(_temp4 && _temp4.then ? _temp4.then(function () {}) : void 0);
+      } catch (e) {
+        return Promise.reject(e);
+      }
+    }, [filters]);
+    React.useEffect(function () {
+      try {
+        var _temp6 = function () {
           if (tab) {
             var _filter2;
 
@@ -7874,7 +7884,7 @@
           }
         }();
 
-        return Promise.resolve(_temp4 && _temp4.then ? _temp4.then(function () {}) : void 0);
+        return Promise.resolve(_temp6 && _temp6.then ? _temp6.then(function () {}) : void 0);
       } catch (e) {
         return Promise.reject(e);
       }
@@ -8069,7 +8079,7 @@
         try {
           var _this2 = this;
 
-          var _temp7 = _catch$1(function () {
+          var _temp9 = _catch$1(function () {
             var filters = filter ? Object.keys(filter).reduce(function (filters, key) {
               var field = filter[key];
 
@@ -8093,7 +8103,7 @@
             console.log(error);
           });
 
-          return Promise.resolve(_temp7 && _temp7.then ? _temp7.then(function () {}) : void 0);
+          return Promise.resolve(_temp9 && _temp9.then ? _temp9.then(function () {}) : void 0);
         } catch (e) {
           return Promise.reject(e);
         }
@@ -8128,7 +8138,7 @@
         try {
           var _this5 = this;
 
-          var _temp9 = _catch$1(function () {
+          var _temp11 = _catch$1(function () {
             return Promise.resolve(API.create(form)).then(function () {
               return Promise.resolve(_this5.load()).then(function () {});
             });
@@ -8136,7 +8146,7 @@
             console.log(error);
           });
 
-          return Promise.resolve(_temp9 && _temp9.then ? _temp9.then(function () {}) : void 0);
+          return Promise.resolve(_temp11 && _temp11.then ? _temp11.then(function () {}) : void 0);
         } catch (e) {
           return Promise.reject(e);
         }
@@ -8145,7 +8155,7 @@
         try {
           var _this7 = this;
 
-          var _temp11 = _catch$1(function () {
+          var _temp13 = _catch$1(function () {
             return Promise.resolve(API.update(form)).then(function () {
               return Promise.resolve(_this7.load()).then(function () {});
             });
@@ -8153,7 +8163,7 @@
             console.log(error);
           });
 
-          return Promise.resolve(_temp11 && _temp11.then ? _temp11.then(function () {}) : void 0);
+          return Promise.resolve(_temp13 && _temp13.then ? _temp13.then(function () {}) : void 0);
         } catch (e) {
           return Promise.reject(e);
         }
@@ -8162,7 +8172,7 @@
         try {
           var _this9 = this;
 
-          var _temp13 = _catch$1(function () {
+          var _temp15 = _catch$1(function () {
             return Promise.resolve(API.remove(id)).then(function () {
               return Promise.resolve(_this9.load()).then(function () {});
             });
@@ -8170,7 +8180,7 @@
             console.log(error);
           });
 
-          return Promise.resolve(_temp13 && _temp13.then ? _temp13.then(function () {}) : void 0);
+          return Promise.resolve(_temp15 && _temp15.then ? _temp15.then(function () {}) : void 0);
         } catch (e) {
           return Promise.reject(e);
         }
@@ -8182,7 +8192,7 @@
         try {
           var _this11 = this;
 
-          var _temp15 = _catch$1(function () {
+          var _temp17 = _catch$1(function () {
             return Promise.resolve(API.queries(user, urlQuery)).then(function (_API$queries) {
               _this11.queries = _API$queries;
             });
@@ -8190,7 +8200,7 @@
             console.log(error);
           });
 
-          return Promise.resolve(_temp15 && _temp15.then ? _temp15.then(function () {}) : void 0);
+          return Promise.resolve(_temp17 && _temp17.then ? _temp17.then(function () {}) : void 0);
         } catch (e) {
           return Promise.reject(e);
         }
@@ -8199,7 +8209,7 @@
         try {
           var _this13 = this;
 
-          var _temp17 = _catch$1(function () {
+          var _temp19 = _catch$1(function () {
             return Promise.resolve(API.createQuery(query, urlQuery)).then(function () {
               return Promise.resolve(_this13.loadQueries(user)).then(function () {});
             });
@@ -8207,7 +8217,7 @@
             console.log(error);
           });
 
-          return Promise.resolve(_temp17 && _temp17.then ? _temp17.then(function () {}) : void 0);
+          return Promise.resolve(_temp19 && _temp19.then ? _temp19.then(function () {}) : void 0);
         } catch (e) {
           return Promise.reject(e);
         }
@@ -8216,7 +8226,7 @@
         try {
           var _this15 = this;
 
-          var _temp19 = _catch$1(function () {
+          var _temp21 = _catch$1(function () {
             return Promise.resolve(API.removeQuery(id, urlQuery)).then(function () {
               return Promise.resolve(_this15.loadQueries(user)).then(function () {});
             });
@@ -8224,7 +8234,7 @@
             console.log(error);
           });
 
-          return Promise.resolve(_temp19 && _temp19.then ? _temp19.then(function () {}) : void 0);
+          return Promise.resolve(_temp21 && _temp21.then ? _temp21.then(function () {}) : void 0);
         } catch (e) {
           return Promise.reject(e);
         }
@@ -8259,7 +8269,7 @@
               }, "");
               return query.concat(param);
             } else {
-              return query.concat(key + "=%" + filters[key] + "%&");
+              return query.concat(key + "=" + filters[key] + "&");
             }
           }, "");
           queryParams = queryParams.concat(filterQuery);
@@ -8807,15 +8817,6 @@
 
 
   var TableFilters = function TableFilters(props) {
-    var reload = function reload() {
-      try {
-        return Promise.resolve(pageContext.load(form, likes)).then(function () {
-          setPageContext(Object.assign({}, pageContext));
-        });
-      } catch (e) {
-        return Promise.reject(e);
-      }
-    };
 
     var change = function change(next) {
       try {
@@ -8859,7 +8860,7 @@
       delete filterSchema.flows;
       return filterSchema;
     }, [schema]);
-    var likes = React.useMemo(function () {
+    React.useMemo(function () {
       var fields = Object.values(schema);
       return fields.reduce(function (likes, field) {
         if (field.like === true) likes.push(field.id);
@@ -8867,10 +8868,13 @@
       }, []);
     }, [schema]);
     React.useEffect(function () {
-      if (filters) setForm(filters);
+      if (filters && !equal__default["default"](filters, form)) setForm(filters);
     }, [filters]);
     React.useEffect(function () {
-      reload();
+      if (pageContext.changeFilters && !equal__default["default"](filters, form)) {
+        pageContext.changeFilters(form);
+        setPageContext(Object.assign({}, pageContext));
+      }
     }, [form]);
 
     function clear() {
@@ -8939,7 +8943,7 @@
     var remove = function remove(id) {
       try {
         return Promise.resolve(site.confirm("Are you sure ?")).then(function (confirm) {
-          var _temp3 = function () {
+          var _temp5 = function () {
             if (confirm) {
               return Promise.resolve(pageContext.remove(id)).then(function () {
                 pageContext.clear();
@@ -8948,7 +8952,7 @@
             }
           }();
 
-          if (_temp3 && _temp3.then) return _temp3.then(function () {});
+          if (_temp5 && _temp5.then) return _temp5.then(function () {});
         });
       } catch (e) {
         return Promise.reject(e);
@@ -8962,7 +8966,8 @@
         setPageContext = _useContext5[1];
 
     var _pageContext$all = pageContext.all,
-        all = _pageContext$all === void 0 ? [] : _pageContext$all;
+        all = _pageContext$all === void 0 ? [] : _pageContext$all,
+        filters = pageContext.filters;
     var icon = props.icon,
         title = props.title,
         schema = props.schema,
@@ -8977,6 +8982,22 @@
         groupBy = _useState5[0],
         setGroupBy = _useState5[1];
 
+    React.useEffect(function () {
+      try {
+        var _temp4 = function () {
+          if (filters) {
+            return Promise.resolve(pageContext.load(filters)).then(function () {
+              setPageContext(Object.assign({}, pageContext));
+            });
+          }
+        }();
+
+        return Promise.resolve(_temp4 && _temp4.then ? _temp4.then(function () {}) : void 0);
+      } catch (e) {
+        return Promise.reject(e);
+      }
+    }, [filters]);
+
     function changeGroup(id, value) {
       setGroupBy(value);
     }
@@ -9159,7 +9180,7 @@
         try {
           var _this2 = this;
 
-          var _temp5 = _catch(function () {
+          var _temp7 = _catch(function () {
             var filters = filter ? Object.keys(filter).reduce(function (filters, key) {
               var field = filter[key];
 
@@ -9188,7 +9209,7 @@
             console.log(error);
           });
 
-          return Promise.resolve(_temp5 && _temp5.then ? _temp5.then(function () {}) : void 0);
+          return Promise.resolve(_temp7 && _temp7.then ? _temp7.then(function () {}) : void 0);
         } catch (e) {
           return Promise.reject(e);
         }
@@ -9226,7 +9247,7 @@
         try {
           var _this5 = this;
 
-          var _temp7 = _catch(function () {
+          var _temp9 = _catch(function () {
             return Promise.resolve(API.create(form)).then(function () {
               return Promise.resolve(_this5.load({}, [])).then(function () {});
             });
@@ -9234,7 +9255,7 @@
             console.log(error);
           });
 
-          return Promise.resolve(_temp7 && _temp7.then ? _temp7.then(function () {}) : void 0);
+          return Promise.resolve(_temp9 && _temp9.then ? _temp9.then(function () {}) : void 0);
         } catch (e) {
           return Promise.reject(e);
         }
@@ -9243,7 +9264,7 @@
         try {
           var _this7 = this;
 
-          var _temp9 = _catch(function () {
+          var _temp11 = _catch(function () {
             return Promise.resolve(API.update(form)).then(function () {
               return Promise.resolve(_this7.load()).then(function () {});
             });
@@ -9251,7 +9272,7 @@
             console.log(error);
           });
 
-          return Promise.resolve(_temp9 && _temp9.then ? _temp9.then(function () {}) : void 0);
+          return Promise.resolve(_temp11 && _temp11.then ? _temp11.then(function () {}) : void 0);
         } catch (e) {
           return Promise.reject(e);
         }
@@ -9260,7 +9281,7 @@
         try {
           var _this9 = this;
 
-          var _temp11 = _catch(function () {
+          var _temp13 = _catch(function () {
             return Promise.resolve(API.remove(id)).then(function () {
               return Promise.resolve(_this9.load()).then(function () {});
             });
@@ -9268,7 +9289,7 @@
             console.log(error);
           });
 
-          return Promise.resolve(_temp11 && _temp11.then ? _temp11.then(function () {}) : void 0);
+          return Promise.resolve(_temp13 && _temp13.then ? _temp13.then(function () {}) : void 0);
         } catch (e) {
           return Promise.reject(e);
         }
@@ -9280,7 +9301,7 @@
         try {
           var _this11 = this;
 
-          var _temp13 = _catch(function () {
+          var _temp15 = _catch(function () {
             return Promise.resolve(API.queries(user, urlQuery)).then(function (_API$queries) {
               _this11.queries = _API$queries;
             });
@@ -9288,7 +9309,7 @@
             console.log(error);
           });
 
-          return Promise.resolve(_temp13 && _temp13.then ? _temp13.then(function () {}) : void 0);
+          return Promise.resolve(_temp15 && _temp15.then ? _temp15.then(function () {}) : void 0);
         } catch (e) {
           return Promise.reject(e);
         }
@@ -9297,7 +9318,7 @@
         try {
           var _this13 = this;
 
-          var _temp15 = _catch(function () {
+          var _temp17 = _catch(function () {
             return Promise.resolve(API.createQuery(query, urlQuery)).then(function () {
               return Promise.resolve(_this13.loadQueries(user)).then(function () {});
             });
@@ -9305,7 +9326,7 @@
             console.log(error);
           });
 
-          return Promise.resolve(_temp15 && _temp15.then ? _temp15.then(function () {}) : void 0);
+          return Promise.resolve(_temp17 && _temp17.then ? _temp17.then(function () {}) : void 0);
         } catch (e) {
           return Promise.reject(e);
         }
@@ -9314,7 +9335,7 @@
         try {
           var _this15 = this;
 
-          var _temp17 = _catch(function () {
+          var _temp19 = _catch(function () {
             return Promise.resolve(API.removeQuery(id, urlQuery)).then(function () {
               return Promise.resolve(_this15.loadQueries(user)).then(function () {});
             });
@@ -9322,7 +9343,7 @@
             console.log(error);
           });
 
-          return Promise.resolve(_temp17 && _temp17.then ? _temp17.then(function () {}) : void 0);
+          return Promise.resolve(_temp19 && _temp19.then ? _temp19.then(function () {}) : void 0);
         } catch (e) {
           return Promise.reject(e);
         }