@next-core/brick-kit 2.136.0 → 2.137.0

package/dist/index.esm.js

@@ -2035,7 +2035,7 @@ class StoryboardContextWrapper {
       }
 
       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
@@ -2344,6 +2344,22 @@ mediaBreakpointMinWidthMap.forEach((minWidth, breakpoint) => {
 });
 var getMedia = () => MEDIA;
 
+var FormContextMap = new Map();
+class CustomFormContext {
+  constructor() {
+    _defineProperty$1(this, "formState", void 0);
+
+    _defineProperty$1(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) {
@@ -2416,6 +2432,7 @@ function evaluate(raw) {
   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.
 
@@ -2467,6 +2484,20 @@ function evaluate(raw) {
     }
   }
 
+  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,
@@ -2920,7 +2951,7 @@ var computeRealValue = (value, context, injectDeep, internalOptions) => {
 
     if (preEvaluated || 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]) {
@@ -6024,13 +6055,25 @@ var ContractApi_searchSingleContract = /*#__PURE__*/function () {
 }();
 
 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}`
@@ -6693,7 +6736,7 @@ function customListenerFactory(handler, ifContainer, context, runtimeBrick) {
   };
 }
 
-function eventCallbackFactory(callback, getContext) {
+function eventCallbackFactory(callback, getContext, runtimeBrick) {
   return function callbackFactory(type) {
     return function (result) {
       if (callback !== null && callback !== void 0 && callback[type]) {
@@ -6703,7 +6746,7 @@ function eventCallbackFactory(callback, getContext) {
           });
           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`,
@@ -6757,7 +6800,7 @@ function _brickCallback() {
       return;
     }
 
-    var callbackFactory = eventCallbackFactory(handler.callback, () => context);
+    var callbackFactory = eventCallbackFactory(handler.callback, () => context, runtimeBrick);
     var pollableCallback = {
       progress: callbackFactory("progress"),
       success: callbackFactory("success"),
@@ -8276,6 +8319,7 @@ function applyColorTheme(options) {
 
 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();
@@ -8374,7 +8418,8 @@ function lowLevelExpandCustomTemplate(template, brickConf, proxyBrick, context,
   var {
     bricks,
     proxy,
-    state
+    state,
+    contracts
   } = template;
 
   var {
@@ -8390,6 +8435,11 @@ function lowLevelExpandCustomTemplate(template, brickConf, proxyBrick, context,
   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 = {
@@ -9957,58 +10007,73 @@ function listenOnTrackingContext(brick, trackingContextList, context) {
   }
 }
 
-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$3(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(_objectSpread({}, context), {}, {
+        formContextId: formContext.id
+      }), {});
     }
-  };
 
-  try {
-    var formStoryboard = getStoryboard([formData.formSchema], [], formData.fields, isPreview);
-    formStoryboard[0] = _.isEmpty(formStoryboard[0]) ? errorBrick : formStoryboard[0];
-    return _objectSpread(_objectSpread({}, 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] = _.isEmpty(formStoryboard[0]) ? errorBrick : formStoryboard[0];
+      return _objectSpread(_objectSpread({}, 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];
 
@@ -10241,7 +10306,7 @@ function getDefaultProperties(_name, fields) {
     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,字段类型获取默认属性
@@ -10283,7 +10348,7 @@ function getStoryboard(datasource, result, fields, isPreview) {
     if (Array.isArray(dataItem.bricks)) {
       var _Object$keys;
 
-      resultItem["slots"] = _.groupBy(getStoryboard(dataItem.bricks, [], fields, isPreview), "mountPoint");
+      resultItem["slots"] = _.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],
@@ -10292,6 +10357,9 @@ function getStoryboard(datasource, result, fields, isPreview) {
       });
     }
 
+    resultItem = _objectSpread(_objectSpread({}, resultItem), {}, {
+      [symbolForFormContextId]: formContextId
+    });
     result[i] = resultItem;
   };
 
@@ -10348,7 +10416,8 @@ class LocationContext {
   getContext(_ref) {
     var {
       match,
-      tplContextId
+      tplContextId,
+      formContextId
     } = _ref;
     var auth = getAuth();
     var context = {
@@ -10368,7 +10437,8 @@ class LocationContext {
       flags: this.kernel.getFeatureFlags(),
       segues: this.segues,
       storyboardContext: this.storyboardContextWrapper.get(),
-      tplContextId
+      tplContextId,
+      formContextId
     };
     return context;
   }
@@ -10708,10 +10778,12 @@ class LocationContext {
 
       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.
 
 
@@ -10741,6 +10813,10 @@ class LocationContext {
         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);
@@ -10754,6 +10830,7 @@ class LocationContext {
         slotId,
         refForProxy: brickConf[symbolForRefForProxy],
         tplContextId,
+        formContextId,
         iid: brickConf.iid
       }, (_brickConf$lifeCycle = brickConf.lifeCycle) !== null && _brickConf$lifeCycle !== void 0 && _brickConf$lifeCycle.onScrollIntoView ? {
         lifeCycle: {
@@ -10799,8 +10876,8 @@ class LocationContext {
       }
 
       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);
       }
 
@@ -11867,6 +11944,7 @@ class Router {
       _this3.renderId = uniqueId("render-id-");
       resetAllInjected();
       clearPollTimeout();
+      clearCollectWidgetContract();
 
       if (_this3.locationContext) {
         _this3.locationContext.resolver.resetRefreshQueue();