Merge pull request #248 from openblocks-dev/dev0209

Dev0209

Author: hanshuai

client/VERSION

@@ -1 +1 @@
-1.1.4
+1.1.5

client/packages/openblocks-cli/client.d.ts

@@ -36,3 +36,5 @@ declare var REACT_APP_LOG_LEVEL: string;
 declare var REACT_APP_IMPORT_MAP: string;
 declare var REACT_APP_SERVER_IPS: string;
 declare var REACT_APP_BUNDLE_TYPE: "sdk" | "app";
+declare var REACT_APP_DISABLE_JS_SANDBOX: string;
+declare var REACT_APP_BUNDLE_BUILTIN_PLUGIN: string;

client/packages/openblocks-comps/package.json

@@ -1,6 +1,6 @@
 {
   "name": "openblocks-comps",
-  "version": "0.0.3",
+  "version": "0.0.4",
   "type": "module",
   "license": "MIT",
   "dependencies": {

client/packages/openblocks-comps/src/comps/chartComp/chartComp.tsx

@@ -9,7 +9,7 @@ import { AxisFormatterComp, EchartsAxisType } from "./chartConfigs/cartesianAxis
 import { chartChildrenMap, ChartSize, getDataKeys } from "./chartConstants";
 import { chartPropertyView } from "./chartPropertyView";
 import _ from "lodash";
-import { useEffect, useMemo, useRef, useState } from "react";
+import { useContext, useEffect, useMemo, useRef, useState } from "react";
 import ReactResizeDetector from "react-resize-detector";
 import ReactECharts from "./reactEcharts";
 import {
@@ -24,6 +24,8 @@ import {
   withDefault,
   withExposingConfigs,
   withViewFn,
+  ThemeContext,
+  chartColorPalette,
 } from "openblocks-sdk";
 import { getEchartsLocale, trans } from "i18n/comps";
 import { ItemColorComp } from "comps/chartComp/chartConfigs/lineChartConfig";
@@ -32,6 +34,7 @@ import {
   getEchartsConfig,
   getSelectedPoints,
 } from "comps/chartComp/chartUtils";
+import log from "loglevel";
 
 let ChartTmpComp = (function () {
   return new UICompBuilder(chartChildrenMap, () => null)
@@ -43,6 +46,17 @@ ChartTmpComp = withViewFn(ChartTmpComp, (comp) => {
   const echartsCompRef = useRef<ReactECharts | null>();
   const [chartSize, setChartSize] = useState<ChartSize>();
   const firstResize = useRef(true);
+  const theme = useContext(ThemeContext);
+  const defaultChartTheme = {
+    color: chartColorPalette,
+    backgroundColor: "#fff",
+  };
+  let themeConfig = defaultChartTheme;
+  try {
+    themeConfig = theme?.theme.chart ? JSON.parse(theme?.theme.chart) : defaultChartTheme;
+  } catch (error) {
+    log.error('theme chart error: ', error);
+  }
   const onEvent = comp.children.onEvent.getView();
   useEffect(() => {
     // bind events
@@ -94,6 +108,7 @@ ChartTmpComp = withViewFn(ChartTmpComp, (comp) => {
         lazyUpdate
         opts={{ locale: getEchartsLocale() }}
         option={option}
+        theme={themeConfig}
       />
     </ReactResizeDetector>
   );

client/packages/openblocks-comps/src/comps/chartComp/chartUtils.ts

@@ -135,9 +135,7 @@ export function getEchartsConfig(props: EchartsConfigProps, chartSize?: ChartSiz
     bottom: 35,
   };
   let config: EChartsOption = {
-    color: chartColorPalette,
     title: { text: props.title, left: "center" },
-    backgroundColor: "#fff",
     tooltip: {
       confine: true,
       trigger: axisChart ? "axis" : "item",

client/packages/openblocks-core/lib/index.cjs

@@ -318,8 +318,8 @@ var FunctionNode = /** @class */ (function (_super) {
     FunctionNode.prototype.dependValues = function () {
         return this.child.dependValues();
     };
-    FunctionNode.prototype.fetchInfo = function (exposingNodes) {
-        return this.child.fetchInfo(exposingNodes);
+    FunctionNode.prototype.fetchInfo = function (exposingNodes, options) {
+        return this.child.fetchInfo(exposingNodes, options);
     };
     __decorate([
         memoized()
@@ -390,12 +390,12 @@ var RecordNode = /** @class */ (function (_super) {
         });
         return ret;
     };
-    RecordNode.prototype.fetchInfo = function (exposingNodes) {
+    RecordNode.prototype.fetchInfo = function (exposingNodes, options) {
         var isFetching = false;
         var ready = true;
         Object.entries(this.children).forEach(function (_a) {
             _a[0]; var child = _a[1];
-            var fi = child.fetchInfo(exposingNodes);
+            var fi = child.fetchInfo(exposingNodes, options);
             isFetching = fi.isFetching || isFetching;
             ready = fi.ready && ready;
         });
@@ -1552,6 +1552,7 @@ function string2Fn(unevaledValue, type, methods) {
 
 var IS_FETCHING_FIELD = "isFetching";
 var LATEST_END_TIME_FIELD = "latestEndTime";
+var TRIGGER_TYPE_FIELD = "triggerType";
 /**
  * user input node
  *
@@ -1662,7 +1663,7 @@ var CodeNode = /** @class */ (function (_super) {
         });
         return ret;
     };
-    CodeNode.prototype.fetchInfo = function (exposingNodes) {
+    CodeNode.prototype.fetchInfo = function (exposingNodes, options) {
         if (!!this.evalCache.inIsFetching) {
             return {
                 isFetching: false,
@@ -1676,6 +1677,11 @@ var CodeNode = /** @class */ (function (_super) {
             var ready_1 = true;
             topDepends.forEach(function (paths, depend) {
                 var value = depend.evaluate(exposingNodes);
+                if ((options === null || options === void 0 ? void 0 : options.ignoreManualDepReadyStatus) &&
+                    ___default["default"].has(value, TRIGGER_TYPE_FIELD) &&
+                    value.triggerType === "manual") {
+                    return;
+                }
                 if (___default["default"].has(value, IS_FETCHING_FIELD)) {
                     isFetching_1 = isFetching_1 || value.isFetching === true;
                 }
@@ -1685,7 +1691,7 @@ var CodeNode = /** @class */ (function (_super) {
             });
             var dependingNodeMap = this.filterNodes(exposingNodes);
             dependingNodeMap.forEach(function (paths, depend) {
-                var fi = depend.fetchInfo(exposingNodes);
+                var fi = depend.fetchInfo(exposingNodes, options);
                 isFetching_1 = isFetching_1 || fi.isFetching;
                 ready_1 = ready_1 && fi.ready;
             });
@@ -1727,9 +1733,10 @@ function fixCyclic(extra, exposingNodes) {
  */
 var FetchCheckNode = /** @class */ (function (_super) {
     __extends(FetchCheckNode, _super);
-    function FetchCheckNode(child) {
+    function FetchCheckNode(child, options) {
         var _this = _super.call(this) || this;
         _this.child = child;
+        _this.options = options;
         _this.type = "fetchCheck";
         return _this;
     }
@@ -1746,7 +1753,7 @@ var FetchCheckNode = /** @class */ (function (_super) {
         return this.child.dependValues();
     };
     FetchCheckNode.prototype.fetchInfo = function (exposingNodes) {
-        return this.child.fetchInfo(exposingNodes);
+        return this.child.fetchInfo(exposingNodes, this.options);
     };
     __decorate([
         memoized()
@@ -3322,6 +3329,7 @@ var MultiBaseComp = /** @class */ (function (_super) {
     __extends(MultiBaseComp, _super);
     function MultiBaseComp(params) {
         var _this = _super.call(this, params) || this;
+        _this.IGNORABLE_DEFAULT_VALUE = {};
         _this.children = _this.parseChildrenFromValue(params);
         return _this;
     }
@@ -3465,16 +3473,24 @@ var MultiBaseComp = /** @class */ (function (_super) {
         });
         return _super.prototype.changeDispatch.call(this, dispatch).setChildren(newChildren, { keepCacheKeys: ["node"] });
     };
+    MultiBaseComp.prototype.ignoreChildDefaultValue = function () {
+        return false;
+    };
     MultiBaseComp.prototype.toJsonValue = function () {
         var _this = this;
         var result = {};
+        var ignore = this.ignoreChildDefaultValue();
         Object.keys(this.children).forEach(function (key) {
             var comp = _this.children[key];
             // FIXME: this implementation is a little tricky, better choose a encapsulated implementation
             if (comp.hasOwnProperty("NO_PERSISTENCE")) {
                 return;
             }
-            result[key] = comp.toJsonValue();
+            var value = comp.toJsonValue();
+            if (ignore && ___default["default"].isEqual(value, comp["IGNORABLE_DEFAULT_VALUE"])) {
+                return;
+            }
+            result[key] = value;
         });
         return result;
     };
@@ -7484,10 +7500,14 @@ var Translator = /** @class */ (function () {
         this.messages = Object.assign({}, data, globalMessages);
         this.language = language;
         this.trans = this.trans.bind(this);
+        this.transToNode = this.transToNode.bind(this);
     }
     Translator.prototype.trans = function (key, variables) {
+        return this.transToNode(key, variables).toString();
+    };
+    Translator.prototype.transToNode = function (key, variables) {
         var message = this.getMessage(key);
-        return new IntlMessageFormat(message, i18n.locale).format(variables).toString();
+        return new IntlMessageFormat(message, i18n.locale).format(variables);
     };
     Translator.prototype.getMessage = function (key) {
         var value = this.messages[key];

client/packages/openblocks-core/lib/index.d.ts

@@ -1,3 +1,5 @@
+/// <reference types="react" />
+import * as react from "react";
 import { ReactNode } from "react";
 
 declare type EvalMethods = Record<string, Record<string, Function>>;
@@ -27,6 +29,9 @@ declare type NonOptionalKeys<T> = {
 declare type RecordOptionalNodeToValue<T> = {
   [K in NonOptionalKeys<T>]: NodeToValue<T[K]>;
 };
+interface FetchInfoOptions {
+  ignoreManualDepReadyStatus?: boolean;
+}
 /**
  * the base structure for evaluate
  */
@@ -56,7 +61,7 @@ interface Node<T> {
    * FIXME: this should be a protected function.
    */
   filterNodes(exposingNodes: Record<string, Node<unknown>>): Map<Node<unknown>, Set<string>>;
-  fetchInfo(exposingNodes: Record<string, Node<unknown>>): FetchInfo;
+  fetchInfo(exposingNodes: Record<string, Node<unknown>>, options?: FetchInfoOptions): FetchInfo;
 }
 declare abstract class AbstractNode<T> implements Node<T> {
   readonly type: string;
@@ -140,7 +145,7 @@ declare class FunctionNode<T, OutputType> extends AbstractNode<OutputType> {
   justEval(exposingNodes: Record<string, Node<unknown>>, methods?: EvalMethods): OutputType;
   getChildren(): Node<unknown>[];
   dependValues(): Record<string, unknown>;
-  fetchInfo(exposingNodes: Record<string, Node<unknown>>): FetchInfo;
+  fetchInfo(exposingNodes: Record<string, Node<unknown>>, options?: FetchInfoOptions): FetchInfo;
 }
 declare function withFunction<T, OutputType>(
   child: Node<T>,
@@ -193,7 +198,7 @@ declare class CodeNode extends AbstractNode<ValueAndMsg<unknown>> {
   ): ValueAndMsg<unknown>;
   getChildren(): Node<unknown>[];
   dependValues(): Record<string, unknown>;
-  fetchInfo(exposingNodes: Record<string, Node<unknown>>): FetchInfo;
+  fetchInfo(exposingNodes: Record<string, Node<unknown>>, options?: FetchInfoOptions): FetchInfo;
 }
 /**
  * generate node for unevaledValue
@@ -207,8 +212,9 @@ declare function fromUnevaledValue(
  */
 declare class FetchCheckNode extends AbstractNode<FetchInfo> {
   readonly child: Node<unknown>;
+  readonly options?: FetchInfoOptions | undefined;
   readonly type = "fetchCheck";
-  constructor(child: Node<unknown>);
+  constructor(child: Node<unknown>, options?: FetchInfoOptions | undefined);
   filterNodes(exposingNodes: Record<string, Node<unknown>>): Map<Node<unknown>, Set<string>>;
   justEval(exposingNodes: Record<string, Node<unknown>>): FetchInfo;
   getChildren(): Node<unknown>[];
@@ -236,7 +242,10 @@ declare class RecordNode<T extends Record<string, Node<unknown>>> extends Abstra
   ): RecordNodeToValue<T>;
   getChildren(): Node<unknown>[];
   dependValues(): Record<string, unknown>;
-  fetchInfo(exposingNodes: Record<string, Node<unknown>>): {
+  fetchInfo(
+    exposingNodes: Record<string, Node<unknown>>,
+    options?: FetchInfoOptions
+  ): {
     isFetching: boolean;
     ready: boolean;
   };
@@ -678,6 +687,8 @@ declare abstract class MultiBaseComp<
   };
   nodeWithoutCache(): NodeType;
   changeDispatch(dispatch: DispatchType): this;
+  protected ignoreChildDefaultValue(): boolean;
+  readonly IGNORABLE_DEFAULT_VALUE: {};
   toJsonValue(): DataType;
   autoHeight(): boolean;
 }
@@ -737,7 +748,7 @@ declare type AddPrefix<T, P extends string> = {
 };
 declare const globalMessages: AddPrefix<{}, "@">;
 declare type GlobalMessageKey = NestedKey<typeof globalMessages>;
-declare type VariableValue = string | number | boolean | Date;
+declare type VariableValue = string | number | boolean | Date | React.ReactNode;
 declare class Translator<Messages extends object> {
   private readonly messages;
   readonly language: string;
@@ -746,6 +757,22 @@ declare class Translator<Messages extends object> {
     key: NestedKey<Messages> | GlobalMessageKey,
     variables?: Record<string, VariableValue>
   ): string;
+  transToNode(
+    key: NestedKey<Messages> | GlobalMessageKey,
+    variables?: Record<string, VariableValue>
+  ):
+    | string
+    | {}
+    | react.ReactElement<any, string | react.JSXElementConstructor<any>>
+    | Iterable<react.ReactNode>
+    | react.ReactPortal
+    | (
+        | string
+        | {}
+        | react.ReactElement<any, string | react.JSXElementConstructor<any>>
+        | Iterable<react.ReactNode>
+        | react.ReactPortal
+      )[];
   private getMessage;
 }
 declare function getI18nObjects<I18nObjects>(fileData: object, filterLocales?: string): I18nObjects;
@@ -781,6 +808,7 @@ export {
   ExtraNodeType,
   FetchCheckNode,
   FetchInfo,
+  FetchInfoOptions,
   FunctionNode,
   MultiBaseComp,
   MultiChangeAction,