- fix: table performance

- feat: resource dropdown support search
- feat: branding
- fix: scanner comp adapt oppo
- fix: chrome86 link issue
- fix: input validate ref self

Author: ggbond2077

client/packages/openblocks-comps/package.json

@@ -1,11 +1,12 @@
 {
   "name": "openblocks-comps",
-  "version": "0.0.2",
+  "version": "0.0.3",
   "type": "module",
   "license": "MIT",
   "dependencies": {
     "@types/react": "17",
     "@types/react-dom": "17",
+    "big.js": "^6.2.1",
     "openblocks-cli": "workspace:^",
     "openblocks-sdk": "workspace:^",
     "react": "17",

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

@@ -15,6 +15,7 @@ import { ScatterChartConfig } from "./chartConfigs/scatterChartConfig";
 import { SeriesListComp } from "./seriesComp";
 import { EChartsOption } from "echarts";
 import { i18nObjs, trans } from "i18n/comps";
+import { JSONValue } from "openblocks";
 
 export const ChartTypeOptions = [
   {
@@ -183,7 +184,18 @@ export const noDataPieChartConfig = {
 export type ChartSize = { w: number; h: number };
 
 export const getDataKeys = (data: Array<JSONObject>) => {
-  return data && data[0] ? Object.keys(data[0]) : [];
+  if (!data) {
+    return [];
+  }
+  const dataKeys: Array<string> = [];
+  data.slice(0, 50).forEach((d) => {
+    Object.keys(d).forEach((key) => {
+      if (!dataKeys.includes(key)) {
+        dataKeys.push(key);
+      }
+    });
+  });
+  return dataKeys;
 };
 
 const ChartOptionMap = {

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

@@ -10,6 +10,7 @@ import { EChartsOption } from "echarts";
 import _ from "lodash";
 import { chartColorPalette, isNumeric, JSONObject } from "openblocks-sdk";
 import { calcXYConfig } from "comps/chartComp/chartConfigs/cartesianAxisConfig";
+import Big from "big.js";
 
 export function transformData(
   originData: JSONObject[],
@@ -38,7 +39,8 @@ export function transformData(
       if (key === xAxis) {
         return;
       } else if (isNumeric(cur[key])) {
-        prev[groupValue][key] += Number(cur[key]);
+        const bigNum = Big(cur[key]);
+        prev[groupValue][key] = bigNum.add(prev[groupValue][key]).toNumber();
       } else {
         prev[groupValue][key] += 1;
       }

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

@@ -2,6 +2,7 @@ import { ReactNode } from "react";
 
 declare type EvalMethods = Record<string, Record<string, Function>>;
 declare type CodeType = undefined | "JSON" | "Function";
+declare type CodeFunction = (args?: Record<string, unknown>, runInHost?: boolean) => any;
 
 declare type NodeToValue<NodeT> = NodeT extends Node<infer ValueType> ? ValueType : never;
 declare type FetchInfo = {
@@ -284,7 +285,7 @@ declare class WrapNode<T> extends AbstractNode<T> {
   dependValues(): Record<string, unknown>;
 }
 
-declare type WrapContextFn<T> = (params: Record<string, unknown>) => T;
+declare type WrapContextFn<T> = (params?: Record<string, unknown>) => T;
 declare function wrapContext<T>(node: Node<T>): Node<WrapContextFn<T>>;
 
 /**
@@ -760,6 +761,7 @@ export {
   BroadcastAction,
   CachedNode,
   ChangeValueAction,
+  CodeFunction,
   CodeNode,
   CodeNodeOptions,
   CodeType,

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

@@ -1497,19 +1497,13 @@ var RelaxedJsonParser = /** @class */ (function (_super) {
     };
     return RelaxedJsonParser;
 }(DefaultParser));
-function mergeContext(context, args) {
-    if (!args) {
-        return context;
-    }
-    return Object.assign(Object.assign({}, args), context);
-}
 function evalFunction(unevaledValue, context, methods, isAsync) {
     try {
         return new ValueAndMsg(function (args, runInHost) {
             if (runInHost === void 0) { runInHost = false; }
             return evalFunc(unevaledValue.startsWith("return")
                 ? unevaledValue + "\n"
-                : "return function(){'use strict'; " + unevaledValue + "\n}()", mergeContext(context, args), methods, { disableLimit: runInHost }, isAsync);
+                : "return function(){'use strict'; " + unevaledValue + "\n}()", args ? __assign(__assign({}, context), args) : context, methods, { disableLimit: runInHost }, isAsync);
         });
     }
     catch (err) {
@@ -2897,17 +2891,19 @@ var WrapContextNode = /** @class */ (function (_super) {
     };
     WrapContextNode.prototype.justEval = function (exposingNodes, methods) {
         var _this = this;
-        var paramNodes = {};
         return function (params) {
-            Object.entries(params).forEach(function (_a) {
-                var paramName = _a[0], value = _a[1];
-                // node remains unchanged if value doesn't change, to keep the cache valid
-                var paramNode = paramNodes[paramName];
-                if (!paramNode || value !== paramNode.value) {
-                    paramNodes[paramName] = fromValueWithCache(value); // requires cache
-                }
-            });
-            return _this.child.evaluate(__assign(__assign({}, exposingNodes), paramNodes), methods);
+            var nodes;
+            if (params) {
+                nodes = __assign({}, exposingNodes);
+                Object.entries(params).forEach(function (_a) {
+                    var key = _a[0], value = _a[1];
+                    nodes[key] = fromValueWithCache(value);
+                });
+            }
+            else {
+                nodes = exposingNodes;
+            }
+            return _this.child.evaluate(nodes, methods);
         };
     };
     WrapContextNode.prototype.getChildren = function () {

client/packages/openblocks-core/src/eval/index.tsx

@@ -11,7 +11,7 @@ export * from "./wrapContextNodeV2";
 export { transformWrapper } from "./utils/codeNodeUtils";
 export { evalPerfUtil } from "./utils/perfUtils";
 
-export type { EvalMethods, CodeType } from "./types/evalTypes";
+export type { EvalMethods, CodeType, CodeFunction } from "./types/evalTypes";
 export { ValueAndMsg } from "./types/valueAndMsg";
 export { relaxedJSONToJSON } from "./utils/relaxedJson";
 export { getDynamicStringSegments, isDynamicSegment } from "./utils/segmentUtils";

client/packages/openblocks-core/src/eval/types/evalTypes.tsx

@@ -1,3 +1,5 @@
 export type EvalMethods = Record<string, Record<string, Function>>;
 
 export type CodeType = undefined | "JSON" | "Function";
+
+export type CodeFunction = (args?: Record<string, unknown>, runInHost?: boolean) => any;

client/packages/openblocks-core/src/eval/utils/evaluate.test.tsx

@@ -29,6 +29,8 @@ describe("deps", () => {
     expect(depsD.has(context.data)).toBe(true);
     expect(depsD.has(context.str)).toBe(true);
     expect(depsD.has(context.i)).toBe(false);
+
+    expect(filterDepends("{{new Date().toLocaleString()}}", context)).toStrictEqual(new Map());
   });
 });
 

client/packages/openblocks-core/src/eval/utils/string2Fn.tsx

@@ -3,7 +3,7 @@ import _ from "lodash";
 import { getErrorMessage } from "./nodeUtils";
 import { evalFunc, evalScript } from "./evalScript";
 import { getDynamicStringSegments, isDynamicSegment } from "./segmentUtils";
-import { CodeType, EvalMethods } from "../types/evalTypes";
+import { CodeFunction, CodeType, EvalMethods } from "../types/evalTypes";
 import { relaxedJSONToJSON } from "./relaxedJson";
 
 export type Fn = (context: Record<string, unknown>) => ValueAndMsg<unknown>;
@@ -154,26 +154,19 @@ class RelaxedJsonParser extends DefaultParser {
   }
 }
 
-function mergeContext(context: Record<string, unknown>, args?: Record<string, unknown>) {
-  if (!args) {
-    return context;
-  }
-  return Object.assign(Object.assign({}, args), context);
-}
-
 export function evalFunction(
   unevaledValue: string,
   context: Record<string, unknown>,
   methods?: EvalMethods,
   isAsync?: boolean
-): ValueAndMsg<Function> {
+): ValueAndMsg<CodeFunction> {
   try {
     return new ValueAndMsg((args?: Record<string, unknown>, runInHost: boolean = false) =>
       evalFunc(
         unevaledValue.startsWith("return")
           ? unevaledValue + "\n"
           : "return function(){'use strict'; " + unevaledValue + "\n}()",
-        mergeContext(context, args),
+        args ? { ...context, ...args } : context,
         methods,
         { disableLimit: runInHost },
         isAsync

client/packages/openblocks-core/src/eval/wrapContextNode.test.tsx

@@ -10,6 +10,8 @@ it("context test", () => {
   const c1Value = c1.evaluate();
   expect(c1Value({ v1: 10, v2: 10 }).xx).toStrictEqual("11 30");
   expect(c1Value({ v1: 11, v2: 11 }).xx).toStrictEqual("11 32");
+  expect(c1Value({ v1: 11 }).xx).toStrictEqual("11 NaN");
+  expect(c1Value().xx).toStrictEqual("11 NaN");
 });
 
 it("context test 2", () => {
@@ -21,4 +23,6 @@ it("context test 2", () => {
   const c1Value = c1.evaluate();
   expect(c1Value({ i: 1 }).xx).toStrictEqual(1);
   expect(c1Value({ i: 1 }).yy).toStrictEqual("a1");
+  expect(c1Value({}).yy).toStrictEqual("a");
+  expect(c1Value().yy).toStrictEqual("a");
 });