devfab 1.0.0 → 1.2.0

package/lib/devfab.js

@@ -19,6 +19,31 @@
     if (void 0 === e) throw new ReferenceError("this hasn't been initialised - super() hasn't been called");
     return e;
   }
+  function asyncGeneratorStep(n, t, e, r, o, a, c) {
+    try {
+      var i = n[a](c),
+        u = i.value;
+    } catch (n) {
+      return void e(n);
+    }
+    i.done ? t(u) : Promise.resolve(u).then(r, o);
+  }
+  function _asyncToGenerator(n) {
+    return function () {
+      var t = this,
+        e = arguments;
+      return new Promise(function (r, o) {
+        var a = n.apply(t, e);
+        function _next(n) {
+          asyncGeneratorStep(a, r, o, _next, _throw, "next", n);
+        }
+        function _throw(n) {
+          asyncGeneratorStep(a, r, o, _next, _throw, "throw", n);
+        }
+        _next(void 0);
+      });
+    };
+  }
   function _callSuper(t, o, e) {
     return o = _getPrototypeOf(o), _possibleConstructorReturn(t, _isNativeReflectConstruct() ? Reflect.construct(o, e || [], _getPrototypeOf(t).constructor) : o.apply(t, e));
   }
@@ -151,6 +176,114 @@
     if (void 0 !== e) throw new TypeError("Derived constructors may only return object or undefined");
     return _assertThisInitialized(t);
   }
