react-hook-core 0.0.1 → 0.1.3

package/lib/useEdit.js

@@ -10,42 +10,6 @@ var __assign = (this && this.__assign) || function () {
   };
   return __assign.apply(this, arguments);
 };
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-  function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-  return new (P || (P = Promise))(function (resolve, reject) {
-    function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-    function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-    function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-    step((generator = generator.apply(thisArg, _arguments || [])).next());
-  });
-};
-var __generator = (this && this.__generator) || function (thisArg, body) {
-  var _ = { label: 0, sent: function () { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g;
-  return g = { next: verb(0), "throw": verb(1), "return": verb(2) }, typeof Symbol === "function" && (g[Symbol.iterator] = function () { return this; }), g;
-  function verb(n) { return function (v) { return step([n, v]); }; }
-  function step(op) {
-    if (f) throw new TypeError("Generator is already executing.");
-    while (_) try {
-      if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
-      if (y = 0, t) op = [op[0] & 2, t.value];
-      switch (op[0]) {
-        case 0: case 1: t = op; break;
-        case 4: _.label++; return { value: op[1], done: false };
-        case 5: _.label++; y = op[1]; op = [0]; continue;
-        case 7: op = _.ops.pop(); _.trys.pop(); continue;
-        default:
-          if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; }
-          if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; }
-          if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; }
-          if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; }
-          if (t[2]) _.ops.pop();
-          _.trys.pop(); continue;
-      }
-      op = body.call(thisArg, _);
-    } catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; }
-    if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
-  }
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 var react_1 = require("react");
 var reflectx_1 = require("reflectx");
@@ -54,135 +18,53 @@ var edit_1 = require("./edit");
 var formutil_1 = require("./formutil");
 var merge_1 = require("./merge");
 var router_1 = require("./router");
+var state_1 = require("./state");
 var update_1 = require("./update");
 function prepareData(data) {
 }
