@next-core/brick-kit 2.157.1 → 2.157.3

package/dist/index.esm.js

@@ -4,7 +4,7 @@ import _objectWithoutProperties from '@babel/runtime/helpers/objectWithoutProper
 import _asyncToGenerator$3 from '@babel/runtime/helpers/asyncToGenerator';
 import _defineProperty$1 from '@babel/runtime/helpers/defineProperty';
 import React, { useState, useEffect, useRef, useCallback, useMemo, forwardRef, useImperativeHandle, useContext, createContext, useReducer } from 'react';
-import { JsonStorage, toPath, computeRealRoutePath, hasOwnProperty, isObject, isEvaluable, transformAndInject, transform, trackContext, trackState, scanPermissionActionsInStoryboard, precookFunction, cook, resolveContextConcurrently, syncResolveContextConcurrently, trackUsedState, trackUsedContext, shouldAllowRecursiveEvaluations, preevaluate, inject, matchPath, deepFreeze, createProviderClass, removeDeadConditionsInTpl, getTemplateDepsOfStoryboard, getDllAndDepsOfStoryboard, asyncProcessStoryboard, getDllAndDepsByResource, scanRouteAliasInStoryboard, prefetchScript, scanBricksInBrickConf, scanProcessorsInAny, loadScript, scanAppGetMenuInAny, asyncProcessBrick, scanInstalledAppsInStoryboard, removeDeadConditions, restoreDynamicTemplates, scanStoryboard, mapCustomApisToNameAndNamespace } from '@next-core/brick-utils';
+import { JsonStorage, toPath, computeRealRoutePath, hasOwnProperty, isObject, isEvaluable, transformAndInject, transform, trackContext, trackState, trackFormState, scanPermissionActionsInStoryboard, precookFunction, cook, resolveContextConcurrently, syncResolveContextConcurrently, trackUsedState, trackUsedContext, shouldAllowRecursiveEvaluations, preevaluate, inject, matchPath, deepFreeze, createProviderClass, removeDeadConditionsInTpl, getTemplateDepsOfStoryboard, getDllAndDepsOfStoryboard, asyncProcessStoryboard, getDllAndDepsByResource, scanRouteAliasInStoryboard, prefetchScript, scanBricksInBrickConf, scanProcessorsInAny, loadScript, scanAppGetMenuInAny, asyncProcessBrick, scanInstalledAppsInStoryboard, removeDeadConditions, restoreDynamicTemplates, scanStoryboard, mapCustomApisToNameAndNamespace } from '@next-core/brick-utils';
 import _, { set, get, difference, identity, uniqueId, cloneDeep, clamp, isNil, isEmpty, sortBy, orderBy, merge, isObject as isObject$1, uniq, pick, omit, findLastIndex, noop, isString as isString$1 } from 'lodash';
 import { http, HttpResponseError, HttpAbortError, HttpFetchError } from '@next-core/brick-http';
 import moment from 'moment';
@@ -870,10 +870,12 @@ function doTransform(data, to, options) {
       }
       var contextNames = trackContext(raw);
       var stateNames = trackState(raw);