+  function _regenerator() {
+    /*! regenerator-runtime -- Copyright (c) 2014-present, Facebook, Inc. -- license (MIT): https://github.com/babel/babel/blob/main/packages/babel-helpers/LICENSE */
+    var e,
+      t,
+      r = "function" == typeof Symbol ? Symbol : {},
+      n = r.iterator || "@@iterator",
+      o = r.toStringTag || "@@toStringTag";
+    function i(r, n, o, i) {
+      var c = n && n.prototype instanceof Generator ? n : Generator,
+        u = Object.create(c.prototype);
+      return _regeneratorDefine(u, "_invoke", function (r, n, o) {
+        var i,
+          c,
+          u,
+          f = 0,
+          p = o || [],
+          y = !1,
+          G = {
+            p: 0,
+            n: 0,
+            v: e,
+            a: d,
+            f: d.bind(e, 4),
+            d: function (t, r) {
+              return i = t, c = 0, u = e, G.n = r, a;
+            }
+          };
+        function d(r, n) {
+          for (c = r, u = n, t = 0; !y && f && !o && t < p.length; t++) {
+            var o,
+              i = p[t],
+              d = G.p,
+              l = i[2];
+            r > 3 ? (o = l === n) && (u = i[(c = i[4]) ? 5 : (c = 3, 3)], i[4] = i[5] = e) : i[0] <= d && ((o = r < 2 && d < i[1]) ? (c = 0, G.v = n, G.n = i[1]) : d < l && (o = r < 3 || i[0] > n || n > l) && (i[4] = r, i[5] = n, G.n = l, c = 0));
+          }
+          if (o || r > 1) return a;
+          throw y = !0, n;
+        }
+        return function (o, p, l) {
+          if (f > 1) throw TypeError("Generator is already running");
+          for (y && 1 === p && d(p, l), c = p, u = l; (t = c < 2 ? e : u) || !y;) {
+            i || (c ? c < 3 ? (c > 1 && (G.n = -1), d(c, u)) : G.n = u : G.v = u);
+            try {
+              if (f = 2, i) {
+                if (c || (o = "next"), t = i[o]) {
+                  if (!(t = t.call(i, u))) throw TypeError("iterator result is not an object");
+                  if (!t.done) return t;
+                  u = t.value, c < 2 && (c = 0);
+                } else 1 === c && (t = i.return) && t.call(i), c < 2 && (u = TypeError("The iterator does not provide a '" + o + "' method"), c = 1);
+                i = e;
+              } else if ((t = (y = G.n < 0) ? u : r.call(n, G)) !== a) break;
+            } catch (t) {
+              i = e, c = 1, u = t;
+            } finally {
+              f = 1;
+            }
+          }
+          return {
+            value: t,
+            done: y
+          };
+        };
+      }(r, o, i), !0), u;
+    }
+    var a = {};
+    function Generator() {}
+    function GeneratorFunction() {}
+    function GeneratorFunctionPrototype() {}
+    t = Object.getPrototypeOf;
+    var c = [][n] ? t(t([][n]())) : (_regeneratorDefine(t = {}, n, function () {
+        return this;
+      }), t),
+      u = GeneratorFunctionPrototype.prototype = Generator.prototype = Object.create(c);
+    function f(e) {
+      return Object.setPrototypeOf ? Object.setPrototypeOf(e, GeneratorFunctionPrototype) : (e.__proto__ = GeneratorFunctionPrototype, _regeneratorDefine(e, o, "GeneratorFunction")), e.prototype = Object.create(u), e;
+    }
+    return GeneratorFunction.prototype = GeneratorFunctionPrototype, _regeneratorDefine(u, "constructor", GeneratorFunctionPrototype), _regeneratorDefine(GeneratorFunctionPrototype, "constructor", GeneratorFunction), GeneratorFunction.displayName = "GeneratorFunction", _regeneratorDefine(GeneratorFunctionPrototype, o, "GeneratorFunction"), _regeneratorDefine(u), _regeneratorDefine(u, o, "Generator"), _regeneratorDefine(u, n, function () {
+      return this;
+    }), _regeneratorDefine(u, "toString", function () {
+      return "[object Generator]";
+    }), (_regenerator = function () {
+      return {
+        w: i,
+        m: f
+      };
+    })();
+  }
+  function _regeneratorDefine(e, r, n, t) {
+    var i = Object.defineProperty;
+    try {
+      i({}, "", {});
+    } catch (e) {
+      i = 0;
+    }
+    _regeneratorDefine = function (e, r, n, t) {
+      function o(r, n) {
+        _regeneratorDefine(e, r, function (e) {
+          return this._invoke(r, n, e);
+        });
+      }
+      r ? i ? i(e, r, {
+        value: n,
+        enumerable: !t,
+        configurable: !t,
+        writable: !t
+      }) : e[r] = n : (o("next", 0), o("throw", 1), o("return", 2));
+    }, _regeneratorDefine(e, r, n, t);
+  }
   function _setPrototypeOf(t, e) {
     return _setPrototypeOf = Object.setPrototypeOf ? Object.setPrototypeOf.bind() : function (t, e) {
       return t.__proto__ = e, t;
@@ -348,13 +481,15 @@
   }();
 
   var EventUtil = /*#__PURE__*/function () {
-    function EventUtil() {
+    function EventUtil(args) {
       _classCallCheck(this, EventUtil);
-      this._init();
+      this._init(args);
     }
     return _createClass(EventUtil, [{
       key: "_init",
-      value: function _init() {
+      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();
       }
@@ -575,7 +710,8 @@
             return;
           }
         }
-        if (window.__ASYNC_EXECUTE__) {
+        var __ASYNC_EXECUTE__ = this.__ASYNC_EXECUTE__;
+        if (__ASYNC_EXECUTE__) {
           return this._asyncPromiseExecute(name, function (args) {
             callback.apply(_this2, args);
           }, function () {
@@ -590,9 +726,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++) {
@@ -605,9 +741,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) {
@@ -744,7 +880,6 @@
     this.init();
   }
   String.prototype['equalsIgnoreCase'] = function (str) {
-    // eslint-disable-line
     if (str == null) {
       return false;
     }
@@ -1289,11 +1424,11 @@
         components.splice(index, 1);
       }
 
-      /**
-       * 统一的「写属性 + 通知组件」逻辑。
-       * 组件实现了 setXxx（如 setValue）就直接调；没实现则退回 setState({ [name]: value })。
-       * 原实现里只有 setVisible / setDisabled 有这层兜底，setValue 漏了，
-       * 导致模型改值永远传不到受控组件上。
+      /**
+       * 统一的「写属性 + 通知组件」逻辑。
+       * 组件实现了 setXxx（如 setValue）就直接调；没实现则退回 setState({ [name]: value })。
+       * 原实现里只有 setVisible / setDisabled 有这层兜底，setValue 漏了，
+       * 导致模型改值永远传不到受控组件上。
        */
     }, {
       key: "_applyState",
@@ -1607,27 +1742,6 @@
     }]);
   }(BaseModel);
 
-  /**
-   * models - GridModel
-   *
-   * 参照中台 `mdf-cube/src/models/GridModel.js`（`cb.models.register('GridModel')`）重写，
-   * 把它的约定搬进我们这套 devfab 的 ui-model 体系：
-   *
-   * 1. 两层数据：`dataSource`（全量原始数据）+ `rows`（当前展示行，本地模式下是 dataSource 的分页切片）；
-   * 2. 行状态与数据同序：`rowsDataState[i]` 对应 `dataSource[i]`，取值见 DataStates；
-   * 3. 内部字段由 `innerUsedAttrs` 统一定义：`_id` / `_selected` / `_status`；
-   * 4. 列是 **object map**（key = field），不是数组 —— 给 vxe-grid 渲染时用 `getColumnList()` 转数组；
-   * 5. 分页状态叫 `pageInfo`（pageIndex/pageSize/pageCount/recordCount），不叫 pager；
-   * 6. 行、单元格、列都可以挂状态：`rowState` / `cellState`；
-   * 7. 选中分「当前页 `_selected` 标记」与「跨页选中缓存（selectedKeysSet + selectedRowsMap）」两层。
-   *
-   * 与中台实现不同的地方（有意为之，都有注释说明）：
-   * - 中台的取数配置走 `proxyConfig` + `setProxy`，我们直接保留 `proxyConfig.load`（函数或 url），
-   *   并兼容旧的 `dataSource: fn` / `cUrl` 写法；
-   * - 中台的 `setRows` 会把 `getShowRows()`（展示文案副本）推给组件，我们推**原始行对象**，
-   *   否则选中回灌、单元格编辑会落到副本上；
-   * - 中台的行模型（editRowModel / ReferModel / 特征 / 孙表）没有移植，这里只做行级与单元格级能力。
-   */
   var DataStates = {
     Unchanged: '',
     Insert: 'Insert',
@@ -1681,6 +1795,21 @@
     return map;
   }
 
+  // ---------------- 响应体：从各种后端结构里取行与总数 ----------------
+
+  function resolveRowsData(res) {
+    if (!res) return [];
+    if (isArray(res)) return res;
+    if (isArray(res.data)) return res.data;
+    if (isArray(res.records)) return res.records;
+    if (isArray(res.list)) return res.list;
+    if (isArray(res.rows)) return res.rows;
+    var nested = res.data && _typeof(res.data) === 'object' ? res.data : res.result;
+    if (isArray(nested)) return nested;
+    if (nested && _typeof(nested) === 'object') return nested.records || nested.list || nested.rows || nested.data || [];
+    return [];
+  }
+
   /** 给行补内部 id（没有主键时用 rowId_ 前缀，与中台一致） */
   function setIds() {
     var rows = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : [];
@@ -1755,12 +1884,13 @@
     if (!proxy.load && typeof props.url === 'string') proxy.load = props.url;
     return proxy;
   }
-
-  /* code-link-enable */
-  var showPageInner = function showPageInner(proxyConfig, queryParams, callback, refresh, needLoadPageination, backQueryPageCount, extraProps) {
+  function _getData(proxyConfig, queryParams, callback) {
     var _this = this;
-    this.promiseExecute('beforeBatchModifyPull', function () {
-      // this.rebuildProxyConfig(proxyConfig);
+    this.promiseExecute('beforeQuery', {
+      proxyConfig: proxyConfig,
+      queryParams: queryParams
+    }, function () {
+      var self = _this;
       var proxy = _this.setProxy({
         queryData: proxyConfig
       });
@@ -1770,174 +1900,37 @@
           pageIndex: _this.getPageIndex()
         }
       };
-      if (!defaultParams.page.pageSize) {
-        _this.setPageSize(10);
-        defaultParams.page.pageSize = 10;
-      }
-      var bLoadPagination = _this._get_data('bLoadPagination');
-      if (!bLoadPagination && !needLoadPageination) defaultParams.page.totalCount = 1;
-      var delayLoadPageInfo = _this._get_data('delayLoadPageInfo');
-      if (bLoadPagination && delayLoadPageInfo) {
-        if (refresh) {
-          _this.setState('showDelayPagination', true);
-        }
-        defaultParams.page.totalCount = 1;
-      }
       var params = Object.assign(defaultParams, queryParams);
       _this.setCache('proxyCache', {
         proxyConfig: proxyConfig,
         params: params
       });
-      var queryCount = 0;
-      var responseData = {};
-      var viewModel = _this.getRootParent();
-      var self = _this;
-
-      // 增加queryId解决 报表临时表锁问题
-      var queryId = new Date().valueOf();
-      params.queryId = queryId;
+      _this.getRootParent();
       var queryDataCallback = function queryDataCallback(err, result, callBackMsg, errorDetail) {
-        var _this$getParent, _this$getParent$getPa;
-        setTimeout(function () {
-          self.clearCache('isGridInLoading');
-        }, 0);
-        viewModel === null || viewModel === void 0 || viewModel.clearCache('lazySearch');
         if (err) {
-          this.setState('showDelayPagination', false);
-          this.clearCache('setPageIndexFromBack');
           return;
         }
-        result = result || {}; // 容错处理null或者undefined情况
         this._set_data('dataSourceMode', 'remote'); // 处理请求过程中被修改
-        if (refresh && bLoadPagination && delayLoadPageInfo) {
-          queryCount++;
-          result = Object.assign(responseData, result);
-        }
-        var data = Array.isArray(result.recordList) ? result.recordList : [];
-        if ((!(bLoadPagination && delayLoadPageInfo) || queryCount === 2) && callback) {
-          callback.call(this, result, callBackMsg, errorDetail);
-        }
-        this.getCache('setPageIndexFromBack'); // 是否是从卡片页返回的
-        this.clearCache('setPageIndexFromBack');
-        if (!this.execute('beforeSetDataSource', data)) return;
-        var rowKeyField = this._get_data('rowKeyField');
-        var keyMap = {};
-        data.forEach(function (item) {
-          keyMap[item[rowKeyField]] = item;
-        });
-        this._set_data('keyMap', keyMap);
-        if (!refresh && this._get_data('override') === false) {
-          this._set_data('dataSource', this._get_data('dataSource').concat(data), true);
-        } else {
-          this._set_data('dataSource', data, true);
-          this.doPropertyChange('resetCellStatus');
-          this._set_data('cellState', {}, true);
-          this._set_data('rowState', {}, true);
-        }
-        // 存入当前model缓存便于client端搜索
-        this.setCache('currentGridData', data);
-        if (data.length) {
-          setIds.call(this, data);
-        }
-        this.initRowState();
-        // 修改缓存数据
-        setCachePaginationRowData.call(this, data);
-        this._get_data('sortParams');
-        var colFilterParams = this._get_data('colFilterParams');
-        this.showRows(null, !cb.utils.isEmptyObject(colFilterParams));
-        var pageInfo = this._get_data('pageInfo');
-        // bLoadPagination 优先级比 delayLoadPageInfo 高，bLoadPagination开启时值是false，所以第一项条件需要用 bLoadPagination = false 约束 delayLoadPageInfo = true 的情况
-        if (bLoadPagination && !delayLoadPageInfo && (this._get_data('bLoadPagination') || needLoadPageination)) {
-          pageInfo = {
-            pageSize: result.pageSize,
-            pageIndex: result.pageIndex,
-            pageCount: result.pageCount,
-            recordCount: result.recordCount
-          };
-          this.setPageInfo(pageInfo);
-        } else {
-          pageInfo.pageIndex = result.pageIndex;
-          pageInfo.from = 'showPageInner';
-          this.setPageInfo(pageInfo);
-        }
-        resetSelected.call(this);
-        if (!(((_this$getParent = this.getParent) === null || _this$getParent === void 0 || (_this$getParent = _this$getParent.call(this)) === null || _this$getParent === void 0 || (_this$getParent$getPa = _this$getParent.getParams) === null || _this$getParent$getPa === void 0 || (_this$getParent$getPa = _this$getParent$getPa.call(_this$getParent)) === null || _this$getParent$getPa === void 0 ? void 0 : _this$getParent$getPa.templateType) === 'splitview')) {
-          this._set_data('focusedRowIndex', -1); // 重置选中行
-        }
-        for (var _len = arguments.length, args = new Array(_len > 4 ? _len - 4 : 0), _key = 4; _key < _len; _key++) {
-          args[_key - 4] = arguments[_key];
-        }
-        this.execute('afterSetDataSource', data, result.viewmodel, args === null || args === void 0 ? void 0 : args[1]); // 社保缴交节点翻页的时候需要改columns
+        result = Object.assign({}, result);
+        var data = resolveRowsData(result);
+        callback === null || callback === void 0 || callback.call(this, data);
       };
-      {
-        if (viewModel.execute('beforeQueryData', params) === false) return;
-        self.setCache('lastGridFilterCondition', JSON.stringify(params === null || params === void 0 ? void 0 : params.condition));
-        var queryDataParams = _.cloneDeep(params);
-        proxy.queryData(queryDataParams, queryDataCallback, _this);
-      }
-      if (refresh && bLoadPagination && delayLoadPageInfo) {
-        var queryPageProxyConfig = JSON.parse(JSON.stringify(proxyConfig));
-        if (!queryPageProxyConfig.options) {
-          queryPageProxyConfig.options = {};
-        }
-        queryPageProxyConfig.options.mask = false;
-        var _callback = function _callback(pageInfo) {
-          queryCount++;
-          Object.assign(responseData, pageInfo);
-          if (queryCount === 2 && callback) {
-            callback.call(_this, responseData);
-          }
-        };
-        queryPageCount.call(_this, queryPageProxyConfig, params, function (pageInfo) {
-          _callback(pageInfo);
-        });
-      }
+      if (_this.execute('beforeQueryData', params) === false) return;
+      var queryDataParams = _.cloneDeep(params);
+      proxy.queryData(queryDataParams, queryDataCallback, self);
     });
-  };
-
-  /* 查询分页 */
-  function queryPageCount(proxyConfig, queryParams, callback) {
-    this.setCache('queryPageCountLoading', true);
-    // this.rebuildProxyConfig(proxyConfig);
-    var proxy = this.setProxy({
-      queryPageCount: _objectSpread2({}, proxyConfig)
+  }
+  function _setData(data) {
+    if (!this.execute('beforeSetDataSource', data)) return;
+    var rowKeyField = this._get_data('rowKeyField');
+    var keyMap = {};
+    data.forEach(function (item) {
+      keyMap[item[rowKeyField]] = item;
     });
-    var defaultParams = {
-      page: {
-        totalCount: -1
-      }
-    };
-    var params = Object.assign(true, queryParams, defaultParams);
-    if (!this.__queryPageCountRequestId) this.__queryPageCountRequestId = 0;
-    this.__queryPageCountRequestId++;
-    var queryPageCountCallback = function queryPageCountCallback(requestId, err, result) {
-      if (this.__queryPageCountRequestId !== requestId) return;
-      this.setCache('queryPageCountLoading', false);
-      this.setState('showDelayPagination', false);
-      if (err) {
-        var currentpageinfo = this._get_data('pageInfo');
-        if (currentpageinfo) {
-          // 接口报错时，分页组件信息保持原来的值
-          this.setPageInfo(currentpageinfo);
-        }
-        return;
-      }
-      result = result || {}; // 容错处理null或者undefined情况
-      var pageInfo = {
-        beginPageIndex: result.beginPageIndex,
-        endPageIndex: result.endPageIndex,
-        pageSize: result.pageSize,
-        pageIndex: result.pageIndex,
-        pageCount: result.pageCount,
-        recordCount: result.recordCount
-      };
-      if (callback) {
-        callback.call(this, pageInfo);
-      }
-      this.setPageInfo(pageInfo);
-      this.execute('afterQueryPageInfo', result);
-    };
-    proxy.queryPageCount(params, queryPageCountCallback.bind(this, this.__queryPageCountRequestId), this);
+    this._set_data('keyMap', keyMap);
+    this._set_data('dataSource', data, true);
+    this.doPropertyChange('setDataSource');
+    this.execute('afterSetDataSource', data);
   }
 
   // ============================================================
@@ -1958,6 +1951,7 @@
       // 静态数据：cData / data 数组
       var seed = props.cData || (isArray(props.data) ? props.data : null);
       _this2 = _callSuper(this, GridModel, [data]);
+      _defineProperty(_this2, "modelType", 'GridModel');
       _this2.initPageInfo(props.cPage || props.page);
       _this2.initColumns(data.columns);
       _this2.initRowState();
@@ -2172,97 +2166,49 @@
 
       /* ============================ 取数 ============================ */
 
-      // 中台签名：load(proxyConfig, params, callback) = 设置取数配置并立刻取一次
+      /* ======================= 数据写入 ======================= */
     }, {
-      key: "load",
-      value: function load(proxyConfig, params, callback) {
-        // if (proxyConfig) this.setProxy(proxyConfig)
-        // return this.fetch(params || {}).then((result) => {
-        // 	if (typeof callback === 'function') callback.call(this, null, result)
-        // 	return result
-        // })
-
-        var proxy = this.setProxy({
-          load: proxyConfig
-        });
-        proxy.load(params, function (err, result) {
-          if (err) {
-            cb.utils.alert(err, 'error');
-            return;
-          }
-          if (result.schema) {
-            this._set_data('columnMode', 'remote');
-            this.setColumns(result.schema);
-          }
-          this.setDataSource(result.data);
-          if (callback) {
-            callback.call(this);
-          }
-        }, this);
+      key: "setDataSource",
+      value: function setDataSource(proxyConfig) {
+        var _this4 = 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') {
+          var data = cb.utils.isArray(proxyConfig) ? proxyConfig : [];
+          _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);
+          _getData.call(this, proxyConfig, queryParams, function (data) {
+            _setData.call(_this4, data);
+            callback === null || callback === void 0 || callback.call(_this4);
+          });
+        }
       }
-
-      // 重新取数：优先驱动已挂载的表格（走表格自带的分页状态），没有视图时直接取数
     }, {
-      key: "refresh",
-      value: function refresh() {
-        var params = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
-        if (this.hasEvent('refresh')) return this.execute('refresh', params);
-        return this.fetch({
-          body: params
+      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');
+        _getData.call(this, proxyConfig, queryParams, function (data) {
+          _setData.call(_this5, data);
+          callback === null || callback === void 0 || callback.call(_this5);
         });
       }
-    }, {
-      key: "loadData",
-      value: function loadData() {
-        var params = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
-        return this.refresh(params);
-      }
-    }, {
-      key: "queryData",
-      value: function queryData() {
-        var params = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
-        return this.refresh(params);
-      }
 
       /* ======================== 数据（两层） ======================== */
-
-      /** 全量数据源（中台 getRealData 的语义：不拷贝，剔除已删除行） */
     }, {
       key: "getDataSource",
       value: function getDataSource() {
         var source = this._get_data('dataSource') || [];
-        if (!this.hasDeletedRow()) return source;
-        var rowsDataState = this._get_data('rowsDataState') || [];
-        return source.filter(function (row, index) {
-          return rowsDataState[index] !== DataStates.Delete;
-        });
-      }
-    }, {
-      key: "getRealData",
-      value: function getRealData() {
-        return this.getDataSource();
-      }
-    }, {
-      key: "getRealRows",
-      value: function getRealRows() {
-        return this._get_data('rows') || [];
-      }
-    }, {
-      key: "getRowsCount",
-      value: function getRowsCount() {
-        return (this._get_data('rows') || []).length;
-      }
-    }, {
-      key: "getDataSourceCount",
-      value: function getDataSourceCount() {
-        return (this._get_data('dataSource') || []).length;
-      }
-    }, {
-      key: "hasDeletedRow",
-      value: function hasDeletedRow() {
-        return (this._get_data('rowsDataState') || []).some(function (state) {
-          return state === DataStates.Delete;
-        });
+        return source;
       }
 
       /**
@@ -2361,18 +2307,18 @@
     }, {
       key: "getRowIndexByRowId",
       value: function getRowIndexByRowId(rowId) {
-        var _this4 = this;
+        var _this6 = this;
         var rows = this._get_data('rows') || [];
         return rows.findIndex(function (row) {
-          return (row === null || row === void 0 ? void 0 : row[_this4.getIdFlag()]) === rowId;
+          return (row === null || row === void 0 ? void 0 : row[_this6.getIdFlag()]) === rowId;
         });
       }
     }, {
       key: "getDataSourceIndexByRowId",
       value: function getDataSourceIndexByRowId(rowId) {
-        var _this5 = this;
+        var _this7 = this;
         return (this._get_data('dataSource') || []).findIndex(function (row) {
-          return (row === null || row === void 0 ? void 0 : row[_this5.getIdFlag()]) === rowId;
+          return (row === null || row === void 0 ? void 0 : row[_this7.getIdFlag()]) === rowId;
         });
       }
     }, {
@@ -2434,11 +2380,11 @@
     }, {
       key: "setCellValues",
       value: function setCellValues() {
-        var _this6 = this;
+        var _this8 = this;
         var values = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : [];
         if (!isArray(values)) return;
         values.forEach(function (item) {
-          return _this6.setCellValue(item.rowIndex, item.cellName || item.field, item.value);
+          return _this8.setCellValue(item.rowIndex, item.cellName || item.field, item.value);
         });
       }
     }, {
@@ -2477,11 +2423,11 @@
     }, {
       key: "setCellStates",
       value: function setCellStates() {
-        var _this7 = this;
+        var _this9 = this;
         var states = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : [];
         if (!isArray(states)) return;
         states.forEach(function (item) {
-          return _this7.setCellState(item.rowIndex, item.cellName, item.propertyName || item.name, item.value);
+          return _this9.setCellState(item.rowIndex, item.cellName, item.propertyName || item.name, item.value);
         });
       }
 
@@ -2498,7 +2444,7 @@
     }, {
       key: "getDataSourceIndexByRow",
       value: function getDataSourceIndexByRow(rowIndex) {
-        var _this8 = this;
+        var _this0 = this;
         var rows = this._get_data('rows') || [];
         var row = rows[rowIndex];
         if (!row) return -1;
@@ -2507,7 +2453,7 @@
         if (index > -1) return index;
         // 本地分页时 rows 是切片，引用一致；远程模式下 rows 与 dataSource 同源
         return source.findIndex(function (item) {
-          return (item === null || item === void 0 ? void 0 : item[_this8.getIdFlag()]) === (row === null || row === void 0 ? void 0 : row[_this8.getIdFlag()]);
+          return (item === null || item === void 0 ? void 0 : item[_this0.getIdFlag()]) === (row === null || row === void 0 ? void 0 : row[_this0.getIdFlag()]);
         });
       }
     }, {
@@ -2571,11 +2517,11 @@
     }, {
       key: "setRowStates",
       value: function setRowStates() {
-        var _this9 = this;
+        var _this1 = this;
         var states = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : [];
         if (!isArray(states)) return;
         states.forEach(function (item) {
-          return _this9.setRowState(item.rowIndex, item.propertyName || item.name, item.value);
+          return _this1.setRowState(item.rowIndex, item.propertyName || item.name, item.value);
         });
       }
 
@@ -2583,7 +2529,7 @@
     }, {
       key: "getDirtyData",
       value: function getDirtyData(necessary) {
-        var _this0 = this;
+        var _this10 = this;
         var source = this._get_data('dataSource') || [];
         var rowsDataState = this._get_data('rowsDataState') || [];
         var data = [];
@@ -2591,7 +2537,7 @@
           var dataState = rowsDataState[index];
           if (!dataState) return;
           var item = cloneDeep(row);
-          item[_this0.getStatusFlag()] = dataState;
+          item[_this10.getStatusFlag()] = dataState;
           data.push(item);
         });
         return data.length ? data : undefined;
@@ -2599,12 +2545,12 @@
     }, {
       key: "getDirtyRowIndexes",
       value: function getDirtyRowIndexes() {
-        var _this1 = this;
+        var _this11 = this;
         var rows = this._get_data('rows') || [];
         return rows.map(function (row, index) {
           return index;
         }).filter(function (index) {
-          return !!_this1.getRowDataState(index);
+          return !!_this11.getRowDataState(index);
         });
       }
     }, {
@@ -2667,11 +2613,11 @@
     }, {
       key: "insertRows",
       value: function insertRows(rowIndex) {
-        var _this10 = this;
+        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(_this10.insertRow(rowIndex + offset, rowData));
+          result.push(_this12.insertRow(rowIndex + offset, rowData));
         });
         return result;
       }
@@ -2703,11 +2649,11 @@
     }, {
       key: "updateRows",
       value: function updateRows() {
-        var _this11 = this;
+        var _this13 = this;
         var rowsData = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : [];
         rowsData.forEach(function (item) {
           var _item$rowIndex;
-          return _this11.updateRow((_item$rowIndex = item.rowIndex) !== null && _item$rowIndex !== void 0 ? _item$rowIndex : item.index, item.rowData || item.row);
+          return _this13.updateRow((_item$rowIndex = item.rowIndex) !== null && _item$rowIndex !== void 0 ? _item$rowIndex : item.index, item.rowData || item.row);
         });
       }
 
@@ -2715,9 +2661,9 @@
     }, {
       key: "deleteRows",
       value: function deleteRows(rowIndexes) {
-        var _this12 = this;
+        var _this14 = this;
         var indexes = (isArray(rowIndexes) ? rowIndexes : [rowIndexes]).filter(function (index) {
-          return index >= 0 && index < _this12.getRowsCount();
+          return index >= 0 && index < _this14.getRowsCount();
         }).sort(function (a, b) {
           return a - b;
         });
@@ -2732,14 +2678,14 @@
         rowsToDelete.forEach(function (row) {
           var index = source.indexOf(row);
           if (index < 0) return;
-          var key = row[_this12.getIdFlag()];
+          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[_this12.getIdFlag()];
+          var key = row[_this14.getIdFlag()];
           if (!deletedIds.has(key)) {
             keptSource.push(row);
             keptState.push(rowsDataState[index]);
@@ -2789,7 +2735,7 @@
     }, {
       key: "select",
       value: function select(rowIndexes, all) {
-        var _this13 = this;
+        var _this15 = this;
         if (rowIndexes == null && all !== true) return;
         if (all === true) this.unselectAll({
           silent: true
@@ -2798,7 +2744,7 @@
           return index;
         }) : isArray(rowIndexes) ? rowIndexes : [rowIndexes];
         indexes = indexes.filter(function (index) {
-          return index >= 0 && index < _this13.getRowsCount();
+          return index >= 0 && index < _this15.getRowsCount();
         });
         var rows = this._get_data('rows') || [];
         var selectedFlag = this.getSelectedFlag();
@@ -2818,14 +2764,14 @@
         if (!this.execute('beforeSelect', data)) return;
         changed.forEach(function (index) {
           rows[index][selectedFlag] = true;
-          _this13.cacheSelectedRow(rows[index], true);
+          _this15.cacheSelectedRow(rows[index], true);
         });
         this.flushSelection();
       }
     }, {
       key: "unselect",
       value: function unselect(rowIndexes) {
-        var _this14 = this;
+        var _this16 = this;
         if (rowIndexes == null) return;
         var indexes = isArray(rowIndexes) ? rowIndexes : [rowIndexes];
         var rows = this._get_data('rows') || [];
@@ -2838,19 +2784,19 @@
         if (!this.execute('beforeUnselect', changed)) return;
         changed.forEach(function (index) {
           rows[index][selectedFlag] = false;
-          _this14.cacheSelectedRow(rows[index], false);
+          _this16.cacheSelectedRow(rows[index], false);
         });
         this.flushSelection();
       }
     }, {
       key: "selectAll",
       value: function selectAll() {
-        var _this15 = this;
+        var _this17 = this;
         var rows = this._get_data('rows') || [];
         var selectedFlag = this.getSelectedFlag();
         rows.forEach(function (row) {
           row[selectedFlag] = true;
-          _this15.cacheSelectedRow(row, true);
+          _this17.cacheSelectedRow(row, true);
         });
         this.flushSelection();
       }
@@ -2865,7 +2811,7 @@
     }, {
       key: "unselectAll",
       value: function unselectAll() {
-        var _this16 = this;
+        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');
@@ -2874,7 +2820,7 @@
         });
         if (options.onlyPage) {
           (this._get_data('rows') || []).forEach(function (row) {
-            return _this16.cacheSelectedRow(row, false);
+            return _this18.cacheSelectedRow(row, false);
           });
         } else {
           this._set_data('selectedKeys', [], true);
@@ -2897,7 +2843,7 @@
     }, {
       key: "setSelectedRows",
       value: function setSelectedRows() {
-        var _this17 = this;
+        var _this19 = this;
         var rows = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : [];
         var list = isArray(rows) ? rows : [];
         var keyField = this.getRowKeyField();
@@ -2911,7 +2857,7 @@
           var selected = keys.has(String(row[keyField]));
           if (selected !== !!row[selectedFlag]) {
             row[selectedFlag] = selected;
-            _this17.cacheSelectedRow(row, selected);
+            _this19.cacheSelectedRow(row, selected);
           }
         });
         this.flushSelection();
@@ -3136,54 +3082,6 @@
         this.setRows(source.slice(start, start + pageSize));
       }
 
-      /* ======================= 数据写入 ======================= */
-
-      /** 全量赋值（中台 setDataSource）：本地模式重新切片，远程模式等于当前页 */
-    }, {
-      key: "setDataSource",
-      value: function setDataSource(proxyConfig) {
-        var queryParams = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
-        var callback = arguments.length > 2 ? arguments[2] : undefined;
-        if (this._get_data('dataSourceMode') === 'local') {
-          var data = cb.utils.isArray(proxyConfig) ? proxyConfig : [];
-          if (!this.execute('beforeSetDataSource', data)) return;
-          var rowKeyField = this._get_data('rowKeyField');
-          var keyMap = {};
-          data.forEach(function (item) {
-            keyMap[item[rowKeyField]] = item;
-          });
-          this._set_data('keyMap', keyMap);
-          this._set_data('dataSource', data, true);
-          this.getCache('grandson');
-          if (data.length) {
-            setIds.call(this, data);
-          }
-          this.initRowState();
-          // 修改缓存数据
-          setCachePaginationRowData.call(this, data);
-          // 修改行号
-          this.doPropertyChange('resetCellStatus');
-          this._set_data('rowState', {}, true);
-          // this.showRows(null, true)
-          this.doPropertyChange('setDataSource', this.getShowRows());
-          this._set_data('delayInsertRows', []); // setDataSource方法会同步模型和组件数据，把延迟存的数据清掉
-          if (this._get_data('isSorting')) {
-            this._set_data('isSorting', false);
-          }
-          this.execute('afterSetDataSource', data);
-        } else {
-          if (!this.execute('beforeProxyLoad', queryParams)) return;
-          var pageInfo = this._get_data('pageInfo');
-          pageInfo.pageIndex = 1;
-          var needLoadPageination = true;
-          // this.rebuildProxyConfig(proxyConfig)
-          this._set_data('proxyConfig', proxyConfig);
-          this._set_data('queryParams', queryParams);
-          this._set_data('callback', callback);
-          showPageInner.call(this, proxyConfig, queryParams, callback, true, needLoadPageination);
-        }
-      }
-
       /** 只换当前页 rows（中台 setRows） */
     }, {
       key: "setRows",
@@ -3203,10 +3101,10 @@
     }, {
       key: "setRowsIdMap",
       value: function setRowsIdMap() {
-        var _this18 = this;
+        var _this20 = this;
         var map = {};
         (this._get_data('rows') || []).forEach(function (row) {
-          if ((row === null || row === void 0 ? void 0 : row[_this18.getIdFlag()]) !== undefined) map[row[_this18.getIdFlag()]] = row;
+          if ((row === null || row === void 0 ? void 0 : row[_this20.getIdFlag()]) !== undefined) map[row[_this20.getIdFlag()]] = row;
         });
         this._set_data('rowsIdMap', map);
       }
@@ -3225,7 +3123,7 @@
     }, {
       key: "validate",
       value: function validate(cancel, paramsRowsIndex) {
-        var _this19 = this;
+        var _this21 = this;
         if (cancel) {
           this.doPropertyChange('validate', {
             type: '',
@@ -3242,18 +3140,18 @@
         rows.forEach(function (row, index) {
           for (var field in columns) {
             var column = columns[field];
-            if (!_this19.isRequiredColumn(column)) continue;
+            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[_this19.getIdFlag()],
+              rowId: row[_this21.getIdFlag()],
               cellName: field,
               message: "".concat(caption, "\u4E0D\u80FD\u4E3A\u7A7A")
             });
-            _this19.setCellState(index, field, 'msg', '不能为空');
+            _this21.setCellState(index, field, 'msg', '不能为空');
           }
         });
         this._set_data('validateErrors', errors);
@@ -3416,7 +3314,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;
+          var isGridModel = gridModel instanceof GridModel || gridModel.modelType == 'GridModel';
           if (isGridModel) {
             this._set_data('gridModel', gridModel);
             return gridModel;
@@ -3430,7 +3328,8 @@
         var gridModels = [];
         for (var i = 0, len = propertyNames.length; i < len; i++) {
           var gridModel = this.get(propertyNames[i]);
-          if (gridModel instanceof GridModel) {
+          var isGridModel = gridModel instanceof GridModel || gridModel.modelType == 'GridModel';
+          if (isGridModel) {
             gridModels.push(gridModel);
           }
         }
@@ -3449,23 +3348,168 @@
     }
     return model;
   }
-  function createViewModel(meta, params) {
-    var _window$devfab;
-    var _require = (_window$devfab = window.devfab) === null || _window$devfab === void 0 ? void 0 : _window$devfab.require;
-    var _ref = params || {},
-      _ref$domainKeyField = _ref.domainKeyField,
-      domainKeyField = _ref$domainKeyField === void 0 ? 'domainKey' : _ref$domainKeyField,
-      _ref$billNoField = _ref.billNoField,
-      billNoField = _ref$billNoField === void 0 ? 'billNo' : _ref$billNoField,
-      _ref$modelNameField = _ref.modelNameField,
-      modelNameField = _ref$modelNameField === void 0 ? 'modelName' : _ref$modelNameField,
-      _ref$enableExtendjs = _ref.enableExtendjs,
-      enableExtendjs = _ref$enableExtendjs === void 0 ? true : _ref$enableExtendjs;
-    if (params !== null && params !== void 0 && params.require) {
-      _require = params === null || params === void 0 ? void 0 : params.require;
+  function _initExtendJs(params) {
+    var self = this;
+    if (window && window.__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) {
+      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));
+      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);
+        }
+      } 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 _vm$getParams, _exturls;
+      var _result$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; // 支持注入单据级本地化扩展脚本
+            exturls = (vm.getCache('localDynamicScripts') || []).concat(exturls);
+
+            // 支持给全单据注入扩展脚本
+            exturls = exturls.concat(window.__devfab__EXT_BILL_SCRIPTS__ || []);
+
+            // 支持参数注入扩展脚本
+            if ((_vm$getParams = vm.getParams()) !== null && _vm$getParams !== void 0 && _vm$getParams.initVMExtUrls) {
+              exturls = exturls.concat([vm.getParams().initVMExtUrls]);
+            }
+
+            // 预处理扩展脚本
+            if (!((_exturls = exturls) !== null && _exturls !== void 0 && _exturls.length)) {
+              _context2.n = 2;
+              break;
+            }
+            exturls = _toConsumableArray(new Set(exturls));
+            _context2.n = 1;
+            return Promise.all(exturls.map(/*#__PURE__*/function () {
+              var _ref2 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee(url) {
+                return _regenerator().w(function (_context) {
+                  while (1) switch (_context.n) {
+                    case 0:
+                      return _context.a(2, url);
+                  }
+                }, _callee);
+              }));
+              return function (_x4) {
+                return _ref2.apply(this, arguments);
+              };
+            }()));
+          case 1:
+            exturls = _context2.v;
+          case 2:
+            // 加载扩展脚本
+            result.extscripturls = exturls;
+            return _context2.a(2, new Promise(function (resolve, reject) {
+              _requireExtscripturls(result, vm, params, function () {
+                resolve(true);
+              });
+            }));
+        }
+      }, _callee2);
+    }));
+    return function _extscripturls(_x, _x2, _x3) {
+      return _ref.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 domainKey = meta[domainKeyField] || '';
-    var billno = meta[billNoField];
+  }
+  function _createViewModel(meta) {
+    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,
+      modelNameField = _params$modelNameFiel === void 0 ? 'cName' : _params$modelNameFiel;
+    var extendFilePath = meta[extendFilePathField] || '';
+    var pageKey = meta[pageKeyField] || '';
     var VM = /*#__PURE__*/function (_ViewModel) {
       function VM() {
         _classCallCheck(this, VM);
@@ -3503,78 +3547,80 @@
       }, {
         key: "initData",
         value: function initData() {
-          this.initExtendJs();
-        }
-      }, {
-        key: "initExtendJs",
-        value: function initExtendJs() {
-          if (window && window.__debugger_initExtendJs) {
-            // eslint-disable-next-line no-debugger
-            debugger;
-          }
-          var self = this;
-          if (!enableExtendjs) {
-            self.execute('extendReady', self);
-            return;
-          }
-          var extendFile = "".concat(billno, "_VM.Extend.js");
-          var extendFiles = [extendFile];
-          // if (self.getEnv && self.getEnv('everyCommonExtend')) {
-          // 	extendFiles.push(self.getEnv('everyCommonExtend'))
-          // }
-          if (typeof _require !== 'function') {
-            console.warn("requirejs.js \u672A\u52A0\u8F7D\uFF0C\u8DF3\u8FC7\u6269\u5C55\u811A\u672C\uFF1A".concat(extendFile));
-            self.execute('extendReady', self);
-            return;
-          }
-          _require(domainKey, extendFiles, function (extend, everyCommonExtend) {
-            if (extend && extend.doAction) {
-              // 处理扩展脚本异常导致渲染失败
-              try {
-                extend.doAction('init', self);
-                if (everyCommonExtend) {
-                  everyCommonExtend.doAction('init', self);
-                }
-              } catch (err) {
-                console.error('扩展脚本异常：', err);
-              }
-            } 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);
-          });
+          _initExtendJs.call(this, _objectSpread2(_objectSpread2({}, params), {}, {
+            extendFilePath: extendFilePath,
+            pageKey: pageKey
+          }));
         }
       }]);
     }(ViewModel);
     VM.prototype.modelType = 'ViewModel';
     return VM;
   }