-exports.useBaseEdit = function (refForm, initialState, service, p1, p2) {
-  return exports.useBaseEditWithProps(null, refForm, initialState, service, p1, p2);
-};
-exports.useBaseEditWithProps = function (props, refForm, initialState, service, p1, p2, p3) {
-  var p4 = (p2 ? p2 : {});
-  var p = {
-    props: props,
-    refForm: refForm,
-    initialState: initialState,
-    service: service,
-    status: p1.status,
-    resourceService: p1.resource,
-    showMessage: p1.showMessage,
-    showError: p1.showError,
-    confirm: p1.confirm,
-    ui: p1.ui,
-    getLocale: p1.getLocale,
-    loading: p1.loading,
-    backOnSuccess: p4.backOnSuccess,
-    metadata: p4.metadata,
-    keys: p4.keys,
-    version: p4.version,
-    setBack: p4.setBack,
-    patchable: p4.patchable,
-    addable: p4.addable,
-    readOnly: p4.readOnly,
-    handleNotFound: p4.handleNotFound,
-    getModelName: p4.getModelName,
-    getModel: p4.getModel,
-    showModel: p4.showModel,
-    createModel: p4.createModel,
-    onSave: p4.onSave,
-    validate: p4.validate,
-    succeed: p4.succeed,
-    fail: p4.fail,
-    postSave: p4.postSave,
-    handleDuplicateKey: p4.handleDuplicateKey,
-    load: p4.load,
-    save: p4.save
-  };
-  var per = (p3 ? p3 : p2);
-  if (per) {
-    p.addable = per.addable;
-    p.readOnly = per.readOnly;
-    p.deletable = per.deletable;
-  }
-  return exports.useBaseEditOneWithProps(p);
+exports.useEdit = function (refForm, initialState, service, p1, p2) {
+  return exports.useCoreEdit(undefined, refForm, initialState, service, p1, p2);
 };
-exports.useEdit = function (props, refForm, initialState, service, p1, p2, p3) {
-  var p4 = (p1 ? p1 : {});
-  var p = {
-    props: props,
-    refForm: refForm,
-    initialize: p4.initialize,
-    callback: p4.callback,
-    initialState: initialState,
-    service: service,
-    status: p2.status,
-    resourceService: p2.resource,
-    showMessage: p2.showMessage,
-    showError: p2.showError,
-    confirm: p2.confirm,
-    ui: p2.ui,
-    getLocale: p2.getLocale,
-    loading: p2.loading,
-    backOnSuccess: p4.backOnSuccess,
-    metadata: p4.metadata,
-    keys: p4.keys,
-    version: p4.version,
-    setBack: p4.setBack,
-    patchable: p4.patchable,
-    addable: p4.addable,
-    readOnly: p4.readOnly,
-    handleNotFound: p4.handleNotFound,
-    getModelName: p4.getModelName,
-    getModel: p4.getModel,
-    showModel: p4.showModel,
-    createModel: p4.createModel,
-    onSave: p4.onSave,
-    validate: p4.validate,
-    succeed: p4.succeed,
-    fail: p4.fail,
-    postSave: p4.postSave,
-    handleDuplicateKey: p4.handleDuplicateKey,
-    load: p4.load,
-    save: p4.save
-  };
-  var per = (p3 ? p3 : p1);
-  if (per) {
-    p.addable = per.addable;
-    p.readOnly = per.readOnly;
-    p.deletable = per.deletable;
-  }
-  return exports.useEditOne(p);
-};
-exports.useEditOne = function (p) {
-  var baseProps = exports.useBaseEditOneWithProps(p);
+exports.useEditProps = function (props, refForm, initialState, service, p2, p) {
+  var baseProps = exports.useCoreEdit(props, refForm, initialState, service, p2, p);
   react_1.useEffect(function () {
-    if (baseProps.refForm) {
-      var registerEvents = (baseProps.ui ? baseProps.ui.registerEvents : null);
+    if (refForm) {
+      var registerEvents = (p2.ui ? p2.ui.registerEvents : undefined);
       core_1.initForm(baseProps.refForm.current, registerEvents);
     }
-    var n = baseProps.getModelName(p.refForm.current);
+    var n = baseProps.getModelName(refForm.current);
     var obj = {};
     obj[n] = baseProps.createNewModel();
     baseProps.setState(obj);
-    if (!p.keys && p.service && p.service.metadata) {
-      var metadata = (p.metadata ? p.metadata : p.service.metadata());
+    var keys;
+    if (p && !p.keys && service && service.metadata) {
+      var metadata = (p.metadata ? p.metadata : service.metadata());
       var meta = edit_1.build(metadata);
-      var keys = (p.keys ? p.keys : (meta ? meta.keys : null));
-      var version = (p.version ? p.version : (meta ? meta.version : null));
+      keys = (p.keys ? p.keys : (meta ? meta.keys : undefined));
+      var version = (p.version ? p.version : (meta ? meta.version : undefined));
       p.keys = keys;
       p.version = version;
     }
-    var id = core_1.buildId(p.props, p.keys);
-    if (p && p.initialize) {
-      p.initialize(id, baseProps.load, baseProps.setState, p.callback);
-    }
-    else {
-      baseProps.load(id, p.callback);
+    var id = core_1.buildId(props, keys);
+    if (id) {
+      if (p && p.initialize) {
+        p.initialize(id, baseProps.load, baseProps.setState, p.callback);
+      }
+      else {
+        baseProps.load(id, p ? p.callback : undefined);
+      }
     }
   }, []);
   return __assign({}, baseProps);
 };
-exports.useBaseEditOneWithProps = function (p) {
-  var _a = p.backOnSuccess, backOnSuccess = _a === void 0 ? true : _a, _b = p.patchable, patchable = _b === void 0 ? true : _b, _c = p.addable, addable = _c === void 0 ? true : _c;
+exports.useEditOneProps = function (p) {
+  return exports.useEditProps(p.props, p.refForm, p.initialState, p.service, p, p);
+};
+exports.useEditOne = function (p) {
+  return exports.useEdit(p.refForm, p.initialState, p.service, p, p);
+};
+exports.useCoreEdit = function (props, refForm, initialState, service, p1, p) {
+  var addable = (p && p.patchable !== false ? true : undefined);
   var goBack = router_1.useRouter().goBack;
   var back = function (event) {
     if (event) {
@@ -190,42 +72,42 @@ exports.useBaseEditOneWithProps = function (p) {
     }
     goBack();
   };
-  var _d = react_1.useState(undefined), running = _d[0], setRunning = _d[1];
-  var baseProps = update_1.useUpdate(p.initialState, p.getLocale);
+  var _a = react_1.useState(), running = _a[0], setRunning = _a[1];
   var getModelName = function (f) {
-    if (p.name && p.name.length > 0) {
+    if (p && p.name && p.name.length > 0) {
       return p.name;
     }
     return core_1.getModelName(f);
   };
-  var prepareCustomData = (p.prepareCustomData ? p.prepareCustomData : prepareData);
+  var baseProps = update_1.useUpdate(initialState, getModelName, p1.getLocale);
+  var prepareCustomData = (p && p.prepareCustomData ? p.prepareCustomData : prepareData);
   var updateDateState = function (name, value) {
     var _a, _b, _c, _d, _e;
-    var modelName = getModelName(p.refForm.current);
+    var modelName = getModelName(refForm.current);
     var currentState = state[modelName];
-    if (p.props && p.props.setGlobalState) {
-      var data = p.props.shouldBeCustomized ? prepareCustomData((_a = {}, _a[name] = value, _a)) : (_b = {}, _b[name] = value, _b);
-      p.props.setGlobalState((_c = {}, _c[modelName] = __assign(__assign({}, currentState), data), _c));
+    if (props && props.setGlobalState) {
+      var data = props.shouldBeCustomized ? prepareCustomData((_a = {}, _a[name] = value, _a)) : (_b = {}, _b[name] = value, _b);
+      props.setGlobalState((_c = {}, _c[modelName] = __assign(__assign({}, currentState), data), _c));
     }
     else {
       setState((_d = {}, _d[modelName] = __assign(__assign({}, currentState), (_e = {}, _e[name] = value, _e)), _d));
     }
   };
   var state = baseProps.state, setState = baseProps.setState;
-  var _e = merge_1.useMergeState({
+  var _b = merge_1.useMergeState({
     newMode: false,
     setBack: false,
     addable: addable,
-    readOnly: formutil_1.readOnly,
+    readOnly: p ? p.readOnly : undefined,
     originalModel: undefined
-  }), flag = _e[0], setFlag = _e[1];
+  }), flag = _b[0], setFlag = _b[1];
   var showModel = function (model) {
-    var n = getModelName(p.refForm.current);
+    var n = getModelName(refForm.current);
     var objSet = {};
     objSet[n] = model;
     setState(objSet);
-    if (p.readOnly) {
-      var f = p.refForm.current;
+    if (p && p.readOnly) {
+      var f = refForm.current;
       formutil_1.readOnly(f);
     }
   };
@@ -234,25 +116,25 @@ exports.useBaseEditOneWithProps = function (p) {
     showModel(model);
   };
   var _handleNotFound = function (form) {
-    var msg = core_1.message(p.resourceService.value, 'error_not_found', 'error');
+    var msg = core_1.message(p1.resource.value, 'error_not_found', 'error');
     if (form) {
       formutil_1.readOnly(form);
     }
-    p.showError(msg.message, msg.title);
+    p1.showError(msg.message, msg.title);
   };
-  var handleNotFound = (p.handleNotFound ? p.handleNotFound : _handleNotFound);
+  var handleNotFound = (p && p.handleNotFound ? p.handleNotFound : _handleNotFound);
   var _getModel = function () {
-    var n = getModelName(p.refForm.current);
-    if (p.props) {
-      return p.props[n] || state[n];
+    var n = getModelName(refForm.current);
+    if (props) {
+      return props[n] || state[n];
     }
     else {
       return state[n];
     }
   };
-  var getModel = (p.getModel ? p.getModel : _getModel);
+  var getModel = (p && p.getModel ? p.getModel : _getModel);
   var _createModel = function () {
-    var metadata = (p.metadata ? p.metadata : p.service.metadata());
+    var metadata = (p && p.metadata ? p.metadata : (service.metadata ? service.metadata() : undefined));
     if (metadata) {
       var obj = edit_1.createModel(metadata);
       return obj;
@@ -262,26 +144,27 @@ exports.useBaseEditOneWithProps = function (p) {
       return obj;
     }
   };
-  var createModel = (p.createModel ? p.createModel : _createModel);
-  var newOnClick = function (event) {
+  var createModel = (p && p.createModel ? p.createModel : _createModel);
+  var create = function (event) {
     event.preventDefault();
     var obj = createModel();
-    resetState(true, obj, null);
-    if (p.ui) {
+    resetState(true, obj, undefined);
+    var u = p1.ui;
+    if (u) {
       setTimeout(function () {
-        p.ui.removeFormError(p.refForm.current);
+        u.removeFormError(refForm.current);
       }, 100);
     }
   };
   var _onSave = function (isBack) {
     if (flag.newMode === true && flag.addable === false) {
-      var m = core_1.message(p.resourceService.value, 'error_permission_add', 'error_permission');
-      p.showError(m.message, m.title);
+      var m = core_1.message(p1.resource.value, 'error_permission_add', 'error_permission');
+      p1.showError(m.message, m.title);
       return;
     }
-    else if (flag.newMode === false && p.readOnly) {
-      var msg = core_1.message(p.resourceService.value, 'error_permission_edit', 'error_permission');
-      p.showError(msg.message, msg.title);
+    else if (p && flag.newMode === false && p.readOnly) {
+      var msg = core_1.message(p1.resource.value, 'error_permission_edit', 'error_permission');
+      p1.showError(msg.message, msg.title);
       return;
     }
     else {
@@ -289,48 +172,48 @@ exports.useBaseEditOneWithProps = function (p) {
         return;
       }
       var obj_1 = getModel();
-      var metadata = (p.metadata ? p.metadata : p.service.metadata());
-      if ((!p.keys || !p.version) && p.service && p.service.metadata) {
+      var metadata = (p && p.metadata ? p.metadata : (service.metadata ? service.metadata() : undefined));
+      var keys = void 0;
+      var version_1;
+      if (p && metadata && (!p.keys || !p.version)) {
         var meta = edit_1.build(metadata);
-        var keys = (p.keys ? p.keys : (meta ? meta.keys : null));
-        var version = (p.version ? p.version : (meta ? meta.version : null));
-        p.keys = keys;
-        p.version = version;
+        keys = (p.keys ? p.keys : (meta ? meta.keys : undefined));
+        version_1 = (p.version ? p.version : (meta ? meta.version : undefined));
       }
       if (flag.newMode) {
         validate(obj_1, function () {
-          var msg = core_1.message(p.resourceService.value, 'msg_confirm_save', 'confirm', 'yes', 'no');
-          p.confirm(msg.message, msg.title, function () {
-            save(obj_1, null, p.version, isBack);
+          var msg = core_1.message(p1.resource.value, 'msg_confirm_save', 'confirm', 'yes', 'no');
+          p1.confirm(msg.message, msg.title, function () {
+            doSave(obj_1, undefined, version_1, isBack);
           }, msg.no, msg.yes);
         });
       }
       else {
-        var diffObj_1 = reflectx_1.makeDiff(edit_1.initPropertyNullInModel(flag.originalModel, metadata), obj_1, p.keys, p.version);
+        var diffObj_1 = reflectx_1.makeDiff(edit_1.initPropertyNullInModel(flag.originalModel, metadata), obj_1, keys, version_1);
         var objKeys = Object.keys(diffObj_1);
         if (objKeys.length === 0) {
-          p.showMessage(p.resourceService.value('msg_no_change'));
+          p1.showMessage(p1.resource.value('msg_no_change'));
         }
         else {
           validate(obj_1, function () {
-            var msg = core_1.message(p.resourceService.value, 'msg_confirm_save', 'confirm', 'yes', 'no');
-            p.confirm(msg.message, msg.title, function () {
-              save(obj_1, diffObj_1, p.version, isBack);
+            var msg = core_1.message(p1.resource.value, 'msg_confirm_save', 'confirm', 'yes', 'no');
+            p1.confirm(msg.message, msg.title, function () {
+              doSave(obj_1, diffObj_1, version_1, isBack);
             }, msg.no, msg.yes);
           });
         }
       }
     }
   };
-  var onSave = (p.onSave ? p.onSave : _onSave);
-  var saveOnClick = function (event) {
+  var onSave = (p && p.onSave ? p.onSave : _onSave);
+  var save = function (event) {
     event.preventDefault();
     event.persist();
-    onSave(backOnSuccess);
+    onSave();
   };
   var _validate = function (obj, callback) {
-    if (p.ui) {
-      var valid = p.ui.validateForm(p.refForm.current, p.getLocale());
+    if (p1.ui) {
+      var valid = p1.ui.validateForm(refForm.current, state_1.localeOf(undefined, p1.getLocale));
       if (valid) {
         callback(obj);
       }
@@ -339,7 +222,7 @@ exports.useBaseEditOneWithProps = function (p) {
       callback(obj);
     }
   };
-  var validate = (p.validate ? p.validate : _validate);
+  var validate = (p && p.validate ? p.validate : _validate);
   var _succeed = function (obj, msg, version, isBack, result) {
     if (result) {
       var model = result.value;
@@ -354,44 +237,46 @@ exports.useBaseEditOneWithProps = function (p) {
     else {
       edit_1.handleVersion(obj, version);
     }
-    var isBackO = (isBack == null || isBack === undefined ? backOnSuccess : isBack);
-    p.showMessage(msg);
-    if (isBackO) {
-      back(null);
+    p1.showMessage(msg);
+    if (isBack) {
+      back(undefined);
     }
   };
-  var succeed = (p.succeed ? p.succeed : _succeed);
+  var succeed = (p && p.succeed ? p.succeed : _succeed);
   var _fail = function (result) {
     var errors = result.errors;
-    var f = p.refForm.current;
-    var unmappedErrors = p.ui.showFormError(f, errors);
-    formutil_1.focusFirstError(f);
-    if (!result.message) {
-      if (errors && errors.length === 1) {
-        result.message = errors[0].message;
-      }
-      else {
-        if (p.ui && p.ui.buildErrorMessage) {
-          result.message = p.ui.buildErrorMessage(unmappedErrors);
+    var f = refForm.current;
+    var u = p1.ui;
+    if (errors && u) {
+      var unmappedErrors = u.showFormError(f, errors);
+      formutil_1.focusFirstError(f);
+      if (!result.message) {
+        if (errors && errors.length === 1) {
+          result.message = errors[0].message;
         }
         else {
-          result.message = errors[0].message;
+          if (p1.ui && p1.ui.buildErrorMessage) {
+            result.message = p1.ui.buildErrorMessage(unmappedErrors);
+          }
+          else {
+            result.message = errors[0].message;
+          }
         }
       }
+      if (result.message) {
+        var t = p1.resource.value('error');
+        p1.showError(result.message, t);
+      }
     }
-    var t = p.resourceService.value('error');
-    p.showError(result.message, t);
   };
-  var fail = (p.fail ? p.fail : _fail);
+  var fail = (p && p.fail ? p.fail : _fail);
   var _postSave = function (obj, res, version, backOnSave) {
     setRunning(false);
-    if (p.loading) {
-      p.loading.hideLoading();
-    }
+    core_1.hideLoading(p1.loading);
     var x = res;
-    var successMsg = p.resourceService.value('msg_save_success');
+    var successMsg = p1.resource.value('msg_save_success');
     var newMod = flag.newMode;
-    var st = core_1.createEditStatus(p.status);
+    var st = core_1.createEditStatus(p ? p.status : undefined);
     if (!isNaN(x)) {
       if (x === st.success) {
         succeed(obj, successMsg, version, backOnSave);
@@ -404,7 +289,7 @@ exports.useBaseEditOneWithProps = function (p) {
           handleNotFound();
         }
         else {
-          edit_1.handleStatus(x, st, p.resourceService.value, p.showError);
+          edit_1.handleStatus(x, st, p1.resource.value, p1.showError);
         }
       }
     }
@@ -412,7 +297,7 @@ exports.useBaseEditOneWithProps = function (p) {
       var result = x;
       if (result.status === st.success) {
         succeed(obj, successMsg, version, backOnSave, result);
-        p.showMessage(successMsg);
+        p1.showMessage(successMsg);
       }
       else if (result.errors && result.errors.length > 0) {
         fail(result);
@@ -424,121 +309,90 @@ exports.useBaseEditOneWithProps = function (p) {
         handleNotFound();
       }
       else {
-        edit_1.handleStatus(result.status, st, p.resourceService.value, p.showError);
+        edit_1.handleStatus(result.status, st, p1.resource.value, p1.showError);
       }
     }
   };
-  var postSave = (p.postSave ? p.postSave : _postSave);
+  var postSave = (p && p.postSave ? p.postSave : _postSave);
   var _handleDuplicateKey = function (result) {
-    var msg = core_1.message(p.resourceService.value, 'error_duplicate_key', 'error');
-    p.showError(msg.message, msg.title);
+    var msg = core_1.message(p1.resource.value, 'error_duplicate_key', 'error');
+    p1.showError(msg.message, msg.title);
   };
-  var handleDuplicateKey = (p.handleDuplicateKey ? p.handleDuplicateKey : _handleDuplicateKey);
-  var _save = function (obj, body, version, isBack) {
-    return __awaiter(void 0, void 0, void 0, function () {
-      var isBackO, result, result, result;
-      return __generator(this, function (_a) {
-        switch (_a.label) {
-          case 0:
-            setRunning(true);
-            p.loading.showLoading();
-            isBackO = (isBack == null || isBack === undefined ? backOnSuccess : isBack);
-            if (!(flag.newMode === false)) return [3, 5];
-            if (!(patchable === true && body && Object.keys(body).length > 0)) return [3, 2];
-            return [4, p.service.patch(body)];
-          case 1:
-            result = _a.sent();
-            postSave(obj, result, version, isBackO);
-            return [3, 4];
-          case 2: return [4, p.service.update(obj)];
-          case 3:
-            result = _a.sent();
-            postSave(obj, result, version, isBackO);
-            _a.label = 4;
-          case 4: return [3, 7];
-          case 5: return [4, p.service.insert(obj)];
-          case 6:
-            result = _a.sent();
-            postSave(obj, result, version, isBackO);
-            _a.label = 7;
-          case 7: return [2];
-        }
-      });
-    });
+  var handleDuplicateKey = (p && p.handleDuplicateKey ? p.handleDuplicateKey : _handleDuplicateKey);
+  var _doSave = function (obj, body, version, isBack) {
+    setRunning(true);
+    core_1.showLoading(p1.loading);
+    var isBackO = (isBack == null || isBack === undefined ? true : isBack);
+    var patchable = (p ? p.patchable : true);
+    if (flag.newMode === false) {
+      if (service.patch && patchable !== false && body && Object.keys(body).length > 0) {
+        service.patch(body).then(function (result) { return postSave(obj, result, version, isBackO); });
+      }
+      else {
+        service.update(obj).then(function (result) { return postSave(obj, result, version, isBackO); });
+      }
+    }
+    else {
+      service.insert(obj).then(function (result) { return postSave(obj, result, version, isBackO); });
+    }
   };
-  var save = (p.save ? p.save : _save);
+  var doSave = (p && p.doSave ? p.doSave : _doSave);
   var _load = function (_id, callback) {
-    return __awaiter(void 0, void 0, void 0, function () {
-      var id, obj, err_1, data, r, title, msg, obj;
-      return __generator(this, function (_a) {
-        switch (_a.label) {
-          case 0:
-            id = _id;
-            debugger;
-            if (!(id != null && id !== '')) return [3, 6];
-            _a.label = 1;
-          case 1:
-            _a.trys.push([1, 3, 4, 5]);
-            return [4, p.service.load(id)];
-          case 2:
-            obj = _a.sent();
-            if (!obj) {
-              handleNotFound(p.refForm.current);
-            }
-            else {
-              setFlag({ newMode: false, originalModel: reflectx_1.clone(obj) });
-              if (callback) {
-                callback(obj, showModel);
-              }
-              else {
-                showModel(obj);
-              }
-            }
-            return [3, 5];
-          case 3:
-            err_1 = _a.sent();
-            data = (err_1 && err_1.response) ? err_1.response : err_1;
-            r = p.resourceService;
-            title = r.value('error');
-            msg = r.value('error_internal');
-            if (data && data.status === 404) {
-              handleNotFound(p.refForm.current);
-            }
-            else {
-              if (data.status && !isNaN(data.status)) {
-                msg = core_1.messageByHttpStatus(data.status, r.value);
-              }
-              if (data && (data.status === 401 || data.status === 403)) {
-                formutil_1.readOnly(p.refForm.current);
-              }
-              p.showError(msg, title);
-            }
-            return [3, 5];
-          case 4:
-            setRunning(false);
-            if (p.loading) {
-              p.loading.hideLoading();
-            }
-            return [7];
-          case 5: return [3, 7];
-          case 6:
-            obj = createModel();
-            setFlag({ newMode: true, originalModel: null });
-            if (callback) {
-              callback(obj, showModel);
-            }
-            else {
-              showModel(obj);
-            }
-            _a.label = 7;
-          case 7: return [2];
+    var id = _id;
+    if (id != null && id !== '') {
+      setRunning(true);
+      core_1.showLoading(p1.loading);
+      service.load(id).then(function (obj) {
+        if (!obj) {
+          handleNotFound(refForm.current);
         }
+        else {
+          setFlag({ newMode: false, originalModel: reflectx_1.clone(obj) });
+          if (callback) {
+            callback(obj, showModel);
+          }
+          else {
+            showModel(obj);
+          }
+        }
+        setRunning(false);
+        core_1.hideLoading(p1.loading);
+      }).catch(function (err) {
+        var data = (err && err.response) ? err.response : err;
+        var r = p1.resource;
+        var title = r.value('error');
+        var msg = r.value('error_internal');
+        if (data && data.status === 404) {
+          handleNotFound(refForm.current);
+        }
+        else {
+          if (data.status && !isNaN(data.status)) {
+            msg = core_1.messageByHttpStatus(data.status, r.value);
+          }
+          if (data && (data.status === 401 || data.status === 403)) {
+            formutil_1.readOnly(refForm.current);
+          }
+          p1.showError(msg, title);
+        }
+        setRunning(false);
+        core_1.hideLoading(p1.loading);
       });
-    });
+    }
+    else {
+      var obj = createModel();
+      setFlag({ newMode: true, originalModel: undefined });
+      if (callback) {
+        callback(obj, showModel);
+      }
+      else {
+        showModel(obj);
+      }
+    }
   };
-  var load = (p.load ? p.load : _load);
+  var load = (p && p.load ? p.load : _load);
   return __assign(__assign({}, baseProps), {
-    back: back, refForm: p.refForm, ui: p.ui, resource: p.resourceService.resource(), flag: flag,
+    back: back,
+    refForm: refForm, ui: p1.ui, resource: p1.resource.resource(), flag: flag,
     running: running,
     setRunning: setRunning,
     updateDateState: updateDateState,
@@ -546,15 +400,14 @@ exports.useBaseEditOneWithProps = function (p) {
     getModelName: getModelName,
     resetState: resetState,
     handleNotFound: handleNotFound,
-    getModel: getModel, createNewModel: createModel, newOnClick: newOnClick,
-    saveOnClick: saveOnClick,
+    getModel: getModel, createNewModel: createModel, newOnClick: create, save: save,
     onSave: onSave,
     confirm: confirm,
-    validate: validate, showMessage: p.showMessage, succeed: succeed,
+    validate: validate, showMessage: p1.showMessage, succeed: succeed,
     fail: fail,
     postSave: postSave,
     handleDuplicateKey: handleDuplicateKey,
     load: load,
-    save: save
+    doSave: doSave
   });
 };