-      if (contextNames || stateNames) {
+      var formStateNames = trackFormState(raw);
+      if (contextNames || stateNames || formStateNames) {
         options.trackingContextList.push({
           contextNames,
           stateNames,
+          formStateNames,
           propName: k,
           propValue: v
         });
@@ -1718,10 +1720,12 @@ function _checkIf(rawIf, ctx, fn) {
 }
 
 class StoryboardContextWrapper {
-  constructor(tplContextId) {
+  constructor(tplContextId, formContextId) {
     _defineProperty$1(this, "data", new Map());
     _defineProperty$1(this, "tplContextId", void 0);
+    _defineProperty$1(this, "formContextId", void 0);
     this.tplContextId = tplContextId;
+    this.formContextId = formContextId;
   }
   set(name, item) {
     if (this.data.has(name)) {
@@ -1782,7 +1786,7 @@ class StoryboardContextWrapper {
           var _item$eventTarget;
           item.loaded = true;
           item.value = val;
-          (_item$eventTarget = item.eventTarget) === null || _item$eventTarget === void 0 ? void 0 : _item$eventTarget.dispatchEvent(new CustomEvent(this.tplContextId ? "state.change" : "context.change", {
+          (_item$eventTarget = item.eventTarget) === null || _item$eventTarget === void 0 ? void 0 : _item$eventTarget.dispatchEvent(new CustomEvent(this.formContextId ? "formstate.change" : this.tplContextId ? "state.change" : "context.change", {
             detail: item.value
           }));
         }, err => {
@@ -1817,7 +1821,7 @@ class StoryboardContextWrapper {
         item.value = value;
       }
     }
-    (_item$eventTarget2 = item.eventTarget) === null || _item$eventTarget2 === void 0 ? void 0 : _item$eventTarget2.dispatchEvent(new CustomEvent(this.tplContextId ? "state.change" : "context.change", {
+    (_item$eventTarget2 = item.eventTarget) === null || _item$eventTarget2 === void 0 ? void 0 : _item$eventTarget2.dispatchEvent(new CustomEvent(this.formContextId ? "formstate.change" : this.tplContextId ? "state.change" : "context.change", {
       detail: item.value
     }));
   }
@@ -1953,7 +1957,7 @@ function resolveFreeVariableValue(value, contextConf, mergedContext, storyboardC
   };
   if (contextConf.onChange) {
     for (var handler of [].concat(contextConf.onChange)) {
-      newContext.eventTarget.addEventListener(storyboardContextWrapper.tplContextId ? "state.change" : "context.change", listenerFactory(handler, mergedContext, brick));
+      newContext.eventTarget.addEventListener(storyboardContextWrapper.formContextId ? "formstate.change" : storyboardContextWrapper.tplContextId ? "state.change" : "context.change", listenerFactory(handler, mergedContext, brick));
     }
   }
   if (contextConf.track) {
@@ -1963,7 +1967,7 @@ function resolveFreeVariableValue(value, contextConf, mergedContext, storyboardC
     for (var dep of deps) {
       var _eventTarget;
       var ctx = storyboardContextWrapper.get().get(dep);
-      ctx === null || ctx === void 0 ? void 0 : (_eventTarget = ctx.eventTarget) === null || _eventTarget === void 0 ? void 0 : _eventTarget.addEventListener(isTemplateState ? "state.change" : "context.change", () => {
+      ctx === null || ctx === void 0 ? void 0 : (_eventTarget = ctx.eventTarget) === null || _eventTarget === void 0 ? void 0 : _eventTarget.addEventListener(storyboardContextWrapper.formContextId ? "formstate.change" : isTemplateState ? "state.change" : "context.change", () => {
         if (load) {
           storyboardContextWrapper.updateValue(contextConf.name, {
             cache: "default"
@@ -2058,7 +2062,7 @@ class CustomFormContext {
     _defineProperty$1(this, "formState", void 0);
     _defineProperty$1(this, "id", uniqueId("form-ctx-"));
     FormContextMap.set(this.id, this);
-    this.formState = new StoryboardContextWrapper();
+    this.formState = new StoryboardContextWrapper("", this.id);
   }
 }
 function getCustomFormContext(formContextId) {
@@ -2678,10 +2682,12 @@ function computeRealProperties(properties, context, injectDeep, trackingContextL
         var raw = typeof propValue === "string" ? propValue : getPreEvaluatedRaw(propValue);
         var contextNames = trackContext(raw);
         var stateNames = trackState(raw);
-        if (contextNames || stateNames) {
+        var formStateNames = trackFormState(raw);
+        if (contextNames || stateNames || formStateNames) {
           trackingContextList.push({
             contextNames,
             stateNames,
+            formStateNames,
             propName,
             propValue
           });
@@ -5684,6 +5690,8 @@ function listenerFactory(handler, context, runtimeBrick) {
       case "state.refresh":
       case "state.load":
         return builtinStateListenerFactory(method, handler.args, handler, handler.callback, context);
+      case "formstate.update":
+        return builtinFormStateListenerFactory(method, handler.args, handler, handler.callback, context);
       case "tpl.dispatchEvent":
         return builtinTplDispatchEventFactory(handler.args, handler, context);
       case "message.subscribe":
@@ -5776,6 +5784,13 @@ function getTplContext(tplContextId) {
   }
   return getCustomTemplateContext(tplContextId);
 }
+function getFormContext(formContextId) {
+  // istanbul ignore if
+  if (!formContextId) {
+    throw new Error("Calling tpl but no formContextId was found in context!");
+  }
+  return getCustomFormContext(formContextId);
+}
 function builtinTplDispatchEventFactory(args, ifContainer, context) {
   return function (event) {
     if (!looseCheckIf(ifContainer, _objectSpread(_objectSpread({}, context), {}, {
@@ -5812,6 +5827,18 @@ function builtinStateListenerFactory(method, args, ifContainer, callback, contex
     tplContext.state.updateValue(name, value, method === "update" ? "replace" : method, callback);
   };
 }
+function builtinFormStateListenerFactory(method, args, ifContainer, callback, context) {
+  return function (event) {
+    if (!looseCheckIf(ifContainer, _objectSpread(_objectSpread({}, context), {}, {
+      event
+    }))) {
+      return;
+    }
+    var formContext = getFormContext(context.formContextId);
+    var [name, value] = argsFactory(args, context, event);
+    formContext.formState.updateValue(name, value, method === "update" ? "replace" : method, callback);
+  };
+}
 function builtinLocationListenerFactory(method, args, ifContainer, context) {
   return function (event) {
     if (!looseCheckIf(ifContainer, _objectSpread(_objectSpread({}, context), {}, {
@@ -9010,6 +9037,14 @@ function listenOnTrackingContext(brick, trackingContextList, context) {
         _ctx === null || _ctx === void 0 ? void 0 : (_eventTarget2 = _ctx.eventTarget) === null || _eventTarget2 === void 0 ? void 0 : _eventTarget2.addEventListener("state.change", listener);
       }
     }
+    if (track.formStateNames) {
+      var formContext = getCustomFormContext(context.formContextId);
+      for (var _stateName of track.formStateNames) {
+        var _eventTarget3;
+        var _ctx2 = formContext.formState.get().get(_stateName);
+        _ctx2 === null || _ctx2 === void 0 ? void 0 : (_eventTarget3 = _ctx2.eventTarget) === null || _eventTarget3 === void 0 ? void 0 : _eventTarget3.addEventListener("formstate.change", listener);
+      }
+    }
   };
   for (var track of trackingContextList) {
     _loop(track);
@@ -9268,7 +9303,7 @@ function getStoryboard(datasource, result, fields, isPreview, formContextId) {
       dataItem.properties = _objectSpread(_objectSpread({}, dataItem.properties), {}, {
         className: "form-preview"
       });
-      dataItem.events = {
+      dataItem.events = _objectSpread(_objectSpread({}, dataItem.events), {}, {
         "validate.error": [{
           action: "preview.debug",
           args: ["validate.error", "<% EVENT.detail %>"]
@@ -9277,7 +9312,7 @@ function getStoryboard(datasource, result, fields, isPreview, formContextId) {
           action: "preview.debug",
           args: ["validate.success", "<% EVENT.detail %>"]
         }]
-      };
+      });
     }
     //数据初始化：与默认属性进行合并
     Object.keys(defaultProperties).forEach(item => {