-  function initViewModel(meta, params) {
-    var ContainerModel = createViewModel(meta, params);
-    var vm = new ContainerModel();
+  function _initViewModel(meta, params) {
+    var VM = _createViewModel(meta, params);
+    var vm = new VM();
     vm.init(meta.models, meta);
     return vm;
   }
+  function initViewModel(meta) {
+    var params = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
+    var callback = arguments.length > 2 ? arguments[2] : undefined;
+    if (!(params !== null && params !== void 0 && params.requirejs)) {
+      params.requirejs = window.__devfab;
+    }
+    var vm = _initViewModel(meta, params);
+    vm.on('destroyVM', function () {
+      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;
+    });
+    vm.on('extendReady', /*#__PURE__*/_asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee3() {
+      var promises;
+      return _regenerator().w(function (_context3) {
+        while (1) switch (_context3.n) {
+          case 0:
+            promises = []; // 加载二开脚本
+            promises.push(_extscripturls(meta, vm, params));
+            _context3.n = 1;
+            return Promise.all(promises);
+          case 1:
+            // console.info(`[initVM]: after vm init ${  moment().format('YYYY-MM-DD HH:mm:ss.SSS')}`)
+            callback === null || callback === void 0 || callback(vm, meta);
+          case 2:
+            return _context3.a(2);
+        }
+      }, _callee3);
+    })));
+    vm.initData();
+    return vm;
+  }
   var models = {
     BaseModel: BaseModel,
     FilterModel: FilterModel,
     SimpleModel: SimpleModel,
     GridModel: GridModel,
     ViewModel: ViewModel,
-    createViewModel: createViewModel,
     initViewModel: initViewModel
   };
 
-  window.__ASYNC_EXECUTE__ = true;
+  var utils = {
+    Builder: Builder,
+    CacheUtil: CacheUtil,
+    EventUtil: EventUtil,
+    DynamicProxy: DynamicProxy
+  };
+
   var devfab = {
-    builder: new Builder(),
     utils: {
-      cache: new CacheUtil(),
-      event: new EventUtil(),
-      models: models
+      builder: new utils.Builder(),
+      cache: new utils.CacheUtil(),
+      event: new utils.EventUtil()
+    },
+    common: {
+      Builder: Builder,
+      models: models,
+      utils: utils
     }
   };