@next-core/brick-kit 2.136.0 → 2.137.0

package/CHANGELOG.md

@@ -3,6 +3,36 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [2.137.0](https://github.com/easyops-cn/next-core/compare/@next-core/brick-kit@2.136.2...@next-core/brick-kit@2.137.0) (2022-09-06)
+
+
+### Features
+
+* support to use contract in widgets ([25b3337](https://github.com/easyops-cn/next-core/commit/25b333724f9c45131b209845a7caef3e8597888d))
+
+
+
+
+
+## [2.136.2](https://github.com/easyops-cn/next-core/compare/@next-core/brick-kit@2.136.1...@next-core/brick-kit@2.136.2) (2022-09-06)
+
+**Note:** Version bump only for package @next-core/brick-kit
+
+
+
+
+
+## [2.136.1](https://github.com/easyops-cn/next-core/compare/@next-core/brick-kit@2.136.0...@next-core/brick-kit@2.136.1) (2022-09-05)
+
+
+### Bug Fixes
+
+* fix missing runtime brick in event callback ([a5b70be](https://github.com/easyops-cn/next-core/commit/a5b70be68bc6a856b78992320518d0a0e6a41128))
+
+
+
+
+
 # [2.136.0](https://github.com/easyops-cn/next-core/compare/@next-core/brick-kit@2.135.1...@next-core/brick-kit@2.136.0) (2022-09-05)
 
 

package/dist/index.bundle.js

@@ -2034,7 +2034,7 @@
         }
 
         if (callback) {
-          var callbackFactory = eventCallbackFactory(callback, () => this.getResolveOptions(_internalApiGetCurrentContext()).mergedContext);
+          var callbackFactory = eventCallbackFactory(callback, () => this.getResolveOptions(_internalApiGetCurrentContext()).mergedContext, null);
           promise.then(val => {
             callbackFactory("success")({
               value: val
@@ -2343,6 +2343,22 @@
   });
   var getMedia = () => MEDIA;
 
+  var FormContextMap = new Map();
+  class CustomFormContext {
+    constructor() {
+      _defineProperty__default["default"](this, "formState", void 0);
+
+      _defineProperty__default["default"](this, "id", _.uniqueId("form-ctx-"));
+
+      FormContextMap.set(this.id, this);
+      this.formState = new StoryboardContextWrapper();
+    }
+
+  }
+  function getCustomFormContext(formContextId) {
+    return FormContextMap.get(formContextId);
+  }
+
   var symbolForRaw = Symbol.for("pre.evaluated.raw");
   var symbolForContext = Symbol.for("pre.evaluated.context");
   function isPreEvaluated(raw) {
@@ -2415,6 +2431,7 @@
     var attemptToVisitData = attemptToVisitGlobals.has("DATA");
     var attemptToVisitTpl = attemptToVisitGlobals.has("TPL");
     var attemptToVisitState = attemptToVisitGlobals.has("STATE");
+    var attemptToVisitFormState = attemptToVisitGlobals.has("FORM_STATE");
     var attemptToVisitTplOrState = attemptToVisitTpl || attemptToVisitState; // Ignore evaluating if `event` is missing in context.
     // Since it should be evaluated during events handling.
 
@@ -2466,6 +2483,20 @@
       }
     }
 
+    if (attemptToVisitFormState && runtimeContext.formContextId) {
+      var formContext = getCustomFormContext(runtimeContext.formContextId);
+      globalVariables.FORM_STATE = getDynamicReadOnlyProxy({
+        get(target, key) {
+          return formContext.formState.getValue(key);
+        },
+
+        ownKeys() {
+          return Array.from(formContext.formState.get().keys());
+        }
+
+      });
+    }
+
     var {
       app: currentApp,
       query,
@@ -2919,7 +2950,7 @@
 
       if (preEvaluated || brickUtils.isEvaluable(value)) {
         var runtimeContext = {};
-        var keys = ["event", "tplContextId", "overrideApp", "appendI18nNamespace"];
+        var keys = ["event", "tplContextId", "overrideApp", "appendI18nNamespace", "formContextId"];
 
         for (var key of keys) {
           if (context !== null && context !== void 0 && context[key]) {
@@ -6023,13 +6054,25 @@
   }();
 
   var contractsMap = new Map();
-  function collectContract(contracts) {
+  var widgetContractMap = new Map();
+
+  var addContract = (contracts, map) => {
     contracts === null || contracts === void 0 ? void 0 : contracts.forEach(contract => {
-      contractsMap.set("".concat(contract.namespaceId, ".").concat(contract.name), contract);
+      map.set("".concat(contract.namespaceId, ".").concat(contract.name), contract);
     });
+  };
+
+  function collectContract(contracts) {
+    addContract(contracts, contractsMap);
+  }
+  function collectWidgetContract(contracts) {
+    addContract(contracts, widgetContractMap);
+  }
+  function clearCollectWidgetContract() {
+    widgetContractMap.clear();
   }
   function getContract(name) {
-    return contractsMap.get(name);
+    return contractsMap.get(name) || widgetContractMap.get(name);
   }
 
   var flowApiDefinitionPromiseMap = new Map(); // Legacy Custom API: `${namespace}@${name}`
@@ -6692,7 +6735,7 @@
     };
   }
 
-  function eventCallbackFactory(callback, getContext) {
+  function eventCallbackFactory(callback, getContext, runtimeBrick) {
     return function callbackFactory(type) {
       return function (result) {
         if (callback !== null && callback !== void 0 && callback[type]) {
@@ -6702,7 +6745,7 @@
             });
             var context = getContext();
             [].concat(callback[type]).forEach(eachHandler => {
-              listenerFactory(eachHandler, context, null)(event);
+              listenerFactory(eachHandler, context, runtimeBrick)(event);
             });
           } catch (err) {
             // Do not throw errors in `callback.success` or `callback.progress`,
@@ -6756,7 +6799,7 @@
         return;
       }
 
-      var callbackFactory = eventCallbackFactory(handler.callback, () => context);
+      var callbackFactory = eventCallbackFactory(handler.callback, () => context, runtimeBrick);
       var pollableCallback = {
         progress: callbackFactory("progress"),
         success: callbackFactory("success"),
@@ -8275,6 +8318,7 @@
 
   var formRenderer = "form-renderer.form-renderer";
   var filterProperties = ["instanceId", "brick", "slots", "properties", "events", "if", "context", "bricks", "mountPoint"];
+  var symbolForFormContextId = Symbol.for("form.contextId");
 
   function collectRefsInTemplate(template) {
     var refMap = new Map();
@@ -8373,7 +8417,8 @@
     var {
       bricks,
       proxy,
-      state
+      state,
+      contracts
     } = template;
 
     var {
@@ -8389,6 +8434,11 @@
     proxyBrick.proxy = proxyCopy;
     proxyBrick.proxyRefs = new Map();
     proxyBrick.stateNames = state === null || state === void 0 ? void 0 : state.map(item => item.name);
+
+    if (contracts) {
+      collectWidgetContract(contracts);
+    }
+
     var refToBrickConf = collectRefsInTemplate(template); // Reversed proxies are used for expand storyboard before rendering page.
 
     var reversedProxies = {
@@ -9956,58 +10006,73 @@
     }
   }
 
-  function ExpandCustomForm(formData, brickConf, isPreview) {
-    var errorBrick = {
-      brick: "presentational-bricks.brick-illustration",
-      properties: {
-        category: "default",
-        header: {
-          title: "参数错误"
-        },
-        mode: "guide",
-        name: "search-empty"
+  function ExpandCustomForm(_x, _x2, _x3, _x4) {
+    return _ExpandCustomForm.apply(this, arguments);
+  }
+
+  function _ExpandCustomForm() {
+    _ExpandCustomForm = _asyncToGenerator__default["default"](function* (formData, brickConf, isPreview, context) {
+      var errorBrick = {
+        brick: "presentational-bricks.brick-illustration",
+        properties: {
+          category: "default",
+          header: {
+            title: "参数错误"
+          },
+          mode: "guide",
+          name: "search-empty"
+        }
+      };
+      var formContext = new CustomFormContext();
+
+      if (Array.isArray(formData.context)) {
+        yield formContext.formState.define(formData.context, _objectSpread__default["default"](_objectSpread__default["default"]({}, context), {}, {
+          formContextId: formContext.id
+        }), {});
       }
-    };
 
-    try {
-      var formStoryboard = getStoryboard([formData.formSchema], [], formData.fields, isPreview);
-      formStoryboard[0] = ___default["default"].isEmpty(formStoryboard[0]) ? errorBrick : formStoryboard[0];
-      return _objectSpread__default["default"](_objectSpread__default["default"]({}, brickConf), {}, {
-        brick: "div",
-        slots: {
-          "": {
-            bricks: [{
-              brick: "basic-bricks.micro-view",
-              properties: {
-                style: {
-                  padding: "12px"
-                }
-              },
-              slots: {
-                content: {
-                  bricks: formStoryboard,
-                  type: "bricks"
+      try {
+        var formStoryboard = getStoryboard([formData.formSchema], [], formData.fields, isPreview, formContext.id);
+        formStoryboard[0] = ___default["default"].isEmpty(formStoryboard[0]) ? errorBrick : formStoryboard[0];
+        return _objectSpread__default["default"](_objectSpread__default["default"]({}, brickConf), {}, {
+          brick: "div",
+          slots: {
+            "": {
+              bricks: [{
+                brick: "basic-bricks.micro-view",
+                properties: {
+                  style: {
+                    padding: "12px"
+                  }
+                },
+                slots: {
+                  content: {
+                    bricks: formStoryboard,
+                    type: "bricks"
+                  }
                 }
-              }
-            }],
-            type: "bricks"
+              }],
+              type: "bricks"
+            }
           }
-        }
-      });
-    } catch (error) {
-      // eslint-disable-next-line no-console
-      console.warn(error.message);
-      return {
-        brick: "div",
-        slots: {
-          "": {
-            bricks: [errorBrick],
-            type: "bricks"
+        });
+      } catch (error) {
+        // eslint-disable-next-line no-console
+        console.warn(error.message);
+        return {
+          brick: "div",
+          slots: {
+            "": {
+              bricks: [errorBrick],
+              type: "bricks"
+            }
           }
-        }
-      };
-    }
+        };
+      }
+    });
+    return _ExpandCustomForm.apply(this, arguments);
   }
+
   function getDefaultProperties(_name, fields) {
     var field = fields.filter(item => item.fieldId === _name)[0];
 
@@ -10240,7 +10305,7 @@
       return defaultValue;
     } else return {};
   }
-  function getStoryboard(datasource, result, fields, isPreview) {
+  function getStoryboard(datasource, result, fields, isPreview, formContextId) {
     var _loop = function (i) {
       var dataItem = datasource[i];
       var resultItem = {}; //数据初始化：根据id,字段类型获取默认属性
@@ -10282,7 +10347,7 @@
       if (Array.isArray(dataItem.bricks)) {
         var _Object$keys;
 
-        resultItem["slots"] = ___default["default"].groupBy(getStoryboard(dataItem.bricks, [], fields, isPreview), "mountPoint");
+        resultItem["slots"] = ___default["default"].groupBy(getStoryboard(dataItem.bricks, [], fields, isPreview, formContextId), "mountPoint");
         (_Object$keys = Object.keys(resultItem["slots"])) === null || _Object$keys === void 0 ? void 0 : _Object$keys.forEach(item => {
           resultItem.slots[item] = {
             bricks: resultItem.slots[item],
@@ -10291,6 +10356,9 @@
         });
       }
 
+      resultItem = _objectSpread__default["default"](_objectSpread__default["default"]({}, resultItem), {}, {
+        [symbolForFormContextId]: formContextId
+      });
       result[i] = resultItem;
     };
 
@@ -10347,7 +10415,8 @@
     getContext(_ref) {
       var {
         match,
-        tplContextId
+        tplContextId,
+        formContextId
       } = _ref;
       var auth = getAuth();
       var context = {
@@ -10367,7 +10436,8 @@
         flags: this.kernel.getFeatureFlags(),
         segues: this.segues,
         storyboardContext: this.storyboardContextWrapper.get(),
-        tplContextId
+        tplContextId,
+        formContextId
       };
       return context;
     }
@@ -10707,10 +10777,12 @@
 
         var tplStack = _arguments.length > 4 && _arguments[4] !== undefined ? _arguments[4] : [];
         var tplContextId = brickConf[symbolForTplContextId];
+        var formContextId = brickConf[symbolForFormContextId];
 
         var context = _this6.getContext({
           match,
-          tplContextId
+          tplContextId,
+          formContextId
         }); // First, check whether the brick should be rendered.
 
 
@@ -10740,6 +10812,10 @@
           tplStack.push(tplTagName);
         }
 
+        if (brickConf.brick === formRenderer) {
+          brickConf.properties.formData = JSON.stringify(brickConf.properties.formData);
+        }
+
         var brick = {};
         yield _this6.storyboardContextWrapper.define(brickConf.context, context, brick);
         yield _this6.preCheckPermissions(brickConf, context);
@@ -10753,6 +10829,7 @@
           slotId,
           refForProxy: brickConf[symbolForRefForProxy],
           tplContextId,
+          formContextId,
           iid: brickConf.iid
         }, (_brickConf$lifeCycle = brickConf.lifeCycle) !== null && _brickConf$lifeCycle !== void 0 && _brickConf$lifeCycle.onScrollIntoView ? {
           lifeCycle: {
@@ -10798,8 +10875,8 @@
         }
 
         if (brick.type === formRenderer) {
-          var formData = brick.properties.formData;
-          expandedBrickConf = ExpandCustomForm(formData, brickConf, brick.properties.isPreview);
+          var formData = JSON.parse(brick.properties.formData);
+          expandedBrickConf = yield ExpandCustomForm(formData, brickConf, brick.properties.isPreview, context);
           yield _this6.kernel.loadDynamicBricksInBrickConf(expandedBrickConf);
         }
 
@@ -11866,6 +11943,7 @@
         _this3.renderId = _.uniqueId("render-id-");
         resetAllInjected();
         clearPollTimeout();
+        clearCollectWidgetContract();
 
         if (_this3.locationContext) {
           _this3.locationContext.resolver.resetRefreshQueue();