ywana-core8 0.0.576 → 0.0.577

package/dist/index.cjs

@@ -7376,11 +7376,11 @@ var TablePage2 = function TablePage2(props) {
       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),
@@ -7701,16 +7701,6 @@ var TableQueries$1 = function TableQueries(props) {
 
 
 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);
@@ -7754,10 +7744,13 @@ var TableFilters$1 = function TableFilters(props) {
     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() {
@@ -7826,7 +7819,7 @@ var TableEditor$1 = function TableEditor(props) {
   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();
@@ -7835,7 +7828,7 @@ var TableEditor$1 = function TableEditor(props) {
           }
         }();
 
-        if (_temp5 && _temp5.then) return _temp5.then(function () {});
+        if (_temp7 && _temp7.then) return _temp7.then(function () {});
       });
     } catch (e) {
       return Promise.reject(e);
@@ -7849,7 +7842,8 @@ var TableEditor$1 = function TableEditor(props) {
       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,
@@ -7857,7 +7851,8 @@ var TableEditor$1 = function TableEditor(props) {
       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],
@@ -7869,6 +7864,21 @@ var TableEditor$1 = function TableEditor(props) {
   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;
 
@@ -7880,7 +7890,7 @@ var TableEditor$1 = function TableEditor(props) {
         }
       }();
 
-      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);
     }
@@ -8075,7 +8085,7 @@ var TableContext$1 = function TableContext(url, field, host, urlQuery, params) {
       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];
 
@@ -8099,7 +8109,7 @@ var TableContext$1 = function TableContext(url, field, host, urlQuery, params) {
           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);
       }
@@ -8134,7 +8144,7 @@ var TableContext$1 = function TableContext(url, field, host, urlQuery, params) {
       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 () {});
           });
@@ -8142,7 +8152,7 @@ var TableContext$1 = function TableContext(url, field, host, urlQuery, params) {
           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);
       }
@@ -8151,7 +8161,7 @@ var TableContext$1 = function TableContext(url, field, host, urlQuery, params) {
       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 () {});
           });
@@ -8159,7 +8169,7 @@ var TableContext$1 = function TableContext(url, field, host, urlQuery, params) {
           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);
       }
@@ -8168,7 +8178,7 @@ var TableContext$1 = function TableContext(url, field, host, urlQuery, params) {
       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 () {});
           });
@@ -8176,7 +8186,7 @@ var TableContext$1 = function TableContext(url, field, host, urlQuery, params) {
           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);
       }
@@ -8188,7 +8198,7 @@ var TableContext$1 = function TableContext(url, field, host, urlQuery, params) {
       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;
           });
@@ -8196,7 +8206,7 @@ var TableContext$1 = function TableContext(url, field, host, urlQuery, params) {
           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);
       }
@@ -8205,7 +8215,7 @@ var TableContext$1 = function TableContext(url, field, host, urlQuery, params) {
       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 () {});
           });
@@ -8213,7 +8223,7 @@ var TableContext$1 = function TableContext(url, field, host, urlQuery, params) {
           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);
       }
@@ -8222,7 +8232,7 @@ var TableContext$1 = function TableContext(url, field, host, urlQuery, params) {
       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 () {});
           });
@@ -8230,7 +8240,7 @@ var TableContext$1 = function TableContext(url, field, host, urlQuery, params) {
           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);
       }
@@ -8265,7 +8275,7 @@ var TableAPI$1 = function TableAPI(url, host, params) {
             }, "");
             return query.concat(param);
           } else {
-            return query.concat(key + "=%" + filters[key] + "%&");
+            return query.concat(key + "=" + filters[key] + "&");
           }
         }, "");
         queryParams = queryParams.concat(filterQuery);
@@ -8813,15 +8823,6 @@ var TableQueries = function TableQueries(props) {
 
 
 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 {
@@ -8865,7 +8866,7 @@ var TableFilters = function TableFilters(props) {
     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);
@@ -8873,10 +8874,13 @@ var TableFilters = function TableFilters(props) {
     }, []);
   }, [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() {
@@ -8945,7 +8949,7 @@ var TableEditor = function TableEditor(props) {
   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();
@@ -8954,7 +8958,7 @@ var TableEditor = function TableEditor(props) {
           }
         }();
 
-        if (_temp3 && _temp3.then) return _temp3.then(function () {});
+        if (_temp5 && _temp5.then) return _temp5.then(function () {});
       });
     } catch (e) {
       return Promise.reject(e);
@@ -8968,7 +8972,8 @@ var TableEditor = function TableEditor(props) {
       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,
@@ -8983,6 +8988,22 @@ var TableEditor = function TableEditor(props) {
       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);
   }
@@ -9165,7 +9186,7 @@ var TableContext = function TableContext(url, field, host, urlQuery) {
       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];
 
@@ -9194,7 +9215,7 @@ var TableContext = function TableContext(url, field, host, urlQuery) {
           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);
       }
@@ -9232,7 +9253,7 @@ var TableContext = function TableContext(url, field, host, urlQuery) {
       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 () {});
           });
@@ -9240,7 +9261,7 @@ var TableContext = function TableContext(url, field, host, urlQuery) {
           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);
       }
@@ -9249,7 +9270,7 @@ var TableContext = function TableContext(url, field, host, urlQuery) {
       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 () {});
           });
@@ -9257,7 +9278,7 @@ var TableContext = function TableContext(url, field, host, urlQuery) {
           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);
       }
@@ -9266,7 +9287,7 @@ var TableContext = function TableContext(url, field, host, urlQuery) {
       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 () {});
           });
@@ -9274,7 +9295,7 @@ var TableContext = function TableContext(url, field, host, urlQuery) {
           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);
       }
@@ -9286,7 +9307,7 @@ var TableContext = function TableContext(url, field, host, urlQuery) {
       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;
           });
@@ -9294,7 +9315,7 @@ var TableContext = function TableContext(url, field, host, urlQuery) {
           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);
       }
@@ -9303,7 +9324,7 @@ var TableContext = function TableContext(url, field, host, urlQuery) {
       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 () {});
           });
@@ -9311,7 +9332,7 @@ var TableContext = function TableContext(url, field, host, urlQuery) {
           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);
       }
@@ -9320,7 +9341,7 @@ var TableContext = function TableContext(url, field, host, urlQuery) {
       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 () {});
           });
@@ -9328,7 +9349,7 @@ var TableContext = function TableContext(url, field, host, urlQuery) {
           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);
       }