devfab 1.2.0 → 1.5.0

package/lib/devfab.js

@@ -326,130 +326,276 @@
     }
   }
 
-  var _excluded$1 = ["component", "children", "render"];
-  var isInit = false;
-  var components = {}; // 组件
-  var renderFactory = null;
-  function _initComponent(name, comp) {
-    if (!name) {
-      return;
+  function QueryString(_url) {
+    this.pathname = '';
+    this.query = {};
+    var url = _url;
+    this.init = function () {
+      if (!url) {
+        url = location.search;
+      }
+      var index1 = url.indexOf('?');
+      var index2 = url.indexOf('#');
+      if (index1 >= 0) {
+        this.pathname = url.substr(0, index1);
+        url = index2 < 0 ? url.substr(index1 + 1) : url.substring(index1 + 1, index2);
+        if (url.length > 0) {
+          url = url.replace(/\+/g, ' ');
+          var params = url.split('&');
+          for (var i = 0, len = params.length; i < len; i++) {
+            var param = params[i] || '';
+            if (param) {
+              var index = param.indexOf('=');
+              var key = '';
+              var value = '';
+              if (index < 0) {
+                key = window.decode(param);
+                value = key;
+              } else {
+                key = window.decode(param.substr(0, index));
+                value = window.decode(param.substr(index + 1));
+              }
+              this.query[key] = value;
+            }
+          }
+        }
+      } else {
+        this.pathname = url;
+      }
+    };
+    this.set = function (key, value) {
+      this.query[key] = value;
+    };
+    this.get = function (key) {
+      return this.query[key];
+    };
+    this.del = function (key) {
+      delete this.query[key];
+    };
+    this.has = function (key) {
+      return this.query[key] != null;
+    };
+    this.toStr = function () {
+      var items = ['?'];
+      for (var key in this.query) {
+        items.push(encodeURIComponent(key));
+        items.push('=');
+        items.push(encodeURIComponent(this.query[key]));
+        items.push('&');
+      }
+      if (items.length === 1) {
+        return '';
+      }
+      items.splice(items.length - 1, 1);
+      return items.join('');
+    };
+    this.init();
+  }
+  String.prototype['equalsIgnoreCase'] = function (str) {
+    if (str == null) {
+      return false;
     }
-    if (typeof name === 'string') {
-      if (components[name]) {
-        console.log("[warning] Component ".concat(name, " is exist!"));
-        return;
+    return this.toLowerCase() === str.toLowerCase();
+  };
+  function _appendUrl(restUrl, params) {
+    if (!params) {
+      return restUrl;
+    }
+    var queryStr = [];
+    var queryUrl = new QueryString(restUrl);
+    for (var attr in params) {
+      if (queryUrl.get(attr)) {
+        continue;
       }
-      components[name] = comp;
-      return;
+      queryStr.push("".concat(attr, "=").concat(params[attr]));
     }
-    Object.assign(components, name);
-  }
-  function _getComponent(name) {
-    return components[name];
-  }
-  function clearComponents() {
-    components = {};
-  }
-  function _initRenderFactory(fn) {
-    renderFactory = fn;
+    if (!queryStr.length) {
+      return restUrl;
+    }
+    var queryString = queryStr.join('&');
+    return restUrl.indexOf('?') >= 0 ? "".concat(restUrl, "&").concat(queryString) : "".concat(restUrl, "?").concat(queryString);
   }
-  function renderComponent(config, extraConfig) {
-    if (!Array.isArray(config)) {
-      return;
+  var hasValue = function hasValue(value) {
+    return value !== undefined && value !== null && value !== '';
+  };
+
+  /**
+   * 按「规范名 → 别名列表」取一个字段。
+   *
+   *   const TABLE_FIELDS = { height: ['height', 'cHeight'] }
+   *   pick(props, 'height', TABLE_FIELDS)   // → props.height ?? props.cHeight
+   *
+   * `spec` 里没写这个规范名时，直接按规范名取（`pick(col, 'field')`）。
+   * 规范名自己也要列在别名数组里 —— 这样「已写规范名的对象」优先命中，别名兜底。
+   */
+  function pick(source, name, _spec) {
+    if (!source) {
+      return undefined;
     }
-    var _component = [];
-    config.forEach(function (item, i) {
-      var _com = item.component,
-        _children = item.children,
-        _render = item.render,
-        _props = _objectWithoutProperties(item, _excluded$1);
-      var component = _getComponent(_com);
-      if (!component && typeof _render !== 'function') {
-        console.log("[warning] Component ".concat(_com, " is not registered!"));
-      }
-      var children = renderComponent(_children, extraConfig);
-      var node = {
-        component: component,
-        children: children
-      };
-      _props.index = i;
-      var props = Object.assign({}, extraConfig === null || extraConfig === void 0 ? void 0 : extraConfig.props, _props);
-      if (typeof _render === 'function') {
-        _component.push(_render({
-          node: node,
-          props: props
-        }));
-      } else if (typeof renderFactory === 'function') {
-        _component.push(renderFactory({
-          node: node,
-          props: props
-        }));
-      } else {
-        Object.assign(node, props);
-        _component.push(node);
+    var spec = _spec;
+    if (typeof name === 'string' && Array.isArray(spec)) {
+      spec = _defineProperty({}, name, _spec);
+    }
+    var keys = spec && spec[name];
+    if (!keys) {
+      return hasValue(source[name]) ? source[name] : undefined;
+    }
+    for (var i = 0; i < keys.length; i++) {
+      var value = source[keys[i]];
+      if (hasValue(value)) {
+        return value;
       }
-    });
-    return _component;
-  }
-  var Builder = /*#__PURE__*/function () {
-    function Builder() {
-      _classCallCheck(this, Builder);
     }
-    return _createClass(Builder, [{
+    return undefined;
+  }
+
+  var _excluded$1 = ["children", "render"];
+  var BaseBuilder = /*#__PURE__*/function () {
+    function BaseBuilder() {
+      _classCallCheck(this, BaseBuilder);
+      _defineProperty(this, "_config", {
+        componentField: ['component']
+      });
+      _defineProperty(this, "_components", {});
+      _defineProperty(this, "_renderFactory", null);
+    } //
+    return _createClass(BaseBuilder, [{
       key: "init",
-      value: function init(fn) {
-        if (isInit) {
+      value: function init(_config, _components, _renderFactory) {
+        this._initConfig(_config);
+        this._initComponent(_components);
+        this._initRenderFactory(_renderFactory);
+      }
+    }, {
+      key: "_initConfig",
+      value: function _initConfig(_config) {
+        this._config = Object.assign(this._config, _config);
+      }
+    }, {
+      key: "_initComponent",
+      value: function _initComponent(name, comp) {
+        if (!name) {
           return;
+        } else if (typeof name === 'string') {
+          if (this._components[name]) {
+            console.log("[warning] Component ".concat(name, " is exist!"));
+            return;
+          }
+          this._components[name] = comp;
+        } else if (typeof name === 'function') {
+          Object.assign(this._components, name === null || name === void 0 ? void 0 : name());
+        } else if (_typeof(name) === 'object') {
+          Object.assign(this._components, name);
         }
-        if (typeof fn === 'function') {
-          fn();
+      }
+    }, {
+      key: "_getComponent",
+      value: function _getComponent(name) {
+        return this._components[name];
+      }
+    }, {
+      key: "_clearComponents",
+      value: function _clearComponents() {
+        this._components = {};
+      }
+    }, {
+      key: "_initRenderFactory",
+      value: function _initRenderFactory(fn) {
+        this._renderFactory = fn;
+      }
+    }, {
+      key: "_renderComponent",
+      value: function _renderComponent(config, extraConfig) {
+        var _this = this;
+        if (!Array.isArray(config)) {
+          return;
         }
-        isInit = true;
+        var _component = [];
+        config.forEach(function (_item, i) {
+          var item = _objectSpread2({}, _item);
+          var _com = pick(item, 'component', _this._config.componentField);
+          var _children = item.children,
+            _render = item.render,
+            _props = _objectWithoutProperties(item, _excluded$1);
+          var component = _this._getComponent(_com);
+          if (!component && typeof _render !== 'function') {
+            console.log("[warning] Component ".concat(_com, " is not registered!"));
+          }
+          var children = _this._renderComponent(_children, extraConfig);
+          var node = {
+            component: component,
+            children: children
+          };
+          _props.index = i;
+          var props = Object.assign({}, extraConfig === null || extraConfig === void 0 ? void 0 : extraConfig.props, {
+            meta: _props
+          });
+          if (typeof _render === 'function') {
+            _component.push(_render({
+              node: node,
+              props: props
+            }));
+          } else if (typeof _this._renderFactory === 'function') {
+            _component.push(_this._renderFactory({
+              node: node,
+              props: props
+            }));
+          } else {
+            Object.assign(node, props);
+            _component.push(node);
+          }
+        });
+        return _component;
       }
     }, {
+      key: "clear",
+      value: function clear() {
+        this._clearComponents();
+        this._renderFactory = null;
+      }
+    }]);
+  }();
+  var Builder = /*#__PURE__*/function (_BaseBuilder2) {
+    function Builder() {
+      _classCallCheck(this, Builder);
+      return _callSuper(this, Builder, arguments);
+    }
+    _inherits(Builder, _BaseBuilder2);
+    return _createClass(Builder, [{
       key: "initComponent",
       value: function initComponent(name, comp) {
-        _initComponent(name, comp);
+        this._initComponent(name, comp);
       }
     }, {
       key: "getComponents",
       value: function getComponents() {
-        return _objectSpread2({}, components);
+        return _objectSpread2({}, this._components);
       }
     }, {
       key: "getComponent",
       value: function getComponent(name) {
-        return _getComponent(name);
+        return this._getComponent(name);
       }
     }, {
       key: "hasComponent",
       value: function hasComponent(name) {
-        return !!_getComponent(name);
+        return !!this._getComponent(name);
       }
     }, {
       key: "initRenderFactory",
       value: function initRenderFactory(fn) {
-        _initRenderFactory(fn);
-      }
-    }, {
-      key: "initRequest",
-      value: function initRequest() {
-        //
+        this._initRenderFactory(fn);
       }
     }, {
       key: "render",
       value: function render(config, extraConfig) {
-        return renderComponent(config, extraConfig);
-      }
-    }, {
-      key: "clear",
-      value: function clear() {
-        clearComponents();
-        renderFactory = null;
-        isInit = false;
+        return this._renderComponent(config, extraConfig);
       }
     }]);
-  }();
+  }(BaseBuilder);
+  Builder.create = function (args) {
+    return new Builder(args);
+  };
 
   var CacheUtil = /*#__PURE__*/function () {
     function CacheUtil(args) {
@@ -459,23 +605,23 @@
     return _createClass(CacheUtil, [{
       key: "_init",
       value: function _init(args) {
-        this.cache = Object.assign({}, args);
+        this._data = Object.assign({}, args);
       }
     }, {
       key: "set",
       value: function set(key, value) {
-        this.cache[key] = value;
+        this._data[key] = value;
       }
     }, {
       key: "get",
       value: function get(key) {
-        var _this$cache;
-        return (_this$cache = this.cache) === null || _this$cache === void 0 ? void 0 : _this$cache[key];
+        var _this$_data;
+        return (_this$_data = this._data) === null || _this$_data === void 0 ? void 0 : _this$_data[key];
       }
     }, {
       key: "clear",
       value: function clear(key) {
-        delete this.cache[key];
+        delete this._data[key];
       }
     }]);
   }();
@@ -490,13 +636,13 @@
       value: function _init(args) {
         var _args$__ASYNC_EXECUTE;
         this.__ASYNC_EXECUTE__ = (_args$__ASYNC_EXECUTE = args === null || args === void 0 ? void 0 : args.__ASYNC_EXECUTE__) !== null && _args$__ASYNC_EXECUTE !== void 0 ? _args$__ASYNC_EXECUTE : true;
-        this.events = new Map();
-        this.firstevents = new Map();
+        this._events = new Map();
+        this._firstevents = new Map();
       }
     }, {
       key: "on",
       value: function on(name, callback, context) {
-        var fnList = this.events.get(name);
+        var fnList = this._events.get(name);
         if (!Array.isArray(fnList)) {
           fnList = [];
         }
@@ -504,12 +650,12 @@
           callback: callback,
           context: context
         });
-        this.events.set(name, fnList);
+        this._events.set(name, fnList);
       }
     }, {
       key: "onFirst",
       value: function onFirst(name, callback, context) {
-        var fnList = this.firstevents.get(name);
+        var fnList = this._firstevents.get(name);
         if (!Array.isArray(fnList)) {
           fnList = [];
         }
@@ -517,7 +663,7 @@
           callback: callback,
           context: context
         });
-        this.firstevents.set(name, fnList);
+        this._firstevents.set(name, fnList);
       }
     }, {
       key: "execute",
@@ -525,8 +671,8 @@
         for (var _len = arguments.length, args = new Array(_len > 1 ? _len - 1 : 0), _key = 1; _key < _len; _key++) {
           args[_key - 1] = arguments[_key];
         }
-        var events = this.events.get(name);
-        var firstevents = this.firstevents.get(name);
+        var events = this._events.get(name);
+        var firstevents = this._firstevents.get(name);
         if (!events && !firstevents) {
           return true;
         }
@@ -544,8 +690,8 @@
     }, {
       key: "un",
       value: function un(name, callback) {
-        this._unEvents(name, callback, this.events);
-        this._unEvents(name, callback, this.firstevents);
+        this._unEvents(name, callback, this._events);
+        this._unEvents(name, callback, this._firstevents);
       }
     }, {
       key: "_unEvents",
@@ -568,12 +714,12 @@
     }, {
       key: "hasEvent",
       value: function hasEvent(name) {
-        var _this$events$get, _this$firstevents$get;
+        var _this$_events$get, _this$_firstevents$ge;
         if (!name) {
           return 0;
         }
-        var eventsLen = ((_this$events$get = this.events.get(name)) === null || _this$events$get === void 0 ? void 0 : _this$events$get.length) || 0;
-        var firsteventsLen = ((_this$firstevents$get = this.firstevents.get(name)) === null || _this$firstevents$get === void 0 ? void 0 : _this$firstevents$get.length) || 0;
+        var eventsLen = ((_this$_events$get = this._events.get(name)) === null || _this$_events$get === void 0 ? void 0 : _this$_events$get.length) || 0;
+        var firsteventsLen = ((_this$_firstevents$ge = this._firstevents.get(name)) === null || _this$_firstevents$ge === void 0 ? void 0 : _this$_firstevents$ge.length) || 0;
         return eventsLen + firsteventsLen;
       }
     }, {
@@ -666,8 +812,8 @@
     }, {
       key: "_asyncPromiseExecute",
       value: function _asyncPromiseExecute(name, resolve, reject, args) {
-        var events = this.events.get(name);
-        var firstevents = this.firstevents.get(name);
+        var events = this._events.get(name);
+        var firstevents = this._firstevents.get(name);
         if ((Array.isArray(events) ? !events.length : !events) && (Array.isArray(firstevents) ? !firstevents.length : !firstevents)) {
           return resolve === null || resolve === void 0 ? void 0 : resolve();
         }
@@ -726,9 +872,9 @@
         var returnData = this.execute.apply(this, args);
         if (returnData instanceof Promise) {
           var self = this;
-          /**
-           * 背景参考下面的else注释，当第二次命中这里的时候，会在promise执行的时候直接then了，因为没有重新走一遍判定，这里直接执行了callback
-           * 解决方案：想着是想办法把then里的代码作为callback传进去最后在执行，但是没想到方案
+          /**
+           * 背景参考下面的else注释，当第二次命中这里的时候，会在promise执行的时候直接then了，因为没有重新走一遍判定，这里直接执行了callback
+           * 解决方案：想着是想办法把then里的代码作为callback传进去最后在执行，但是没想到方案
            */
           returnData.then(function () {
             for (var _len3 = arguments.length, args = new Array(_len3), _key3 = 0; _key3 < _len3; _key3++) {
@@ -741,9 +887,9 @@
             }
           });
         } else {
-          /*
-          这里是因为历史代码没有考虑promise得情况 导致直接使用!returnData做结果判定，但是undefined也会命中false 导致后续执行阻断，不做callback了，所以会有问题，加了下面代码还是有问题，因为如果命中了promise得话没有返回值
-          导致命中不了returnData === false 导致阻断，所以上面execute里promise的时候将整个results返回，但是加了还有另外的问题，就是如果有两个分开的promise 会导致第一次好使，第二次命中了上面的if
+          /*
+          这里是因为历史代码没有考虑promise得情况 导致直接使用!returnData做结果判定，但是undefined也会命中false 导致后续执行阻断，不做callback了，所以会有问题，加了下面代码还是有问题，因为如果命中了promise得话没有返回值
+          导致命中不了returnData === false 导致阻断，所以上面execute里promise的时候将整个results返回，但是加了还有另外的问题，就是如果有两个分开的promise 会导致第一次好使，第二次命中了上面的if
           */
           // if (window.__ASYNC_EXECUTE__ ? returnData === false : !returnData) {
           if (!returnData) {
@@ -808,102 +954,12 @@
     }, {
       key: "clearEvents",
       value: function clearEvents() {
-        this.events.clear();
-        this.firstevents.clear();
+        this._events.clear();
+        this._firstevents.clear();
       }
     }]);
   }();
 
-  function QueryString(_url) {
-    this.pathname = '';
-    this.query = {};
-    var url = _url;
-    this.init = function () {
-      if (!url) {
-        url = location.search;
-      }
-      var index1 = url.indexOf('?');
-      var index2 = url.indexOf('#');
-      if (index1 >= 0) {
-        this.pathname = url.substr(0, index1);
-        url = index2 < 0 ? url.substr(index1 + 1) : url.substring(index1 + 1, index2);
-        if (url.length > 0) {
-          url = url.replace(/\+/g, ' ');
-          var params = url.split('&');
-          for (var i = 0, len = params.length; i < len; i++) {
-            var param = params[i] || '';
-            if (param) {
-              var index = param.indexOf('=');
-              var key = '';
-              var value = '';
-              if (index < 0) {
-                key = window.decode(param);
-                value = key;
-              } else {
-                key = window.decode(param.substr(0, index));
-                value = window.decode(param.substr(index + 1));
-              }
-              this.query[key] = value;
-            }
-          }
-        }
-      } else {
-        this.pathname = url;
-      }
-    };
-    this.set = function (key, value) {
-      this.query[key] = value;
-    };
-    this.get = function (key) {
-      return this.query[key];
-    };
-    this.del = function (key) {
-      delete this.query[key];
-    };
-    this.has = function (key) {
-      return this.query[key] != null;
-    };
-    this.toStr = function () {
-      var items = ['?'];
-      for (var key in this.query) {
-        items.push(encodeURIComponent(key));
-        items.push('=');
-        items.push(encodeURIComponent(this.query[key]));
-        items.push('&');
-      }
-      if (items.length === 1) {
-        return '';
-      }
-      items.splice(items.length - 1, 1);
-      return items.join('');
-    };
-    this.init();
-  }
-  String.prototype['equalsIgnoreCase'] = function (str) {
-    if (str == null) {
-      return false;
-    }
-    return this.toLowerCase() === str.toLowerCase();
-  };
-  function _appendUrl(restUrl, params) {
-    if (!params) {
-      return restUrl;
-    }
-    var queryStr = [];
-    var queryUrl = new QueryString(restUrl);
-    for (var attr in params) {
-      if (queryUrl.get(attr)) {
-        continue;
-      }
-      queryStr.push("".concat(attr, "=").concat(params[attr]));
-    }
-    if (!queryStr.length) {
-      return restUrl;
-    }
-    var queryString = queryStr.join('&');
-    return restUrl.indexOf('?') >= 0 ? "".concat(restUrl, "&").concat(queryString) : "".concat(restUrl, "?").concat(queryString);
-  }
-
   var _excluded = ["onBeforeRequest", "_onAfterRequest"],
     _excluded2 = ["_onBeforeRequest", "onAfterRequest"];
   function _getUrl(_url, params) {
@@ -1248,7 +1304,7 @@
     return ajax(url, options);
   };
 
-  var BaseModel = /*#__PURE__*/function () {
+  var BaseModel$1 = /*#__PURE__*/function () {
     function BaseModel(args) {
       _classCallCheck(this, BaseModel);
       this._init(args);
@@ -1424,11 +1480,11 @@
         components.splice(index, 1);
       }
 
-      /**
-       * 统一的「写属性 + 通知组件」逻辑。
-       * 组件实现了 setXxx（如 setValue）就直接调；没实现则退回 setState({ [name]: value })。
-       * 原实现里只有 setVisible / setDisabled 有这层兜底，setValue 漏了，
-       * 导致模型改值永远传不到受控组件上。
+      /**
+       * 统一的「写属性 + 通知组件」逻辑。
+       * 组件实现了 setXxx（如 setValue）就直接调；没实现则退回 setState({ [name]: value })。
+       * 原实现里只有 setVisible / setDisabled 有这层兜底，setValue 漏了，
+       * 导致模型改值永远传不到受控组件上。
        */
     }, {
       key: "_applyState",
@@ -1667,67 +1723,27 @@
     }]);
   }();
 
-  var FilterModel = /*#__PURE__*/function (_BaseModel) {
-    function FilterModel() {
-      _classCallCheck(this, FilterModel);
-      return _callSuper(this, FilterModel, arguments);
+  var SimpleModel$1 = /*#__PURE__*/function (_BaseModel) {
+    function SimpleModel() {
+      var _this;
+      _classCallCheck(this, SimpleModel);
+      for (var _len = arguments.length, args = new Array(_len), _key = 0; _key < _len; _key++) {
+        args[_key] = arguments[_key];
+      }
+      _this = _callSuper(this, SimpleModel, [].concat(args));
+      _defineProperty(_this, "modelType", 'SimpleModel');
+      return _this;
     }
-    _inherits(FilterModel, _BaseModel);
-    return _createClass(FilterModel, [{
-      key: "mounted",
-      value: function mounted() {
-        var _this = this;
-        var _conditions = this.get('conditions');
-        var params = {};
-        _conditions.forEach(function (r) {
-          _this.get(r.name);
-          params[r.name] = r.defaultValue;
-        });
-        this._set_data('params', params);
+    _inherits(SimpleModel, _BaseModel);
+    return _createClass(SimpleModel, [{
+      key: "getDisabled",
+      value: function getDisabled() {
+        return this.getState('disabled');
       }
     }, {
-      key: "unmounted",
-      value: function unmounted() {
-        this._set_data('params', {});
-        this._set_data('conditions', []);
-      }
-    }, {
-      key: "getParams",
-      value: function getParams() {
-        var _this2 = this;
-        var params = {};
-        var conditions = this.get('conditions');
-        conditions.forEach(function (r) {
-          var model = _this2.get(r.name);
-          params[r.name] = model === null || model === void 0 ? void 0 : model.getValue();
-        });
-        this._set_data('params', params);
-        return params;
-      }
-    }, {
-      key: "search",
-      value: function search() {
-        var params = this.getParams();
-        this.execute('search', params);
-      }
-    }]);
-  }(BaseModel);
-
-  var SimpleModel = /*#__PURE__*/function (_BaseModel) {
-    function SimpleModel(args) {
-      _classCallCheck(this, SimpleModel);
-      return _callSuper(this, SimpleModel, [args]);
-    }
-    _inherits(SimpleModel, _BaseModel);
-    return _createClass(SimpleModel, [{
-      key: "getDisabled",
-      value: function getDisabled() {
-        return this.getState('disabled');
-      }
-    }, {
-      key: "setDisabled",
-      value: function setDisabled(v) {
-        return this.setState('disabled', !!v);
+      key: "setDisabled",
+      value: function setDisabled(value, ctrlName) {
+        this._applyState('disabled', value, ctrlName);
       }
     }, {
       key: "getReadonly",
@@ -1736,36 +1752,14 @@
       }
     }, {
       key: "setReadonly",
-      value: function setReadonly(v) {
-        this.setState('readonly', !!v);
+      value: function setReadonly(value, ctrlName) {
+        this._applyState('readonly', value, ctrlName);
       }
     }]);
-  }(BaseModel);
+  }(BaseModel$1);
 
-  var DataStates = {
-    Unchanged: '',
-    Insert: 'Insert',
-    Update: 'Update',
-    Delete: 'Delete'
-  };
   var DEFAULT_PAGE_SIZE = 20;
   var isArray = Array.isArray;
-  var isEmpty = function isEmpty(value) {
-    return value === undefined || value === null || value === '';
-  };
-  var isEmptyObject = function isEmptyObject(value) {
-    return !value || Object.keys(value).length === 0;
-  };
-  function cloneDeep(value) {
-    if (isArray(value)) return value.map(cloneDeep);
-    if (value instanceof Date) return new Date(value.getTime());
-    if (value && _typeof(value) === 'object') {
-      var result = {};
-      for (var key in value) result[key] = cloneDeep(value[key]);
-      return result;
-    }
-    return value;
-  }
 
   // ---------------- 列：数组 ↔ object map 归一 ----------------
 
@@ -1783,12 +1777,10 @@
     });
     list.forEach(function (column, index) {
       if (!column) return;
-      var field = column.field || column.cCaption || column.cFieldName || "col_".concat(index);
+      var field = column.field || column.cFieldName || column.cName || "col_".concat(index);
       map[field] = _objectSpread2(_objectSpread2({}, column), {}, {
         field: field,
-        // 中台里列有 fieldName / cCaption 两套命名，这里都兜住
-        fieldName: column.fieldName || field,
-        cCaption: column.cCaption || field,
+        label: column.label || column.title || column.cCaption || field,
         index: column.index === undefined ? index : column.index
       });
     });
@@ -1810,29 +1802,17 @@
     return [];
   }
 
-  /** 给行补内部 id（没有主键时用 rowId_ 前缀，与中台一致） */
-  function setIds() {
-    var rows = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : [];
-    var idFlag = this.getIdFlag();
-    var keyField = this.getRowKeyField();
-    var seq = this._get_data('rowIdSeq') || 0;
-    rows.forEach(function (row) {
-      if (!row || row[idFlag] !== undefined) return;
-      var key = row[keyField];
-      if (key !== undefined && key !== null && key !== '') {
-        row[idFlag] = String(key);
-      } else {
-        seq += 1;
-        row[idFlag] = "rowId_".concat(seq);
-      }
-    });
-    this._set_data('rowIdSeq', seq);
-    return rows;
-  }
-
   // ---------------- 初始状态 ----------------
 
   function createDefaultProps() {
+    var innerUsedAttrs = {
+      id: '_id',
+      selected: '_selected',
+      status: '_status',
+      pageIndex: 'pageNo',
+      pageSize: 'pageSize',
+      pageCount: 'total'
+    };
     return {
       columns: {},
       dataSource: [],
@@ -1841,23 +1821,16 @@
       dataSourceMode: 'local',
       columnMode: 'local',
       editMode: 'cell',
+      rowKeyField: 'id',
       cellState: {},
       rowState: {},
-      showCheckBox: true,
+      showCheckBox: false,
       multiple: true,
       showRowNo: true,
       // 默认显示序号
       pagination: true,
-      pageInfo: {
-        pageIndex: 1,
-        pageSize: DEFAULT_PAGE_SIZE,
-        pageCount: 0
-      },
-      innerUsedAttrs: {
-        id: '_id',
-        selected: '_selected',
-        status: '_status'
-      },
+      pageInfo: _defineProperty(_defineProperty(_defineProperty({}, innerUsedAttrs.pageIndex, 1), innerUsedAttrs.pageSize, DEFAULT_PAGE_SIZE), innerUsedAttrs.pageCount, 0),
+      innerUsedAttrs: innerUsedAttrs,
       multiRowModel: false,
       // 表格多行模型
       editRowModels: {},
@@ -1869,19 +1842,9 @@
       defaultRowDatas: new Map()
     };
   }
-
-  /**
-   * 取数配置：中台叫 proxyConfig（{ load: fn|url }），这里兼容三种写法
-   * - `proxyConfig: { load }`
-   * - `dataSource: fn`（旧写法）
-   * - `cUrl: '/xxx'`
-   */
   function resolveProxyConfig() {
     var props = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
     var proxy = _objectSpread2({}, props.proxyConfig || {});
-    if (typeof props.dataSource === 'function') proxy.load = proxy.load || props.dataSource;
-    if (typeof props.cUrl === 'string') proxy.load = proxy.load || props.cUrl;
-    if (!proxy.load && typeof props.url === 'string') proxy.load = props.url;
     return proxy;
   }
   function _getData(proxyConfig, queryParams, callback) {
@@ -1894,16 +1857,16 @@
       var proxy = _this.setProxy({
         queryData: proxyConfig
       });
-      var defaultParams = {
-        page: {
-          pageSize: _this.getPageSize(),
-          pageIndex: _this.getPageIndex()
-        }
+      var pageIndexField = _this._get_data('innerUsedAttrs').pageIndex;
+      var pageSizeField = _this._get_data('innerUsedAttrs').pageSize;
+      var currentPageInfo = {
+        page: _defineProperty(_defineProperty({}, pageSizeField, _this.getPageSize()), pageIndexField, _this.getPageIndex())
       };
-      var params = Object.assign(defaultParams, queryParams);
+      var params = Object.assign(queryParams, currentPageInfo);
       _this.setCache('proxyCache', {
         proxyConfig: proxyConfig,
-        params: params
+        params: params,
+        callback: callback
       });
       _this.getRootParent();
       var queryDataCallback = function queryDataCallback(err, result, callBackMsg, errorDetail) {
@@ -1913,6 +1876,7 @@
         this._set_data('dataSourceMode', 'remote'); // 处理请求过程中被修改
         result = Object.assign({}, result);
         var data = resolveRowsData(result);
+        this.execute('afterQueryData', result);
         callback === null || callback === void 0 || callback.call(this, data);
       };
       if (_this.execute('beforeQueryData', params) === false) return;
@@ -1922,7 +1886,7 @@
   }
   function _setData(data) {
     if (!this.execute('beforeSetDataSource', data)) return;
-    var rowKeyField = this._get_data('rowKeyField');
+    var rowKeyField = this.getRowKeyField();
     var keyMap = {};
     data.forEach(function (item) {
       keyMap[item[rowKeyField]] = item;
@@ -1935,37 +1899,35 @@
 
   // ============================================================
 
-  var GridModel = /*#__PURE__*/function (_BaseModel) {
+  var GridModel$1 = /*#__PURE__*/function (_BaseModel) {
     function GridModel() {
       var _this2;
       var props = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
       _classCallCheck(this, GridModel);
       var data = _objectSpread2(_objectSpread2({}, createDefaultProps()), props);
       // `dataSource: fn` 是旧写法，含义是「取数函数」而不是「数据」，这里统一收敛掉
-      if (!isArray(data.dataSource)) data.dataSource = [];
-      if (!isArray(data.rows)) data.rows = [];
+      if (!isArray(data.dataSource)) {
+        data.dataSource = [];
+      }
+      if (!isArray(data.rows)) {
+        data.rows = [];
+      }
       var proxyConfig = resolveProxyConfig(props);
       data.proxyConfig = proxyConfig;
       // 有取数配置就是服务端分页，否则按静态数据在前端分页
-      data.dataSourceMode = props.dataSourceMode || (proxyConfig.load ? 'remote' : 'local');
-      // 静态数据：cData / data 数组
-      var seed = props.cData || (isArray(props.data) ? props.data : null);
+      data.dataSourceMode = props.dataSourceMode || data.dataSourceMode;
       _this2 = _callSuper(this, GridModel, [data]);
       _defineProperty(_this2, "modelType", 'GridModel');
-      _this2.initPageInfo(props.cPage || props.page);
       _this2.initColumns(data.columns);
-      _this2.initRowState();
+      _this2.initPageInfo(props.cPage || props.page);
       _this2.afterInit();
-      if (seed) _this2.setDataSource(seed);
       return _this2;
     }
-
-    // 中台在 afterInit 里做主子表/行模型初始化，我们这里只留一个扩展点给业务继承
     _inherits(GridModel, _BaseModel);
     return _createClass(GridModel, [{
       key: "afterInit",
       value: function afterInit() {
-        if (this._get_data('parentRelation') === 'single') this._set_data('defaultSelectedRowIndexes', true);
+        this.execute('afterInit');
       }
     }, {
       key: "initColumns",
@@ -1979,65 +1941,25 @@
       value: function initPageInfo() {
         var page = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
         var pageInfo = _objectSpread2({}, this.getPageInfo());
-        pageInfo.pageIndex = page.pageNo || page.pageIndex || pageInfo.pageIndex || 1;
-        pageInfo.pageSize = page.pageSize || pageInfo.pageSize || DEFAULT_PAGE_SIZE;
-        // 中台习惯：不分页时把 pageSize 记成 -1
-        if (this.get('pagination') === false) pageInfo.pageSize = -1;
-        this.applyPageInfo(pageInfo);
-      }
-
-      // 与 dataSource 同序的行状态，先铺平
-    }, {
-      key: "initRowState",
-      value: function initRowState() {
-        var _this3 = this;
-        var source = this._get_data('dataSource');
-        this._set_data('rowsDataState', (isArray(source) ? source : []).map(function (row) {
-          return (row === null || row === void 0 ? void 0 : row[_this3.getStatusFlag()]) || DataStates.Unchanged;
-        }), true);
+        var pageIndexField = this._get_data('innerUsedAttrs').pageIndex;
+        var pageSizeField = this._get_data('innerUsedAttrs').pageSize;
+        pageInfo[pageIndexField] = page.pageNo || page.pageIndex || pageInfo.pageIndex || 1;
+        pageInfo[pageSizeField] = page.pageSize || pageInfo.pageSize || DEFAULT_PAGE_SIZE;
+        if (this.get('pagination') === false) pageInfo[pageIndexField] = -1;
+        this._set_data('pageInfo', pageInfo);
       }
 
       /* ========================= 内部字段 / 开关 ========================= */
-    }, {
-      key: "getInnerUsedAttrs",
-      value: function getInnerUsedAttrs() {
-        return this._get_data('innerUsedAttrs');
-      }
-    }, {
-      key: "getIdFlag",
-      value: function getIdFlag() {
-        return this.getInnerUsedAttrs().id;
-      }
-    }, {
-      key: "getSelectedFlag",
-      value: function getSelectedFlag() {
-        return this.getInnerUsedAttrs().selected;
-      }
-    }, {
-      key: "getStatusFlag",
-      value: function getStatusFlag() {
-        return this.getInnerUsedAttrs().status;
-      }
     }, {
       key: "getRowKeyField",
       value: function getRowKeyField() {
         return this._get_data('rowKeyField') || 'id';
       }
-    }, {
-      key: "getProxyConfig",
-      value: function getProxyConfig() {
-        return this._get_data('proxyConfig') || {};
-      }
     }, {
       key: "isRemote",
       value: function isRemote() {
         return this._get_data('dataSourceMode') === 'remote';
       }
-    }, {
-      key: "isPagination",
-      value: function isPagination() {
-        return !!this.get('pagination') && this.getPageSize() !== -1;
-      }
     }, {
       key: "getReadOnly",
       value: function getReadOnly() {
@@ -2048,6 +1970,20 @@
       value: function setReadOnly(readOnly) {
         this._applyState('readOnly', !!readOnly);
       }
+    }, {
+      key: "setShowCheckbox",
+      value: function setShowCheckbox(value) {
+        this._applyState('showCheckBox', !!value);
+        // this._set_data('showCheckBox', value)
+        // this.doPropertyChange('setShowCheckbox', value)
+      }
+    }, {
+      key: "setShowRowNo",
+      value: function setShowRowNo(value) {
+        this._applyState('showRowNo', !!value);
+        // this._set_data('showRowNo', value)
+        // this.doPropertyChange('setShowRowNo', value)
+      }
     }, {
       key: "getParams",
       value: function getParams() {
@@ -2059,118 +1995,21 @@
         this._set_data('params', params || {});
       }
     }, {
-      key: "setMeta",
-      value: function setMeta(meta) {
-        this._set_data('meta', meta);
-      }
-
-      /* ============================= 列 ============================= */
-
-      /** 与中台一致：返回 object map（深拷贝），而不是数组 */
-    }, {
-      key: "getColumns",
-      value: function getColumns(fields) {
-        var columns = this._get_data('columns') || {};
-        var result = {};
-        var keys = fields ? isArray(fields) ? fields : [fields] : Object.getOwnPropertyNames(columns);
-        keys.forEach(function (key) {
-          if (!columns[key]) return;
-          result[key] = _objectSpread2(_objectSpread2({}, columns[key]), {}, {
-            fieldName: columns[key].fieldName || key
-          });
-        });
-        return result;
-      }
-    }, {
-      key: "getColumn",
-      value: function getColumn(field) {
-        var _this$_get_data;
-        var column = (_this$_get_data = this._get_data('columns')) === null || _this$_get_data === void 0 ? void 0 : _this$_get_data[field];
-        return column ? _objectSpread2(_objectSpread2({}, column), {}, {
-          fieldName: column.fieldName || field
-        }) : undefined;
-      }
-    }, {
-      key: "hasColumn",
-      value: function hasColumn(field) {
-        return !!(this._get_data('columns') || {})[field];
-      }
-    }, {
-      key: "getColumnList",
-      value: function getColumnList(fields) {
-        var columns = this.getColumns(fields);
-        return Object.keys(columns).sort(function (a, b) {
-          return (columns[a].index || 0) - (columns[b].index || 0);
-        }).map(function (key) {
-          return columns[key];
-        });
-      }
-    }, {
-      key: "getVisibleColumns",
-      value: function getVisibleColumns(fields) {
-        return this.getColumnList(fields).filter(function (column) {
-          return column.bHidden !== true && column.bShowIt !== false;
-        });
-      }
-    }, {
-      key: "setColumns",
-      value: function setColumns(columns) {
-        if (!columns) return;
-        this._applyState('columns', normalizeColumns(columns));
-      }
-    }, {
-      key: "setColumnMode",
-      value: function setColumnMode(mode) {
-        this._set_data('columnMode', mode === 'remote' ? 'remote' : 'local', true);
-      }
-    }, {
-      key: "addColumns",
-      value: function addColumns(columns) {
-        var map = normalizeColumns(columns);
-        this._applyState('columns', _objectSpread2(_objectSpread2({}, this._get_data('columns') || {}), map));
-      }
-    }, {
-      key: "resetColumns",
-      value: function resetColumns(columns) {
-        this.setColumns(columns || this.get('cColumns'));
-      }
-    }, {
-      key: "getColumnState",
-      value: function getColumnState(rowIndex, field, name) {
-        var _this$_get_data2;
-        var rowKey = this.getRowKey(rowIndex);
-        return rowKey ? (((_this$_get_data2 = this._get_data('cellState')) === null || _this$_get_data2 === void 0 || (_this$_get_data2 = _this$_get_data2[rowKey]) === null || _this$_get_data2 === void 0 ? void 0 : _this$_get_data2[field]) || {})[name] : undefined;
-      }
-    }, {
-      key: "setColumnState",
-      value: function setColumnState(rowIndex, field, name, value) {
-        this.setCellState(rowIndex, field, name, value);
-      }
-    }, {
-      key: "setColumnStates",
-      value: function setColumnStates() {
-        var states = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : [];
-        this.setCellStates(states.map(function (item) {
-          return _objectSpread2(_objectSpread2({}, item), {}, {
-            cellName: item.cellName || item.columnName
-          });
-        }));
+      key: "getInnerUsedAttrs",
+      value: function getInnerUsedAttrs() {
+        return this._get_data('innerUsedAttrs');
       }
     }, {
-      key: "setColumnValue",
-      value: function setColumnValue(field, name, value) {
-        var columns = this._get_data('columns') || {};
-        if (!columns[field]) return;
-        this._applyState('columns', _objectSpread2(_objectSpread2({}, columns), {}, _defineProperty({}, field, _objectSpread2(_objectSpread2({}, columns[field]), {}, _defineProperty({}, name, value)))));
+      key: "get",
+      value: function get() {
+        return this.getInnerUsedAttrs().id;
       }
 
-      /* ============================ 取数 ============================ */
-
       /* ======================= 数据写入 ======================= */
     }, {
       key: "setDataSource",
       value: function setDataSource(proxyConfig) {
-        var _this4 = this;
+        var _this3 = this;
         var queryParams = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
         var callback = arguments.length > 2 ? arguments[2] : undefined;
         if (this._get_data('dataSourceMode') === 'local') {
@@ -2178,28 +2017,27 @@
           _setData(data);
         } else {
           if (!this.execute('beforeProxyLoad', queryParams)) return;
-          var pageInfo = this._get_data('pageInfo');
-          pageInfo.pageIndex = 1;
-          this._set_data('proxyConfig', proxyConfig);
-          this._set_data('queryParams', queryParams);
-          this._set_data('loadDataCallback', callback);
+          this.setPageIndex(1);
           _getData.call(this, proxyConfig, queryParams, function (data) {
-            _setData.call(_this4, data);
-            callback === null || callback === void 0 || callback.call(_this4);
+            _setData.call(_this3, data);
+            callback === null || callback === void 0 || callback.call(_this3);
           });
         }
       }
     }, {
       key: "reload",
       value: function reload() {
-        var _this5 = this;
-        this.getProxy();
-        var proxyConfig = this._get_data('proxyConfig');
-        var queryParams = this._get_data('queryParams');
-        var callback = this._get_data('loadDataCallback');
+        var _this4 = this;
+        var proxyCache = this.getCache('proxyCache');
+        if (!proxyCache) {
+          console.log('[GridModel] proxyConfig is null');
+          return;
+        }
+        var proxyConfig = proxyCache.proxyConfig,
+          queryParams = proxyCache.params,
+          callback = proxyCache.callback;
         _getData.call(this, proxyConfig, queryParams, function (data) {
-          _setData.call(_this5, data);
-          callback === null || callback === void 0 || callback.call(_this5);
+          callback === null || callback === void 0 || callback.call(_this4, data);
         });
       }
 
@@ -2222,763 +2060,18 @@
       key: "getData",
       value: function getData(view, realRows) {
         var rows = view || realRows ? this._get_data('rows') : this._get_data('dataSource');
-        return this.collectRows(rows, view);
+        return rows;
       }
     }, {
       key: "getAllData",
       value: function getAllData() {
         return this.getData(true);
       }
-    }, {
-      key: "getPageData",
-      value: function getPageData() {
-        return this.getData(true);
-      }
-
-      /** 有效数据：全量里剔除 Delete 状态的行 */
-    }, {
-      key: "getEffeData",
-      value: function getEffeData() {
-        var source = this._get_data('dataSource') || [];
-        var rowsDataState = this._get_data('rowsDataState') || [];
-        return this.collectRows(source.filter(function (row, index) {
-          return rowsDataState[index] !== DataStates.Delete;
-        }), false);
-      }
-
-      /** 当前页行（浅引用），isCopy=true 时返回深拷贝 */
-    }, {
-      key: "getRows",
-      value: function getRows(isCopy) {
-        var rows = this._get_data('rows') || [];
-        return isCopy === false ? rows : rows.map(function (row) {
-          return cloneDeep(row);
-        });
-      }
-    }, {
-      key: "collectRows",
-      value: function collectRows(rows, view) {
-        var columns = this._get_data('columns') || {};
-        var statusFlag = this.getStatusFlag();
-        var selectedFlag = this.getSelectedFlag();
-        return (rows || []).map(function (rowData) {
-          var row = {};
-          for (var attr in rowData) {
-            var _columns$attr;
-            // 视图数据不带 _status；提交数据不带 _selected
-            if (view && attr === statusFlag) continue;
-            if (!view && attr === selectedFlag) continue;
-            if (((_columns$attr = columns[attr]) === null || _columns$attr === void 0 ? void 0 : _columns$attr.needCollect) === false) continue;
-            row[attr] = rowData[attr];
-          }
-          return row;
-        });
-      }
-
-      /** 展示文案副本（中台会把它推给组件；我们只作为工具方法保留） */
-    }, {
-      key: "getShowRows",
-      value: function getShowRows(rows) {
-        return (rows || this._get_data('rows') || []).map(function (row) {
-          return _objectSpread2({}, row);
-        });
-      }
-    }, {
-      key: "getRow",
-      value: function getRow(rowIndex, needGrandSon) {
-        var _this$_get_data3;
-        var row = (_this$_get_data3 = this._get_data('rows')) === null || _this$_get_data3 === void 0 ? void 0 : _this$_get_data3[rowIndex];
-        if (!row) return undefined;
-        return needGrandSon === false ? row : cloneDeep(row);
-      }
-    }, {
-      key: "getRowIndex",
-      value: function getRowIndex(row) {
-        if (!row) return -1;
-        var rows = this._get_data('rows') || [];
-        var rowKeyField = this.getRowKeyField();
-        if (row[rowKeyField] !== undefined) {
-          return rows.findIndex(function (item) {
-            return item[rowKeyField] === row[rowKeyField];
-          });
-        }
-        return rows.indexOf(row);
-      }
-    }, {
-      key: "getRowIndexByRowId",
-      value: function getRowIndexByRowId(rowId) {
-        var _this6 = this;
-        var rows = this._get_data('rows') || [];
-        return rows.findIndex(function (row) {
-          return (row === null || row === void 0 ? void 0 : row[_this6.getIdFlag()]) === rowId;
-        });
-      }
-    }, {
-      key: "getDataSourceIndexByRowId",
-      value: function getDataSourceIndexByRowId(rowId) {
-        var _this7 = this;
-        return (this._get_data('dataSource') || []).findIndex(function (row) {
-          return (row === null || row === void 0 ? void 0 : row[_this7.getIdFlag()]) === rowId;
-        });
-      }
-    }, {
-      key: "getRowKey",
-      value: function getRowKey(rowIndex) {
-        var _this$_get_data$rowIn, _this$_get_data4;
-        return (_this$_get_data$rowIn = (_this$_get_data4 = this._get_data('rows')) === null || _this$_get_data4 === void 0 || (_this$_get_data4 = _this$_get_data4[rowIndex]) === null || _this$_get_data4 === void 0 ? void 0 : _this$_get_data4[this.getIdFlag()]) !== null && _this$_get_data$rowIn !== void 0 ? _this$_get_data$rowIn : rowIndex;
-      }
-    }, {
-      key: "getRowKeys",
-      value: function getRowKeys(rowData) {
-        var list = rowData === undefined ? this.getRows() : isArray(rowData) ? rowData : [rowData];
-        var keyField = this.getRowKeyField();
-        return list.filter(function (row) {
-          return row && row[keyField] !== undefined;
-        }).map(function (row) {
-          return row[keyField];
-        });
-      }
-    }, {
-      key: "getRowsByIndexes",
-      value: function getRowsByIndexes(rowIndexes) {
-        var rows = this._get_data('rows') || [];
-        return (isArray(rowIndexes) ? rowIndexes : [rowIndexes]).map(function (index) {
-          return rows[index];
-        }).filter(Boolean);
-      }
-
-      /* ==================== 单元格值 / 单元格状态 ==================== */
-    }, {
-      key: "getCellValue",
-      value: function getCellValue(rowIndex, cellName) {
-        var _this$_get_data5;
-        var row = rowIndex >= 0 ? (_this$_get_data5 = this._get_data('rows')) === null || _this$_get_data5 === void 0 ? void 0 : _this$_get_data5[rowIndex] : null;
-        if (!row || !cellName) return undefined;
-        return row[cellName];
-      }
-    }, {
-      key: "setCellValue",
-      value: function setCellValue(rowIndex, cellName, value) {
-        var rows = this._get_data('rows') || [];
-        var row = rows[rowIndex];
-        if (!row || !cellName) return;
-        var oldValue = row[cellName];
-        if (oldValue === value) return;
-        var data = {
-          rowIndex: rowIndex,
-          rowId: row[this.getIdFlag()],
-          cellName: cellName,
-          value: value,
-          oldValue: oldValue
-        };
-        if (!this.execute('beforeCellValueChange', data)) return;
-        row[cellName] = data.value;
-        this.markRowState(rowIndex, DataStates.Update);
-        this.execute('afterCellValueChange', data);
-        this.doPropertyChange('setCellValue', data);
-      }
-    }, {
-      key: "setCellValues",
-      value: function setCellValues() {
-        var _this8 = this;
-        var values = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : [];
-        if (!isArray(values)) return;
-        values.forEach(function (item) {
-          return _this8.setCellValue(item.rowIndex, item.cellName || item.field, item.value);
-        });
-      }
-    }, {
-      key: "getCellState",
-      value: function getCellState(rowIndex, cellName, name) {
-        var _this$_get_data6;
-        var rowKey = this.getRowKey(rowIndex);
-        var cell = rowKey ? (_this$_get_data6 = this._get_data('cellState')) === null || _this$_get_data6 === void 0 || (_this$_get_data6 = _this$_get_data6[rowKey]) === null || _this$_get_data6 === void 0 ? void 0 : _this$_get_data6[cellName] : null;
-        if (!cell) return undefined;
-        return cell[name];
-      }
-    }, {
-      key: "setCellState",
-      value: function setCellState(rowIndex, cellName, name, value) {
-        var _this$_get_data7;
-        var rowId = (_this$_get_data7 = this._get_data('rows')) === null || _this$_get_data7 === void 0 || (_this$_get_data7 = _this$_get_data7[rowIndex]) === null || _this$_get_data7 === void 0 ? void 0 : _this$_get_data7[this.getIdFlag()];
-        var rowKey = rowId || rowIndex;
-        if (isEmpty(rowKey)) return;
-        var oldValue = this.getCellState(rowIndex, cellName, name);
-        if (oldValue === value) return;
-        var data = {
-          rowIndex: rowIndex,
-          rowId: rowId,
-          cellName: cellName,
-          propertyName: name,
-          value: value,
-          oldValue: oldValue
-        };
-        if (!this.execute('beforeCellStateChange', data)) return;
-        var cellState = _objectSpread2({}, this._get_data('cellState') || {});
-        cellState[rowKey] = _objectSpread2({}, cellState[rowKey] || {});
-        cellState[rowKey][cellName] = _objectSpread2(_objectSpread2({}, cellState[rowKey][cellName] || {}), {}, _defineProperty({}, name, value));
-        this._applyState('cellState', cellState);
-        this.execute('afterCellStateChange', data);
-      }
-    }, {
-      key: "setCellStates",
-      value: function setCellStates() {
-        var _this9 = this;
-        var states = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : [];
-        if (!isArray(states)) return;
-        states.forEach(function (item) {
-          return _this9.setCellState(item.rowIndex, item.cellName, item.propertyName || item.name, item.value);
-        });
-      }
-
-      /* ==================== 行状态 / 脏数据 ==================== */
-
-      /** 行数据状态（Insert / Update / Delete / 空），rowIndex 是 rows 的下标 */
-    }, {
-      key: "getRowDataState",
-      value: function getRowDataState(rowIndex) {
-        var _this$_get_data8;
-        var indexInDS = this.getDataSourceIndexByRow(rowIndex);
-        return (_this$_get_data8 = this._get_data('rowsDataState')) === null || _this$_get_data8 === void 0 ? void 0 : _this$_get_data8[indexInDS];
-      }
-    }, {
-      key: "getDataSourceIndexByRow",
-      value: function getDataSourceIndexByRow(rowIndex) {
-        var _this0 = this;
-        var rows = this._get_data('rows') || [];
-        var row = rows[rowIndex];
-        if (!row) return -1;
-        var source = this._get_data('dataSource') || [];
-        var index = source.indexOf(row);
-        if (index > -1) return index;
-        // 本地分页时 rows 是切片，引用一致；远程模式下 rows 与 dataSource 同源
-        return source.findIndex(function (item) {
-          return (item === null || item === void 0 ? void 0 : item[_this0.getIdFlag()]) === (row === null || row === void 0 ? void 0 : row[_this0.getIdFlag()]);
-        });
-      }
-    }, {
-      key: "setRowDataState",
-      value: function setRowDataState(rowIndex, dataState) {
-        var indexInDS = this.getDataSourceIndexByRow(rowIndex);
-        if (indexInDS < 0) return;
-        var rowsDataState = _toConsumableArray(this._get_data('rowsDataState') || []);
-        rowsDataState[indexInDS] = dataState;
-        this._set_data('rowsDataState', rowsDataState, true);
-      }
-
-      // 只在「原状态是 Unchanged」时置为 Update，避免把 Insert 覆盖成 Update
-    }, {
-      key: "markRowState",
-      value: function markRowState(rowIndex, dataState) {
-        var current = this.getRowDataState(rowIndex);
-        if (current === DataStates.Insert || current === dataState) return;
-        this.setRowDataState(rowIndex, dataState);
-      }
-
-      /** 单元格编辑由组件回灌时用：传行对象或行下标都可以 */
-    }, {
-      key: "markRowUpdate",
-      value: function markRowUpdate(rowOrIndex) {
-        var rowIndex = typeof rowOrIndex === 'number' ? rowOrIndex : this.getRowIndex(rowOrIndex);
-        if (rowIndex < 0) return;
-        this.markRowState(rowIndex, DataStates.Update);
-      }
-    }, {
-      key: "getRowState",
-      value: function getRowState(rowIndex, name) {
-        var _this$_get_data9;
-        var rowKey = this.getRowKey(rowIndex);
-        var row = rowKey ? (_this$_get_data9 = this._get_data('rowState')) === null || _this$_get_data9 === void 0 ? void 0 : _this$_get_data9[rowKey] : null;
-        if (!row || !name) return undefined;
-        return row[name];
-      }
-    }, {
-      key: "setRowState",
-      value: function setRowState(rowIndex, name, value) {
-        var _this$_get_data0;
-        var row = (_this$_get_data0 = this._get_data('rows')) === null || _this$_get_data0 === void 0 ? void 0 : _this$_get_data0[rowIndex];
-        if (!row || !name) return;
-        var rowKey = this.getRowKey(rowIndex);
-        var oldValue = this.getRowState(rowIndex, name);
-        if (oldValue === value) return;
-        var data = {
-          rowIndex: rowIndex,
-          rowId: row[this.getIdFlag()],
-          propertyName: name,
-          value: value,
-          oldValue: oldValue
-        };
-        if (!this.execute('beforeRowStateChange', data)) return;
-        var rowState = _objectSpread2({}, this._get_data('rowState') || {});
-        rowState[rowKey] = _objectSpread2(_objectSpread2({}, rowState[rowKey] || {}), {}, _defineProperty({}, name, value));
-        this._applyState('rowState', rowState);
-        this.execute('afterRowStateChange', data);
-      }
-    }, {
-      key: "setRowStates",
-      value: function setRowStates() {
-        var _this1 = this;
-        var states = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : [];
-        if (!isArray(states)) return;
-        states.forEach(function (item) {
-          return _this1.setRowState(item.rowIndex, item.propertyName || item.name, item.value);
-        });
-      }
-
-      /** 收集增删改过的行，用于提交；没有脏数据时返回 undefined（中台同款） */
-    }, {
-      key: "getDirtyData",
-      value: function getDirtyData(necessary) {
-        var _this10 = this;
-        var source = this._get_data('dataSource') || [];
-        var rowsDataState = this._get_data('rowsDataState') || [];
-        var data = [];
-        source.forEach(function (row, index) {
-          var dataState = rowsDataState[index];
-          if (!dataState) return;
-          var item = cloneDeep(row);
-          item[_this10.getStatusFlag()] = dataState;
-          data.push(item);
-        });
-        return data.length ? data : undefined;
-      }
-    }, {
-      key: "getDirtyRowIndexes",
-      value: function getDirtyRowIndexes() {
-        var _this11 = this;
-        var rows = this._get_data('rows') || [];
-        return rows.map(function (row, index) {
-          return index;
-        }).filter(function (index) {
-          return !!_this11.getRowDataState(index);
-        });
-      }
-    }, {
-      key: "isDirty",
-      value: function isDirty() {
-        return !!this.getDirtyData();
-      }
-
-      // 备份 / 还原未提交的数据（取消编辑时用）
-    }, {
-      key: "backupState",
-      value: function backupState() {
-        this._set_data('backupData', {
-          dataSource: cloneDeep(this._get_data('dataSource') || []),
-          rowsDataState: _toConsumableArray(this._get_data('rowsDataState') || [])
-        });
-      }
-    }, {
-      key: "restoreState",
-      value: function restoreState() {
-        var backup = this._get_data('backupData');
-        if (!backup) return;
-        this._set_data('dataSource', backup.dataSource, true);
-        this._set_data('rowsDataState', _toConsumableArray(backup.rowsDataState), true);
-        this.showPage();
-      }
-
-      /* ======================= 增删改行 ======================= */
-
-      /** 中台签名：insertRow(rowIndex, rowData, needCheckDefault, isCopy, extendParams) */
-    }, {
-      key: "insertRow",
-      value: function insertRow(rowIndex) {
-        var rowData = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
-        var isCopy = arguments.length > 3 ? arguments[3] : undefined;
-        var rows = this._get_data('rows') || [];
-        var index = Math.min(rows.length, Math.max(0, rowIndex === undefined ? rows.length : rowIndex));
-        var data = {
-          index: index,
-          row: _objectSpread2({}, rowData),
-          isCopy: isCopy
-        };
-        if (!this.execute('beforeInsertRow', data)) return;
-        var row = data.row;
-        delete row[this.getIdFlag()];
-        setIds.call(this, [row]);
-        var source = this._get_data('dataSource') || [];
-        var indexInDS = index < rows.length ? this.getDataSourceIndexByRow(index) : source.length;
-        source.splice(indexInDS < 0 ? source.length : indexInDS, 0, row);
-        var rowsDataState = _toConsumableArray(this._get_data('rowsDataState') || []);
-        rowsDataState.splice(indexInDS < 0 ? rowsDataState.length : indexInDS, 0, DataStates.Insert);
-        rows.splice(index, 0, row);
-        this._set_data('rowsDataState', rowsDataState, true);
-        this.setRows(rows);
-        this.execute('afterInsertRow', _objectSpread2(_objectSpread2({}, data), {}, {
-          rowIndex: index
-        }));
-        return row;
-      }
-    }, {
-      key: "insertRows",
-      value: function insertRows(rowIndex) {
-        var _this12 = this;
-        var rowsData = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : [];
-        var result = [];
-        (isArray(rowsData) ? rowsData : [rowsData]).forEach(function (rowData, offset) {
-          result.push(_this12.insertRow(rowIndex + offset, rowData));
-        });
-        return result;
-      }
-    }, {
-      key: "appendRow",
-      value: function appendRow() {
-        var rowData = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
-        return this.insertRow(this.getRowsCount(), rowData);
-      }
-    }, {
-      key: "updateRow",
-      value: function updateRow(rowIndex) {
-        var _this$_get_data1;
-        var rowData = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
-        var row = (_this$_get_data1 = this._get_data('rows')) === null || _this$_get_data1 === void 0 ? void 0 : _this$_get_data1[rowIndex];
-        if (!row) return;
-        if (!this.execute('beforeUpdateRow', {
-          index: rowIndex,
-          row: rowData
-        })) return;
-        Object.assign(row, rowData);
-        this.markRowState(rowIndex, DataStates.Update);
-        this.setRows(this._get_data('rows'));
-        this.execute('afterUpdateRow', {
-          index: rowIndex,
-          row: row
-        });
-      }
-    }, {
-      key: "updateRows",
-      value: function updateRows() {
-        var _this13 = this;
-        var rowsData = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : [];
-        rowsData.forEach(function (item) {
-          var _item$rowIndex;
-          return _this13.updateRow((_item$rowIndex = item.rowIndex) !== null && _item$rowIndex !== void 0 ? _item$rowIndex : item.index, item.rowData || item.row);
-        });
-      }
-
-      /** 删除行：有 id 的行标 Delete 保留占位，本地新增未保存的行直接丢弃（中台同款） */
-    }, {
-      key: "deleteRows",
-      value: function deleteRows(rowIndexes) {
-        var _this14 = this;
-        var indexes = (isArray(rowIndexes) ? rowIndexes : [rowIndexes]).filter(function (index) {
-          return index >= 0 && index < _this14.getRowsCount();
-        }).sort(function (a, b) {
-          return a - b;
-        });
-        if (!indexes.length) return;
-        var rowsToDelete = this.getRowsByIndexes(indexes);
-        if (!this.execute('beforeDeleteRows', rowsToDelete, indexes)) return;
-        var source = this._get_data('dataSource') || [];
-        var rowsDataState = _toConsumableArray(this._get_data('rowsDataState') || []);
-        var deletedIds = new Set();
-        // 本地新增的行不需要保留占位，直接从数据源里抹掉
-        var discardIds = new Set();
-        rowsToDelete.forEach(function (row) {
-          var index = source.indexOf(row);
-          if (index < 0) return;
-          var key = row[_this14.getIdFlag()];
-          deletedIds.add(key);
-          if (rowsDataState[index] === DataStates.Insert) discardIds.add(key);
-        });
-        var keptSource = [];
-        var keptState = [];
-        source.forEach(function (row, index) {
-          var key = row[_this14.getIdFlag()];
-          if (!deletedIds.has(key)) {
-            keptSource.push(row);
-            keptState.push(rowsDataState[index]);
-            return;
-          }
-          if (discardIds.has(key)) return;
-          keptSource.push(row);
-          keptState.push(DataStates.Delete);
-        });
-        this._set_data('dataSource', keptSource, true);
-        this._set_data('rowsDataState', keptState, true);
-        // 本地模式下重新切片即可，删除行会自然消失在当前页
-        this.showPage();
-        this.execute('afterDeleteRows', {
-          rowIndexes: indexes,
-          rows: rowsToDelete
-        });
-      }
-    }, {
-      key: "deleteAllRows",
-      value: function deleteAllRows() {
-        this.deleteRows(this.getRows().map(function (row, index) {
-          return index;
-        }));
-      }
     }, {
       key: "clear",
       value: function clear() {
         this._set_data('dataSource', [], true);
         this._set_data('rows', [], true);
-        this._set_data('rowsDataState', [], true);
-        this.clearSelection();
-        this.applyPageInfo(_objectSpread2(_objectSpread2({}, this.getPageInfo()), {}, {
-          recordCount: 0,
-          pageIndex: 1
-        }));
-        this.setDataSourceView();
-      }
-
-      /* ======================= 选中 ======================= */
-
-      /**
-       * 选中行
-       * @param {Number|Array} rowIndexes rows 下标
-       * @param {Boolean} all true = 替换选择（先清掉其他选中），默认 false = 追加
-       */
-    }, {
-      key: "select",
-      value: function select(rowIndexes, all) {
-        var _this15 = this;
-        if (rowIndexes == null && all !== true) return;
-        if (all === true) this.unselectAll({
-          silent: true
-        });
-        var indexes = all === true ? this.getRows().map(function (row, index) {
-          return index;
-        }) : isArray(rowIndexes) ? rowIndexes : [rowIndexes];
-        indexes = indexes.filter(function (index) {
-          return index >= 0 && index < _this15.getRowsCount();
-        });
-        var rows = this._get_data('rows') || [];
-        var selectedFlag = this.getSelectedFlag();
-        var changed = indexes.filter(function (index) {
-          return !rows[index][selectedFlag];
-        });
-        if (!changed.length) {
-          if (all === true) this.flushSelection();
-          return;
-        }
-        var data = {
-          rowIndexes: changed,
-          rows: changed.map(function (index) {
-            return rows[index];
-          })
-        };
-        if (!this.execute('beforeSelect', data)) return;
-        changed.forEach(function (index) {
-          rows[index][selectedFlag] = true;
-          _this15.cacheSelectedRow(rows[index], true);
-        });
-        this.flushSelection();
-      }
-    }, {
-      key: "unselect",
-      value: function unselect(rowIndexes) {
-        var _this16 = this;
-        if (rowIndexes == null) return;
-        var indexes = isArray(rowIndexes) ? rowIndexes : [rowIndexes];
-        var rows = this._get_data('rows') || [];
-        var selectedFlag = this.getSelectedFlag();
-        var changed = indexes.filter(function (index) {
-          var _rows$index;
-          return (_rows$index = rows[index]) === null || _rows$index === void 0 ? void 0 : _rows$index[selectedFlag];
-        });
-        if (!changed.length) return;
-        if (!this.execute('beforeUnselect', changed)) return;
-        changed.forEach(function (index) {
-          rows[index][selectedFlag] = false;
-          _this16.cacheSelectedRow(rows[index], false);
-        });
-        this.flushSelection();
-      }
-    }, {
-      key: "selectAll",
-      value: function selectAll() {
-        var _this17 = this;
-        var rows = this._get_data('rows') || [];
-        var selectedFlag = this.getSelectedFlag();
-        rows.forEach(function (row) {
-          row[selectedFlag] = true;
-          _this17.cacheSelectedRow(row, true);
-        });
-        this.flushSelection();
-      }
-
-      /**
-       * 清空选中
-       * @param {Object} options onlyPage=true 只清当前页（其他页的跨页缓存保留）；silent=true 不下发视图
-       *
-       * 注意要清 **dataSource** 上的行：`_selected` 记在行对象上，
-       * 而本地分页时当前页的 rows 只是 dataSource 的切片，只清 rows 会让翻页回来的行「带着选中复活」。
-       */
-    }, {
-      key: "unselectAll",
-      value: function unselectAll() {
-        var _this18 = this;
-        var options = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
-        var selectedFlag = this.getSelectedFlag();
-        var targets = options.onlyPage ? this._get_data('rows') : this._get_data('dataSource');
-        (targets || []).forEach(function (row) {
-          row[selectedFlag] = false;
-        });
-        if (options.onlyPage) {
-          (this._get_data('rows') || []).forEach(function (row) {
-            return _this18.cacheSelectedRow(row, false);
-          });
-        } else {
-          this._set_data('selectedKeys', [], true);
-          this._set_data('selectedRowsMap', {}, true);
-          this._set_data('selectedKeysSet', new Set(), true);
-        }
-        if (!options.silent) this.flushSelection();
-      }
-    }, {
-      key: "clearSelection",
-      value: function clearSelection() {
-        this.unselectAll();
-      }
-
-      /**
-       * 以传入的行集合作为**当前页**的选中结果（表格选中变化回灌的入口）。
-       * 其他页的跨页选中缓存不受影响 —— 表格的勾选状态只覆盖当前页，
-       * 若在这里清空缓存，翻页就会把之前选的行丢掉。
-       */
-    }, {
-      key: "setSelectedRows",
-      value: function setSelectedRows() {
-        var _this19 = this;
-        var rows = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : [];
-        var list = isArray(rows) ? rows : [];
-        var keyField = this.getRowKeyField();
-        var keys = new Set(list.map(function (row) {
-          var _row$keyField;
-          return String((_row$keyField = row === null || row === void 0 ? void 0 : row[keyField]) !== null && _row$keyField !== void 0 ? _row$keyField : row);
-        }));
-        var currentRows = this._get_data('rows') || [];
-        var selectedFlag = this.getSelectedFlag();
-        currentRows.forEach(function (row) {
-          var selected = keys.has(String(row[keyField]));
-          if (selected !== !!row[selectedFlag]) {
-            row[selectedFlag] = selected;
-            _this19.cacheSelectedRow(row, selected);
-          }
-        });
-        this.flushSelection();
-      }
-
-      /** 全量替换选中（含清掉其他页的缓存） */
-    }, {
-      key: "setSelection",
-      value: function setSelection() {
-        var rows = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : [];
-        this.unselectAll({
-          silent: true
-        });
-        this.setSelectedRows(rows);
-      }
-    }, {
-      key: "getSelectedRows",
-      value: function getSelectedRows(rowIndexes) {
-        var rows = this._get_data('rows') || [];
-        var selectedFlag = this.getSelectedFlag();
-        var keys = rowIndexes && new Set(isArray(rowIndexes) ? rowIndexes : [rowIndexes]);
-        return rows.filter(function (row, index) {
-          return row[selectedFlag] && (!keys || keys.has(index));
-        });
-      }
-    }, {
-      key: "getSelectedRowIndexes",
-      value: function getSelectedRowIndexes() {
-        var rows = this._get_data('rows') || [];
-        var selectedFlag = this.getSelectedFlag();
-        var indexes = [];
-        rows.forEach(function (row, index) {
-          if (row[selectedFlag]) indexes.push(index);
-        });
-        return indexes;
-      }
-    }, {
-      key: "getSelectedKeys",
-      value: function getSelectedKeys() {
-        return this._get_data('selectedKeys') || [];
-      }
-
-      /** 跨页选中的全部行（按选中顺序） */
-    }, {
-      key: "getAllCacheSelectedRows",
-      value: function getAllCacheSelectedRows() {
-        var keys = this._get_data('selectedKeys') || [];
-        var rowsMap = this._get_data('selectedRowsMap') || {};
-        return keys.map(function (key) {
-          return rowsMap[key];
-        }).filter(Boolean);
-      }
-    }, {
-      key: "selectByKeys",
-      value: function selectByKeys(keys) {
-        var selected = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : true;
-        var rowKeyField = this.getRowKeyField();
-        var list = isArray(keys) ? keys : [keys];
-        var rows = this._get_data('rows') || [];
-        var indexes = [];
-        list.forEach(function (key) {
-          var index = rows.findIndex(function (row) {
-            return String(row[rowKeyField]) === String(key);
-          });
-          if (index > -1) indexes.push(index);
-        });
-        if (!indexes.length) return;
-        selected ? this.select(indexes) : this.unselect(indexes);
-      }
-    }, {
-      key: "getSelectedNodes",
-      value: function getSelectedNodes() {
-        return this.getAllCacheSelectedRows();
-      }
-    }, {
-      key: "cacheSelectedRow",
-      value: function cacheSelectedRow(row, selected) {
-        var key = String(row === null || row === void 0 ? void 0 : row[this.getRowKeyField()]);
-        var keys = (this._get_data('selectedKeys') || []).filter(function (item) {
-          return item !== key;
-        });
-        var rowsMap = _objectSpread2({}, this._get_data('selectedRowsMap') || {});
-        if (selected) keys.push(key);
-        if (selected) rowsMap[key] = row;else delete rowsMap[key];
-        this._set_data('selectedKeys', keys, true);
-        this._set_data('selectedRowsMap', rowsMap, true);
-        this._set_data('selectedKeysSet', new Set(keys), true);
-      }
-
-      // 选中变化统一在这里下发视图（组件侧用同步开关挡住回灌死循环）
-    }, {
-      key: "flushSelection",
-      value: function flushSelection() {
-        this._applyState('selectedRows', this.getSelectedRows());
-        this.execute('selectionChange', {
-          value: this.getSelectedRows(),
-          keys: this.getSelectedKeys(),
-          indexes: this.getSelectedRowIndexes()
-        });
-      }
-
-      // 重新取数后把跨页选中的标记补回当前页的行上
-    }, {
-      key: "restoreSelectedFlags",
-      value: function restoreSelectedFlags() {
-        if (!this.get('cacheSelectedRows')) return;
-        var keysSet = this._get_data('selectedKeysSet') || new Set();
-        if (!keysSet.size) return;
-        var rowKeyField = this.getRowKeyField();
-        var selectedFlag = this.getSelectedFlag();
-        (this.getRows() || []).forEach(function (row) {
-          row[selectedFlag] = keysSet.has(String(row[rowKeyField]));
-        });
-      }
-
-      /* ======================= 分页 ======================= */
-    }, {
-      key: "setPagination",
-      value: function setPagination(value) {
-        this._applyState('pagination', !!value);
-        this.showPage();
       }
     }, {
       key: "getPageInfo",
@@ -2988,192 +2081,64 @@
     }, {
       key: "getPageIndex",
       value: function getPageIndex() {
-        return this.getPageInfo().pageIndex;
+        var pageIndexField = this._get_data('innerUsedAttrs').pageIndex;
+        return this.getPageInfo()[pageIndexField];
       }
     }, {
       key: "getPageSize",
       value: function getPageSize() {
-        return this.getPageInfo().pageSize;
+        var pageSizeField = this._get_data('innerUsedAttrs').pageSize;
+        return this.getPageInfo()[pageSizeField];
       }
     }, {
       key: "getTotalCount",
       value: function getTotalCount() {
-        return this.getPageInfo().recordCount;
+        var totalField = this._get_data('innerUsedAttrs').pageCount;
+        return this.getPageInfo()[totalField];
       }
     }, {
       key: "setPageInfo",
       value: function setPageInfo(pageInfo) {
-        this.applyPageInfo(_objectSpread2(_objectSpread2({}, this.getPageInfo()), pageInfo), {
-          refresh: true
-        });
+        var _pageInfo = this.getPageInfo();
+        this._set_data('pageInfo', _objectSpread2(_objectSpread2({}, _pageInfo), pageInfo));
+        this.reload();
       }
     }, {
       key: "setPageIndex",
       value: function setPageIndex(pageIndex) {
-        var refresh = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : true;
         if (typeof pageIndex !== 'number') return;
-        this.applyPageInfo(_objectSpread2(_objectSpread2({}, this.getPageInfo()), {}, {
-          pageIndex: Math.max(1, pageIndex)
-        }), {
-          refresh: refresh
-        });
+        var pageIndexField = this._get_data('innerUsedAttrs').pageIndex;
+        this._get_data('innerUsedAttrs').pageSize;
+        this._set_data('pageInfo', _objectSpread2(_objectSpread2({}, this.getPageInfo()), {}, _defineProperty({}, pageIndexField, Math.max(1, pageIndex))));
       }
     }, {
       key: "setPageSize",
       value: function setPageSize(pageSize) {
-        var refresh = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : true;
         if (typeof pageSize !== 'number') return;
-        // 与中台一致：pageSize = -1 表示不分页
-        this.applyPageInfo(_objectSpread2(_objectSpread2({}, this.getPageInfo()), {}, {
-          pageSize: Math.max(-1, pageSize),
-          pageIndex: 1
-        }), {
-          refresh: refresh
-        });
-      }
-    }, {
-      key: "setRecordCount",
-      value: function setRecordCount(recordCount) {
-        this.applyPageInfo(_objectSpread2(_objectSpread2({}, this.getPageInfo()), {}, {
-          recordCount: recordCount || 0
-        }));
-      }
-
-      /**
-       * 统一的分页写入：算 pageCount / 记录 begin~end、切片、下发视图
-       * @param {Object} options silent=true 时不通知视图（组件自己的翻页动作走这里）
-       */
-    }, {
-      key: "applyPageInfo",
-      value: function applyPageInfo(pageInfo) {
-        var options = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
-        var next = _objectSpread2({}, pageInfo || {});
-        var pageSize = next.pageSize === -1 ? -1 : next.pageSize || DEFAULT_PAGE_SIZE;
-        var recordCount = next.recordCount || 0;
-        // recordCount 还没取到时不要按 pageCount 夹 pageIndex，否则「跳第 N 页」会被压回第 1 页
-        var known = recordCount > 0;
-        next.pageSize = pageSize;
-        next.recordCount = recordCount;
-        next.pageCount = pageSize > 0 ? Math.max(1, Math.ceil(recordCount / pageSize)) : 1;
-        next.pageIndex = pageSize > 0 ? Math.max(1, known ? Math.min(next.pageIndex || 1, next.pageCount) : next.pageIndex || 1) : 1;
-        next.beginPageIndex = pageSize > 0 ? (next.pageIndex - 1) * pageSize + 1 : 1;
-        next.endPageIndex = pageSize > 0 ? Math.min(next.pageIndex * pageSize, recordCount) : recordCount;
-        this._set_data('pageInfo', next, true);
-        if (options.silent) return next;
-        this._applyState('pageInfo', next);
-        if (!this.isRemote()) this.showPage();
-        if (options.refresh && this.isRemote()) this.refresh();
-        return next;
-      }
-
-      /** 本地分页：按 pageInfo 从 dataSource 切出当前页 rows */
-    }, {
-      key: "showPage",
-      value: function showPage() {
-        var source = this._get_data('dataSource') || [];
-        if (this.isRemote() || !this.isPagination()) {
-          this.setRows(source);
-          return;
-        }
-        var _this$getPageInfo = this.getPageInfo(),
-          pageIndex = _this$getPageInfo.pageIndex,
-          pageSize = _this$getPageInfo.pageSize;
-        var start = (pageIndex - 1) * pageSize;
-        this.setRows(source.slice(start, start + pageSize));
+        // pageSize = -1 表示不分页
+        var pageIndexField = this._get_data('innerUsedAttrs').pageIndex;
+        var pageSizeField = this._get_data('innerUsedAttrs').pageSize;
+        this._set_data('pageInfo', _objectSpread2(_objectSpread2({}, this.getPageInfo()), {}, _defineProperty(_defineProperty({}, pageSizeField, Math.max(-1, pageSize)), pageIndexField, 1)));
       }
-
-      /** 只换当前页 rows（中台 setRows） */
-    }, {
-      key: "setRows",
-      value: function setRows(rows) {
-        var list = isArray(rows) ? rows : [];
-        this._set_data('rows', list, true);
-        this.setRowsIdMap();
-        // 注意：这里推的是原始行对象，而不是中台的 getShowRows() 展示副本 —— 否则
-        // 选中回灌、单元格编辑会落到副本上，模型与视图的数据对不上
-        this._applyState('data', list);
-      }
-    }, {
-      key: "setDataSourceView",
-      value: function setDataSourceView() {
-        this._applyState('data', this._get_data('rows') || []);
-      }
-    }, {
-      key: "setRowsIdMap",
-      value: function setRowsIdMap() {
-        var _this20 = this;
-        var map = {};
-        (this._get_data('rows') || []).forEach(function (row) {
-          if ((row === null || row === void 0 ? void 0 : row[_this20.getIdFlag()]) !== undefined) map[row[_this20.getIdFlag()]] = row;
-        });
-        this._set_data('rowsIdMap', map);
-      }
-    }, {
-      key: "getRowIdMap",
-      value: function getRowIdMap() {
-        return this._get_data('rowsIdMap') || {};
-      }
-
-      /* ======================= 校验 ======================= */
-
-      /**
-       * 必输校验（中台会把校验委托给 editRowModel，我们这层没有行模型，只做列级必输）
-       * @returns {Boolean} 通过返回 true，不通过返回 false，并把消息推给视图（validate 事件）
-       */
     }, {
-      key: "validate",
-      value: function validate(cancel, paramsRowsIndex) {
-        var _this21 = this;
-        if (cancel) {
-          this.doPropertyChange('validate', {
-            type: '',
-            message: '',
-            errors: []
-          });
-          this._set_data('validateErrors', []);
-          return false;
-        }
-        this.deleteNotModifiedRows();
-        var columns = this._get_data('columns') || {};
-        var rows = paramsRowsIndex ? this.getRowsByIndexes(paramsRowsIndex) : this.getRows();
-        var errors = [];
-        rows.forEach(function (row, index) {
-          for (var field in columns) {
-            var column = columns[field];
-            if (!_this21.isRequiredColumn(column)) continue;
-            var value = row[field];
-            var empty = isEmpty(value) || isArray(value) && !value.length || isEmptyObject(value);
-            if (!empty) continue;
-            var caption = column.cShowCaption || column.cCaption || column.cCaption || column.title || field;
-            errors.push({
-              rowIndex: index,
-              rowId: row[_this21.getIdFlag()],
-              cellName: field,
-              message: "".concat(caption, "\u4E0D\u80FD\u4E3A\u7A7A")
-            });
-            _this21.setCellState(index, field, 'msg', '不能为空');
-          }
-        });
-        this._set_data('validateErrors', errors);
-        var message = errors.length ? errors[0].message : '';
-        this.doPropertyChange('validate', {
-          type: errors.length ? 'error' : '',
-          message: message,
-          errors: errors
-        });
-        this.execute('afterValidate', {
-          valid: !errors.length,
-          errors: errors
-        });
-        return !errors.length;
+      key: "setTotalCount",
+      value: function setTotalCount(total) {
+        var totalField = this._get_data('innerUsedAttrs').pageCount;
+        this.getPageInfo()[totalField] = total;
       }
     }]);
-  }(BaseModel);
+  }(BaseModel$1);
 
-  var ViewModel = /*#__PURE__*/function (_BaseModel) {
+  var ViewModel$1 = /*#__PURE__*/function (_BaseModel) {
     function ViewModel() {
+      var _this;
       _classCallCheck(this, ViewModel);
-      return _callSuper(this, ViewModel, arguments);
+      for (var _len = arguments.length, args = new Array(_len), _key = 0; _key < _len; _key++) {
+        args[_key] = arguments[_key];
+      }
+      _this = _callSuper(this, ViewModel, [].concat(args));
+      _defineProperty(_this, "modelType", 'ViewModel');
+      return _this;
     }
     _inherits(ViewModel, _BaseModel);
     return _createClass(ViewModel, [{
@@ -3189,7 +2154,7 @@
     }, {
       key: "set",
       value: function set(propertyName, value) {
-        if (value instanceof BaseModel) {
+        if (value instanceof BaseModel$1) {
           value.setParent(this);
           value.setName(propertyName);
         }
@@ -3215,12 +2180,12 @@
     }, {
       key: "getData",
       value: function getData() {
-        var _this = this;
+        var _this2 = this;
         var propertyNames = this._get_data('propertyNames') || [];
         var data = {};
         propertyNames.forEach(function (propertyName) {
-          var property = _this.get(propertyName);
-          if (property instanceof BaseModel && property._get_data('needCollect') !== false) {
+          var property = _this2.get(propertyName);
+          if (property instanceof BaseModel$1 && property._get_data('needCollect') !== false) {
             var _property$getData;
             data[propertyName] = (_property$getData = property.getData) === null || _property$getData === void 0 ? void 0 : _property$getData.call(property);
           }
@@ -3235,13 +2200,13 @@
     }, {
       key: "getAllData",
       value: function getAllData(withOutGrid) {
-        var _this2 = this;
+        var _this3 = this;
         var propertyNames = this._get_data('propertyNames') || [];
         var rawData = {};
         propertyNames.forEach(function (propertyName) {
           var _property$getData2;
-          var property = _this2.get(propertyName);
-          if (!(property instanceof BaseModel) || property._get_data('needCollect') === false) {
+          var property = _this3.get(propertyName);
+          if (!(property instanceof BaseModel$1) || property._get_data('needCollect') === false) {
             return;
           }
           if (withOutGrid && property._get_data('isGrid')) {
@@ -3276,11 +2241,11 @@
     }, {
       key: "clear",
       value: function clear(useDefault) {
-        var _this3 = this;
+        var _this4 = this;
         var propertyNames = this._get_data('propertyNames') || [];
         propertyNames.forEach(function (propertyName) {
-          var property = _this3.get(propertyName);
-          if (property instanceof BaseModel && property._get_data('needClear') !== false) {
+          var property = _this4.get(propertyName);
+          if (property instanceof BaseModel$1 && property._get_data('needClear') !== false) {
             var _property$clear;
             (_property$clear = property.clear) === null || _property$clear === void 0 || _property$clear.call(property, useDefault);
           }
@@ -3314,7 +2279,7 @@
         var propertyNames = this._get_data('propertyNames');
         for (var i = 0, len = propertyNames.length; i < len; i++) {
           gridModel = this.get(propertyNames[i]);
-          var isGridModel = gridModel instanceof GridModel || gridModel.modelType == 'GridModel';
+          var isGridModel = gridModel instanceof GridModel$1 || gridModel.modelType == 'GridModel';
           if (isGridModel) {
             this._set_data('gridModel', gridModel);
             return gridModel;
@@ -3328,81 +2293,157 @@
         var gridModels = [];
         for (var i = 0, len = propertyNames.length; i < len; i++) {
           var gridModel = this.get(propertyNames[i]);
-          var isGridModel = gridModel instanceof GridModel || gridModel.modelType == 'GridModel';
+          var isGridModel = gridModel instanceof GridModel$1 || gridModel.modelType == 'GridModel';
           if (isGridModel) {
             gridModels.push(gridModel);
           }
         }
         return gridModels;
       }
+    }, {
+      key: "getGridFilterModel",
+      value: function getGridFilterModel(propertyName) {
+        var gridModel = this.getGridModel(propertyName);
+        return gridModel.getCache('FilterViewModel');
+      }
     }]);
-  }(BaseModel);
-
-  function createModelFactory(props) {
-    var cControlType = props.cControlType.toLowerCase();
-    var model;
-    switch (cControlType) {
-      case 'input':
-        model = new SimpleModel(props);
-        break;
+  }(BaseModel$1);
+
+  function loadScripts(_require, _path, _files, _callback, _params) {
+    var _params2;
+    var path = _path;
+    var files = _files;
+    var callback = _callback;
+    var params = _params;
+    if (Array.isArray(_path) && typeof _files === 'function') {
+      path = undefined;
+      files = _path;
+      callback = _files;
+      params = _callback;
     }
-    return model;
+    var self = ((_params2 = params) === null || _params2 === void 0 ? void 0 : _params2.vm) || this;
+    var result = {
+      code: 0,
+      message: ''
+    };
+    files = Array.isArray(files) ? files : [];
+    var filesStr = files.join(',');
+    if (typeof _require !== 'function') {
+      var _callback2;
+      result.code = -1;
+      result.message = "requirejs.js \u672A\u52A0\u8F7D\uFF0C\u8DF3\u8FC7\u6269\u5C55\u811A\u672C\uFF1A".concat(filesStr);
+      (_callback2 = callback) === null || _callback2 === void 0 || _callback2(result);
+      return;
+    }
+    if (!files.length) {
+      var _callback3;
+      result.code = 404;
+      result.message = '扩展脚本为空';
+      (_callback3 = callback) === null || _callback3 === void 0 || _callback3(result);
+      return;
+    }
+    _require(path, files, function () {
+      var _callback4;
+      for (var i = 0, len = arguments.length; i < len; i++) {
+        var extend = i < 0 || arguments.length <= i ? undefined : arguments[i];
+        if (extend && extend.doAction) {
+          // 处理扩展脚本异常导致渲染失败
+          try {
+            extend.doAction('init', self);
+          } catch (err) {
+            result.code = -2;
+            result.message = "".concat(filesStr, "\u62D3\u5C55\u811A\u672C\u5F02\u5E38");
+            result.error = err;
+            break;
+          }
+        } else {
+          result.code = -3;
+          result.message = "".concat(filesStr, "\u6587\u4EF6\u52A0\u8F7D\u5931\u8D25 \u6216 \u672A\u6CE8\u518C\u62D3\u5C55\u811A\u672C");
+          break;
+        }
+      }
+      (_callback4 = callback) === null || _callback4 === void 0 || _callback4(result);
+    }, function (err) {
+      var _callback5;
+      result.code = -4;
+      result.message = "\u672A\u627E\u5230\u6269\u5C55\u811A\u672C\uFF1A".concat(filesStr);
+      result.error = err;
+      (_callback5 = callback) === null || _callback5 === void 0 || _callback5(result);
+    });
   }
-  function _initExtendJs(params) {
+
+  // 初始化拓展脚本
+  function initExtendScripts(params) {
     var self = this;
-    if (window && window.__debugger_initExtendJs) {
+    if (window.devfab && window.devfab.__debugger_initExtendJs) {
       // eslint-disable-next-line no-debugger
       debugger;
     }
     var requirejs = params.requirejs,
-      extendFilePath = params.extendFilePath,
-      pageKey = params.pageKey,
-      _params$enableExtendJ = params.enableExtendJs,
-      enableExtendJs = _params$enableExtendJ === void 0 ? true : _params$enableExtendJ,
-      _params$extendJsPath = params.extendJsPath,
-      extendJsPath = _params$extendJsPath === void 0 ? '_VM.Extend.js' : _params$extendJsPath;
-    if (!enableExtendJs) {
+      extendScriptParams = params.extendScriptParams;
+    var _ref = extendScriptParams || {},
+      _ref$enableJs = _ref.enableJs,
+      enableJs = _ref$enableJs === void 0 ? true : _ref$enableJs,
+      filepath = _ref.filepath,
+      scriptUrl = _ref.scriptUrl;
+    if (!enableJs) {
+      window.devfab.debug && console.info("[devfab][extendjs] \u672A\u542F\u7528\u6269\u5C55\u811A\u672C");
       self.execute('extendReady', self);
       return;
     }
-    var extendFile = "".concat(pageKey).concat(extendJsPath);
-    var extendFiles = [extendFile];
-    // if (self.getEnv && self.getEnv('everyCommonExtend')) {
-    // 	extendFiles.push(self.getEnv('everyCommonExtend'))
-    // }
-    if (typeof requirejs.require !== 'function') {
-      console.warn("requirejs.js \u672A\u52A0\u8F7D\uFF0C\u8DF3\u8FC7\u6269\u5C55\u811A\u672C\uFF1A".concat(extendFile));
+    if (!scriptUrl) {
+      window.devfab.debug && console.info("[devfab][extendjs] \u6269\u5C55\u811A\u672C\u672A\u5B9A\u4E49");
       self.execute('extendReady', self);
       return;
     }
-    requirejs.require(extendFilePath, extendFiles, function (extend, everyCommonExtend) {
-      if (extend && extend.doAction) {
-        // 处理扩展脚本异常导致渲染失败
-        try {
-          extend.doAction('init', self);
-          if (everyCommonExtend) {
-            everyCommonExtend.doAction('init', self);
-          }
-        } catch (err) {
-          console.error('扩展脚本异常：', err);
+    var extendFilePath = filepath;
+    var extendFile = scriptUrl;
+    var extendFiles = [extendFile];
+    if (self.getEnv && self.getEnv('everyCommonExtend')) {
+      extendFiles.push(self.getEnv('everyCommonExtend'));
+    }
+    loadScripts.call(self, requirejs.require, extendFilePath, extendFiles, function (result) {
+      if ((result === null || result === void 0 ? void 0 : result.code) != 0 && window.devfab.debug) {
+        if (!result.error) {
+          console.warn("[devfab][extendjs] ".concat(result.message));
+        } else {
+          console.error("[devfab][extendjs] ".concat(result.message, " \u9519\u8BEF\u4FE1\u606F\uFF1A"), result.error);
         }
-      } else {
-        console.error("".concat(extendFile, "\u6269\u5C55\u6587\u4EF6extend.*.min.js\u6587\u4EF6\u52A0\u8F7D\u5931\u8D25 \u6216 \u672A\u6CE8\u518C\u6269\u5C55\u811A\u672C"));
       }
       self.execute('extendReady', self);
-    }, function (err) {
-      console.warn("\u672A\u627E\u5230\u6269\u5C55\u811A\u672C\uFF1A".concat(extendFile, "\u9519\u8BEF\u4FE1\u606F\uFF1A"), err);
-      self.execute('extendReady', self);
     });
   }
-  var _extscripturls = /*#__PURE__*/function () {
-    var _ref = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee2(result, vm, params) {
+
+  // 初始化客开脚本
+  var initExtScripts = /*#__PURE__*/function () {
+    var _ref2 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee2(data, vm, params) {
       var _vm$getParams, _exturls;
-      var _result$extscripturls, exturls;
+      var requirejs, extendScriptParams, _ref3, _ref3$enableExtJs, enableExtJs, _ref3$exturlsField, exturlsField, extscripturls, exturls;
       return _regenerator().w(function (_context2) {
         while (1) switch (_context2.n) {
           case 0:
-            _result$extscripturls = result.extscripturls, exturls = _result$extscripturls === void 0 ? [] : _result$extscripturls; // 支持注入单据级本地化扩展脚本
+            if (window.devfab && window.devfab.__debugger_initExtJs) {
+              // eslint-disable-next-line no-debugger
+              debugger;
+            }
+            requirejs = params.requirejs, extendScriptParams = params.extendScriptParams;
+            _ref3 = extendScriptParams || {}, _ref3$enableExtJs = _ref3.enableExtJs, enableExtJs = _ref3$enableExtJs === void 0 ? true : _ref3$enableExtJs, _ref3$exturlsField = _ref3.exturlsField, exturlsField = _ref3$exturlsField === void 0 ? 'extscripturls' : _ref3$exturlsField;
+            if (enableExtJs) {
+              _context2.n = 1;
+              break;
+            }
+            window.devfab.debug && console.info("[devfab][exturls] \u672A\u542F\u7528\u5BA2\u5F00\u6269\u5C55\u811A\u672C");
+            return _context2.a(2, Promise.resolve(true));
+          case 1:
+            if (data) {
+              _context2.n = 2;
+              break;
+            }
+            window.devfab.debug && console.info("[devfab][exturls] \u5143\u6570\u636E\u4E0D\u80FD\u4E3A\u7A7A");
+            return _context2.a(2, Promise.resolve(true));
+          case 2:
+            extscripturls = data === null || data === void 0 ? void 0 : data[exturlsField];
+            exturls = Array.isArray(extscripturls) ? extscripturls : []; // 支持注入单据级本地化扩展脚本
             exturls = (vm.getCache('localDynamicScripts') || []).concat(exturls);
 
             // 支持给全单据注入扩展脚本
@@ -3415,13 +2456,13 @@
 
             // 预处理扩展脚本
             if (!((_exturls = exturls) !== null && _exturls !== void 0 && _exturls.length)) {
-              _context2.n = 2;
+              _context2.n = 4;
               break;
             }
             exturls = _toConsumableArray(new Set(exturls));
-            _context2.n = 1;
+            _context2.n = 3;
             return Promise.all(exturls.map(/*#__PURE__*/function () {
-              var _ref2 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee(url) {
+              var _ref4 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee(url) {
                 return _regenerator().w(function (_context) {
                   while (1) switch (_context.n) {
                     case 0:
@@ -3430,86 +2471,59 @@
                 }, _callee);
               }));
               return function (_x4) {
-                return _ref2.apply(this, arguments);
+                return _ref4.apply(this, arguments);
               };
             }()));
-          case 1:
+          case 3:
             exturls = _context2.v;
-          case 2:
+          case 4:
             // 加载扩展脚本
-            result.extscripturls = exturls;
+            data[exturlsField] = exturls;
             return _context2.a(2, new Promise(function (resolve, reject) {
-              _requireExtscripturls(result, vm, params, function () {
+              loadScripts.call(vm, requirejs.require, exturls, function (result) {
+                if ((result === null || result === void 0 ? void 0 : result.code) != 0 && window.devfab.debug) {
+                  if (!result.error) {
+                    console.warn("[devfab][extjs] ".concat(result.message));
+                  } else {
+                    console.error("[devfab][extjs] ".concat(result.message, " \u9519\u8BEF\u4FE1\u606F\uFF1A"), result.error);
+                  }
+                }
                 resolve(true);
               });
             }));
         }
       }, _callee2);
     }));
-    return function _extscripturls(_x, _x2, _x3) {
-      return _ref.apply(this, arguments);
+    return function initExtScripts(_x, _x2, _x3) {
+      return _ref2.apply(this, arguments);
     };
   }();
-  function _requireExtscripturls(result, vm, params, callback) {
-    // 二开、客开的扩展脚本
-    var _result$extscripturls2 = result.extscripturls,
-      exturls = _result$extscripturls2 === void 0 ? [] : _result$extscripturls2;
-    if (exturls !== null && exturls !== void 0 && exturls.length) {
-      try {
-        var _params$requirejs;
-        var requireInner = params === null || params === void 0 || (_params$requirejs = params.requirejs) === null || _params$requirejs === void 0 ? void 0 : _params$requirejs.requireInner;
-        if (typeof requireInner !== 'function') {
-          console.warn("requirejs.js \u672A\u52A0\u8F7D\uFF0C\u8DF3\u8FC7\u5BA2\u5F00\u6269\u5C55\u811A\u672C");
-          callback === null || callback === void 0 || callback(result, vm);
-          return;
-        }
-        requireInner(exturls,
-        // eslint-disable-next-line prefer-arrow-callback
-        function () {
-          // cb.console.info('[exturls]: %c [extscript js] cb.requireInner success and doAction[init]', 'color:green')
-          var correct = true;
-          if (arguments.length) {
-            for (var i = 0, len = arguments.length; i < len; i++) {
-              var external = i < 0 || arguments.length <= i ? undefined : arguments[i];
-              if (external) {
-                external.doAction('init', vm);
-              } else {
-                correct = false;
-              }
-            }
-            if (correct) {
-              callback === null || callback === void 0 || callback(result, vm);
-            }
-          } else {
-            correct = false;
-          }
-          if (!correct) {
-            console.log('[error] [extendjs] 租户级扩展脚本有语法错误，请修改正确后刷新浏览器重试！');
-          }
-        },
-        // eslint-disable-next-line prefer-arrow-callback
-        function (_error) {
-          // cb.console.info('[exturls]: %c [extscript js] cb.requireInner, but notFound', 'font-size:12pt;color:#860786')
-          callback === null || callback === void 0 || callback(result, vm);
-        });
-      } catch (e) {
-        // cb.console.log('[exturls]: %c [extscript js] cb.requireInner exception', 'font-size:12pt;color:#860786', e)
-        callback === null || callback === void 0 || callback(result, vm);
-      }
-    } else {
-      callback === null || callback === void 0 || callback(result, vm);
+
+  var BaseModel = BaseModel$1;
+  var SimpleModel = SimpleModel$1;
+  var ViewModel = ViewModel$1;
+  var GridModel = GridModel$1;
+  function createModelFactory(props, params) {
+    var SimpleModel = (params === null || params === void 0 ? void 0 : params.SimpleModel) || SimpleModel$1;
+    var cControlType = props.cControlType || props.component || props.controlType || props.ctrlType;
+    cControlType = cControlType.toLowerCase();
+    var model;
+    switch (cControlType) {
+      case 'input':
+        model = new SimpleModel(props);
+        break;
+      default:
+        model = new SimpleModel(props);
+        break;
     }
+    return model;
   }
   function _createViewModel(meta) {
+    var _params$models;
     var params = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
-    var _params$extendFilePat = params.extendFilePathField,
-      extendFilePathField = _params$extendFilePat === void 0 ? 'domainKey' : _params$extendFilePat,
-      _params$pageKeyField = params.pageKeyField,
-      pageKeyField = _params$pageKeyField === void 0 ? 'billNo' : _params$pageKeyField,
-      _params$modelNameFiel = params.modelNameField,
+    var _params$modelNameFiel = params.modelNameField,
       modelNameField = _params$modelNameFiel === void 0 ? 'cName' : _params$modelNameFiel;
-    var extendFilePath = meta[extendFilePathField] || '';
-    var pageKey = meta[pageKeyField] || '';
+    var ViewModel = (params === null || params === void 0 || (_params$models = params.models) === null || _params$models === void 0 ? void 0 : _params$models.ViewModel) || ViewModel$1;
     var VM = /*#__PURE__*/function (_ViewModel) {
       function VM() {
         _classCallCheck(this, VM);
@@ -3528,29 +2542,26 @@
         value: function createModels(_models, meta) {
           var fields = {};
           var models = Array.isArray(_models) ? _models : [];
-          models.forEach(function (m) {
-            var _params$createModelFa, _params$onBeforeCreat;
-            var model = params === null || params === void 0 || (_params$createModelFa = params.createModelFactory) === null || _params$createModelFa === void 0 ? void 0 : _params$createModelFa.call(params, m);
-            if (!model) {
-              model = createModelFactory(m);
-            }
+          models.forEach(function (field) {
+            var _params$onBeforeInitM, _params$onAfterInitMo;
+            var model = createModelFactory(field, params);
+            var modelName = field[modelNameField];
             var param = {
               model: model,
-              field: m,
-              meta: meta
+              meta: field,
+              childModel: true,
+              modelName: modelName
             };
-            params === null || params === void 0 || (_params$onBeforeCreat = params.onBeforeCreateModel) === null || _params$onBeforeCreat === void 0 || _params$onBeforeCreat.call(params, param);
-            fields[m[modelNameField]] = param.model;
+            params === null || params === void 0 || (_params$onBeforeInitM = params.onBeforeInitModel) === null || _params$onBeforeInitM === void 0 || _params$onBeforeInitM.call(params, param);
+            fields[param.modelName] = param.model;
+            params === null || params === void 0 || (_params$onAfterInitMo = params.onAfterInitModel) === null || _params$onAfterInitMo === void 0 || _params$onAfterInitMo.call(params, param);
           });
           return fields;
         }
       }, {
         key: "initData",
         value: function initData() {
-          _initExtendJs.call(this, _objectSpread2(_objectSpread2({}, params), {}, {
-            extendFilePath: extendFilePath,
-            pageKey: pageKey
-          }));
+          initExtendScripts.call(this, params);
         }
       }]);
     }(ViewModel);
@@ -3558,9 +2569,17 @@
     return VM;
   }
   function _initViewModel(meta, params) {
+    var _params$onBeforeInitM2, _vm$init, _params$onAfterInitMo2;
     var VM = _createViewModel(meta, params);
     var vm = new VM();
-    vm.init(meta.models, meta);
+    var param = {
+      model: vm,
+      meta: meta
+    };
+    params === null || params === void 0 || (_params$onBeforeInitM2 = params.onBeforeInitModel) === null || _params$onBeforeInitM2 === void 0 || _params$onBeforeInitM2.call(params, param);
+    param.model = vm;
+    vm === null || vm === void 0 || (_vm$init = vm.init) === null || _vm$init === void 0 || _vm$init.call(vm, meta.models, meta);
+    params === null || params === void 0 || (_params$onAfterInitMo2 = params.onAfterInitModel) === null || _params$onAfterInitMo2 === void 0 || _params$onAfterInitMo2.call(params, param);
     return vm;
   }
   function initViewModel(meta) {
@@ -3574,30 +2593,30 @@
       var _vm, _vm$destroyVM;
       (_vm = vm) === null || _vm === void 0 || (_vm$destroyVM = _vm.destroyVM) === null || _vm$destroyVM === void 0 || _vm$destroyVM.call(_vm);
       vm = null;
+      window.devfab.debug && console.info("[devfab][initVM]: destory vm ".concat(new Date().toString()));
     });
-    vm.on('extendReady', /*#__PURE__*/_asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee3() {
+    vm.on('extendReady', /*#__PURE__*/_asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee() {
       var promises;
-      return _regenerator().w(function (_context3) {
-        while (1) switch (_context3.n) {
+      return _regenerator().w(function (_context) {
+        while (1) switch (_context.n) {
           case 0:
-            promises = []; // 加载二开脚本
-            promises.push(_extscripturls(meta, vm, params));
-            _context3.n = 1;
+            promises = []; // 加载客开脚本
+            promises.push(initExtScripts(meta, vm, params));
+            _context.n = 1;
             return Promise.all(promises);
           case 1:
-            // console.info(`[initVM]: after vm init ${  moment().format('YYYY-MM-DD HH:mm:ss.SSS')}`)
+            window.devfab.debug && console.info("[devfab][initVM]: after vm init ".concat(new Date().toString()));
             callback === null || callback === void 0 || callback(vm, meta);
           case 2:
-            return _context3.a(2);
+            return _context.a(2);
         }
-      }, _callee3);
+      }, _callee);
     })));
     vm.initData();
     return vm;
   }
   var models = {
     BaseModel: BaseModel,
-    FilterModel: FilterModel,
     SimpleModel: SimpleModel,
     GridModel: GridModel,
     ViewModel: ViewModel,
@@ -3612,6 +2631,7 @@
   };
 
   var devfab = {
+    debug: false,
     utils: {
       builder: new utils.Builder(),
       cache: new utils.CacheUtil(),
@@ -3623,6 +2643,7 @@
       utils: utils
     }
   };
+  window.devfab = devfab;
 
   exports["default"] = devfab;