react-hook-core 0.1.7 → 0.1.10

package/lib/components.js

@@ -398,16 +398,20 @@ var BaseSearchComponent = (function (_super) {
     this.initFields = true;
     return fs;
   };
-  BaseSearchComponent.prototype.clearQ = function () {
-    var m = this.state.model;
-    if (m) {
-      m.q = '';
-      this.setState({ model: m });
+  BaseSearchComponent.prototype.clearQ = function (e) {
+    if (e) {
+      e.preventDefault();
     }
-    else {
-      this.setState({
-        q: ''
-      });
+    var n = this.getModelName();
+    if (n && n.length > 0) {
+      var m = this.state[n];
+      if (m) {
+        m.q = '';
+        var setObj = {};
+        setObj[n] = m;
+        this.setState(setObj);
+        return;
+      }
     }
   };
   BaseSearchComponent.prototype.search = function (event) {

package/lib/reflect.js

@@ -116,7 +116,9 @@ function diff(obj1, obj2) {
   return fields;
 }
 exports.diff = diff;
-function makeDiff(obj1, obj2, keys, version) {
+function makeDiff(o1, o2, keys, version) {
+  var obj1 = o1;
+  var obj2 = o2;
   var obj3 = {};
   var s = diff(obj1, obj2);
   if (s.length === 0) {

package/lib/state.js

@@ -120,6 +120,14 @@ function buildState(e, state, ctrl, modelName, tloc) {
         return objSet;
       }
       else {
+        if (ctrl.tagName === 'SELECT') {
+          if (ctrl.value === '' || !ctrl.value) {
+            ctrl.removeAttribute('data-value');
+          }
+          else {
+            ctrl.setAttribute('data-value', 'data-value');
+          }
+        }
         var data = util_1.valueOf(ctrl, tloc, e.type);
         if (data.mustChange) {
           if (field.indexOf('.') < 0 && field.indexOf('[') < 0) {

package/lib/useEdit.js

@@ -30,7 +30,7 @@ exports.useEdit = function (refForm, initialState, service, p2, p) {
     }
     var n = baseProps.getModelName(refForm.current);
     var obj = {};
-    obj[n] = baseProps.createNewModel();
+    obj[n] = baseProps.createModel();
     baseProps.setState(obj);
     var keys;
     if (p && !p.keys && service && service.metadata) {
@@ -63,7 +63,7 @@ exports.useEditProps = function (props, refForm, initialState, service, p2, p) {
     }
     var n = baseProps.getModelName(refForm.current);
     var obj = {};
-    obj[n] = baseProps.createNewModel();
+    obj[n] = baseProps.createModel();
     baseProps.setState(obj);
     var keys;
     if (p && !p.keys && service && service.metadata) {
@@ -415,7 +415,10 @@ exports.useCoreEdit = function (refForm, initialState, service, p1, p, props) {
     getModelName: getModelName,
     resetState: resetState,
     handleNotFound: handleNotFound,
-    getModel: getModel, createNewModel: createModel, newOnClick: create, save: save,
+    getModel: getModel,
+    createModel: createModel,
+    create: create,
+    save: save,
     onSave: onSave,
     confirm: confirm,
     validate: validate, showMessage: p1.showMessage, succeed: succeed,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-hook-core",
-  "version": "0.1.7",
+  "version": "0.1.10",
   "description": "react",
   "main": "./lib/index.js",
   "types": "./src/index.ts",

package/src/com.ts

@@ -26,7 +26,7 @@ export interface Props {
   pageSizeChanged?: (event: any) => void;
   search?: React.MouseEventHandler<HTMLElement>;
   toggle?: React.MouseEventHandler<HTMLElement>;
-  clear?: React.MouseEventHandler<HTMLElement>;
+  clear?: React.MouseEventHandler<HTMLButtonElement>;
   onChange?: (e: any, callback?: (() => void) | undefined, lc?: Locale | undefined) => void;
 }
 export function Search(p: Props) {

package/src/components.ts

@@ -443,18 +443,23 @@ export class BaseSearchComponent<T, F extends Filter, P, I extends SearchState<T
     this.setState(prevState => ({ isPageSizeOpenDropDown: !(prevState as any).isPageSizeOpenDropDown } as any));
   }
 
-  clearQ(): void {
-    const m = this.state.model;
-    if (m) {
-      m.q = '';
-      this.setState({model: m});
-    } else {
-      this.setState({
-        q: ''
-      });
+  clearQ(e?: React.MouseEvent<HTMLButtonElement, MouseEvent>): void {
+    if (e) {
+      e.preventDefault();
+    }
+    const n = this.getModelName();
+    if (n && n.length > 0) {
+      const m = (this.state as any)[n];
+      if (m) {
+        m.q = '';
+        const setObj: any = {};
+        setObj[n] = m;
+        this.setState(setObj);
+        return;
+      }
     }
   }
-  search(event: any): void {
+  search(event: React.MouseEvent<HTMLButtonElement, MouseEvent>): void {
     if (event) {
       event.preventDefault();
       if (!this.getSearchForm()) {
@@ -806,7 +811,7 @@ export abstract class BaseEditComponent<T, P, S> extends BaseComponent<P, S> {
     }
   }
 
-  create = (event: any) => {
+  create = (event: React.MouseEvent<HTMLButtonElement, MouseEvent>) => {
     if (event) {
       event.preventDefault();
     }
@@ -823,9 +828,9 @@ export abstract class BaseEditComponent<T, P, S> extends BaseComponent<P, S> {
       }, 100);
     }
   }
-  save = (event: any) => {
+  save = (event: React.MouseEvent<HTMLButtonElement, MouseEvent>) => {
     event.preventDefault();
-    (event as any).persist();
+    event.persist();
     if (!this.form && event && event.target) {
       this.form = (event.target as HTMLInputElement).form;
     }
@@ -856,7 +861,7 @@ export abstract class BaseEditComponent<T, P, S> extends BaseComponent<P, S> {
         });
       } else {
         const diffObj = makeDiff(initPropertyNullInModel(this.orginalModel, this.metadata), obj, this.keys, this.version);
-        const keys = Object.keys(diffObj);
+        const keys = Object.keys(diffObj as any);
         if (keys.length === 0) {
           this.showMessage(r.value('msg_no_change'));
         } else {
@@ -881,7 +886,7 @@ export abstract class BaseEditComponent<T, P, S> extends BaseComponent<P, S> {
     }
   }
 
-  doSave(obj: T, dif?: T, isBack?: boolean) {
+  doSave(obj: T, dif?: Partial<T>, isBack?: boolean) {
   }
 
   succeed(msg: string, isBack?: boolean, result?: ResultInfo<T>) {
@@ -1053,12 +1058,12 @@ export class EditComponent<T, ID, P, S> extends BaseEditComponent<T, P, S>  {
       }
     }
   }
-  doSave(obj: T, body?: T, isBack?: boolean) {
+  doSave(obj: T, body?: Partial<T>, isBack?: boolean) {
     this.running = true;
     showLoading(this.loading);
     const isBackO = (isBack == null || isBack === undefined ? this.backOnSuccess : isBack);
     const com = this;
-    let m = obj;
+    let m: T|Partial<T> = obj;
     let fn = this.newMode ? this.service.insert : this.service.update;
     if (!this.newMode) {
       if (this.patchable === true && this.service.patch && body && Object.keys(body).length > 0) {
@@ -1066,7 +1071,7 @@ export class EditComponent<T, ID, P, S> extends BaseEditComponent<T, P, S>  {
         fn = this.service.patch;
       }
     }
-    fn(m).then(result => {
+    fn(m as any).then(result => {
       com.postSave(result, isBackO);
       com.running = false;
       hideLoading(com.loading);

package/src/edit.ts

@@ -17,7 +17,7 @@ export interface EditParameter {
   status?: EditStatusConfig;
 }
 export interface GenericService<T, ID, R> extends ViewService<T, ID> {
-  patch?(obj: T, ctx?: any): Promise<R>;
+  patch?(obj: Partial<T>, ctx?: any): Promise<R>;
   insert(obj: T, ctx?: any): Promise<R>;
   update(obj: T, ctx?: any): Promise<R>;
   delete?(id: ID, ctx?: any): Promise<number>;

package/src/reflect.ts

@@ -105,7 +105,9 @@ export function diff(obj1: any, obj2: any): string[] {
   return fields;
 }
 
-export function makeDiff(obj1: any, obj2: any, keys?: string[], version?: string): any {
+export function makeDiff<T>(o1: T, o2: T, keys?: string[], version?: string): Partial<T> {
+  const obj1: any = o1;
+  const obj2: any = o2;
   const obj3: any = {};
   const s = diff(obj1, obj2);
   if (s.length === 0) {

package/src/state.ts

@@ -100,6 +100,13 @@ export function buildState<S, K extends keyof S>(e: any, state: Readonly<S>, ctr
         objSet[modelName] = model;
         return objSet;
       } else {
+        if (ctrl.tagName === 'SELECT') {
+          if (ctrl.value === '' || !ctrl.value) {
+            ctrl.removeAttribute('data-value');
+          } else {
+            ctrl.setAttribute('data-value', 'data-value');
+          }
+        }
         const data = valueOf(ctrl, tloc, e.type);
         if (data.mustChange) {
           if (field.indexOf('.') < 0 && field.indexOf('[') < 0) {

package/src/useEdit.ts

@@ -80,7 +80,7 @@ export const useEdit = <T, ID, S>(
     }
     const n = baseProps.getModelName(refForm.current);
     const obj: any = {};
-    obj[n] = baseProps.createNewModel();
+    obj[n] = baseProps.createModel();
     baseProps.setState(obj);
     let keys: string[]|undefined;
     if (p && !p.keys && service && service.metadata) {
@@ -120,7 +120,7 @@ export const useEditProps = <T, ID, S, P>(
     }
     const n = baseProps.getModelName(refForm.current);
     const obj: any = {};
-    obj[n] = baseProps.createNewModel();
+    obj[n] = baseProps.createModel();
     baseProps.setState(obj);
     let keys: string[]|undefined;
     if (p && !p.keys && service && service.metadata) {
@@ -288,7 +288,7 @@ export const useCoreEdit = <T, ID, S, P>(
           validate(obj, () => {
             const msg = message(p1.resource.value, 'msg_confirm_save', 'confirm', 'yes', 'no');
             p1.confirm(msg.message, msg.title, () => {
-              doSave(obj, diffObj, version, isBack);
+              doSave(obj, diffObj as any, version, isBack);
             }, msg.no, msg.yes);
           });
         }
@@ -403,7 +403,7 @@ export const useCoreEdit = <T, ID, S, P>(
   };
   const handleDuplicateKey = (p && p.handleDuplicateKey ? p.handleDuplicateKey : _handleDuplicateKey);
 
-  const _doSave = (obj: T, body?: T, version?: string, isBack?: boolean) => {
+  const _doSave = (obj: T, body?: Partial<T>, version?: string, isBack?: boolean) => {
     setRunning(true);
     showLoading(p1.loading);
     const isBackO = (isBack == null || isBack === undefined ? true : isBack);
@@ -483,8 +483,8 @@ export const useCoreEdit = <T, ID, S, P>(
     resetState,
     handleNotFound,
     getModel,
-    createNewModel: createModel,
-    newOnClick: create,
+    createModel,
+    create,
     save,
     onSave,
     // eslint-disable-next-line no-restricted-globals