Merge branch 'develop' into github_develop

Author: lvhuichao

client/packages/openblocks-cli/package.json

@@ -2,6 +2,7 @@
   "name": "openblocks-cli",
   "description": "CLI tool used to start build publish openblocks components",
   "version": "0.0.24",
+  "license": "MIT",
   "bin": "./index.js",
   "type": "module",
   "exports": {

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

@@ -279,6 +279,13 @@ let CalendarBasicComp = (function () {
       });
     };
 
+    let initialDate = defaultDate;
+    try {
+      initialDate = new Date(defaultDate).toISOString();
+    } catch (error) {
+      initialDate = undefined;
+    }
+
     return (
       <Wrapper
         ref={ref}
@@ -287,6 +294,7 @@ let CalendarBasicComp = (function () {
         theme={theme?.theme}
         onDoubleClick={handleDbClick}
         left={left}
+        key={initialDate ? defaultView + initialDate : defaultView}
       >
         <FullCalendar
           slotEventOverlap={false}
@@ -323,7 +331,7 @@ let CalendarBasicComp = (function () {
           slotLabelFormat={slotLabelFormat}
           viewClassNames={viewClassNames}
           moreLinkText={trans("calendar.more")}
-          initialDate={defaultDate}
+          initialDate={initialDate}
           initialView={defaultView}
           editable={editable}
           selectable={editable}

client/packages/openblocks-comps/src/i18n/comps/locales/en.ts

@@ -123,7 +123,7 @@ export const en = {
     friday: "Friday",
     saturday: "Saturday",
     sunday: "Sunday",
-    startWeek: "Start week on",
+    startWeek: "Start from",
     creatEvent: "Create event",
     editEvent: "Edit event",
     eventName: "Event name",

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

@@ -315,6 +315,9 @@ var FunctionNode = /** @class */ (function (_super) {
     __decorate([
         memoized()
     ], FunctionNode.prototype, "filterNodes", null);
+    __decorate([
+        memoized()
+    ], FunctionNode.prototype, "fetchInfo", null);
     return FunctionNode;
 }(AbstractNode));
 function withFunction(child, func) {
@@ -395,6 +398,9 @@ var RecordNode = /** @class */ (function (_super) {
     __decorate([
         memoized()
     ], RecordNode.prototype, "filterNodes", null);
+    __decorate([
+        memoized()
+    ], RecordNode.prototype, "fetchInfo", null);
     return RecordNode;
 }(AbstractNode));
 function fromRecord(record) {
@@ -1717,6 +1723,9 @@ var CodeNode = /** @class */ (function (_super) {
     __decorate([
         memoized()
     ], CodeNode.prototype, "filterDirectDepends", null);
+    __decorate([
+        memoized()
+    ], CodeNode.prototype, "fetchInfo", null);
     return CodeNode;
 }(AbstractNode));
 /**
@@ -1765,6 +1774,9 @@ var FetchCheckNode = /** @class */ (function (_super) {
     __decorate([
         memoized()
     ], FetchCheckNode.prototype, "filterNodes", null);
+    __decorate([
+        memoized()
+    ], FetchCheckNode.prototype, "fetchInfo", null);
     return FetchCheckNode;
 }(AbstractNode));
 function isFetching(node) {
@@ -2893,6 +2905,9 @@ var WrapNode = /** @class */ (function (_super) {
     __decorate([
         memoized()
     ], WrapNode.prototype, "filterNodes", null);
+    __decorate([
+        memoized()
+    ], WrapNode.prototype, "fetchInfo", null);
     return WrapNode;
 }(AbstractNode));
 

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

@@ -307,6 +307,9 @@ var FunctionNode = /** @class */ (function (_super) {
     __decorate([
         memoized()
     ], FunctionNode.prototype, "filterNodes", null);
+    __decorate([
+        memoized()
+    ], FunctionNode.prototype, "fetchInfo", null);
     return FunctionNode;
 }(AbstractNode));
 function withFunction(child, func) {
@@ -387,6 +390,9 @@ var RecordNode = /** @class */ (function (_super) {
     __decorate([
         memoized()
     ], RecordNode.prototype, "filterNodes", null);
+    __decorate([
+        memoized()
+    ], RecordNode.prototype, "fetchInfo", null);
     return RecordNode;
 }(AbstractNode));
 function fromRecord(record) {
@@ -1709,6 +1715,9 @@ var CodeNode = /** @class */ (function (_super) {
     __decorate([
         memoized()
     ], CodeNode.prototype, "filterDirectDepends", null);
+    __decorate([
+        memoized()
+    ], CodeNode.prototype, "fetchInfo", null);
     return CodeNode;
 }(AbstractNode));
 /**
@@ -1757,6 +1766,9 @@ var FetchCheckNode = /** @class */ (function (_super) {
     __decorate([
         memoized()
     ], FetchCheckNode.prototype, "filterNodes", null);
+    __decorate([
+        memoized()
+    ], FetchCheckNode.prototype, "fetchInfo", null);
     return FetchCheckNode;
 }(AbstractNode));
 function isFetching(node) {
@@ -2885,6 +2897,9 @@ var WrapNode = /** @class */ (function (_super) {
     __decorate([
         memoized()
     ], WrapNode.prototype, "filterNodes", null);
+    __decorate([
+        memoized()
+    ], WrapNode.prototype, "fetchInfo", null);
     return WrapNode;
 }(AbstractNode));
 

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

@@ -145,6 +145,7 @@ export class CodeNode extends AbstractNode<ValueAndMsg<unknown>> {
     return ret;
   }
 
+  @memoized()
   override fetchInfo(
     exposingNodes: Record<string, Node<unknown>>,
     options?: FetchInfoOptions

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

@@ -28,6 +28,7 @@ export class FetchCheckNode extends AbstractNode<FetchInfo> {
     return this.child.dependValues();
   }
 
+  @memoized()
   override fetchInfo(exposingNodes: Record<string, Node<unknown>>) {
     return this.child.fetchInfo(exposingNodes, this.options);
   }

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

@@ -35,6 +35,7 @@ export class FunctionNode<T, OutputType> extends AbstractNode<OutputType> {
     return this.child.dependValues();
   }
 
+  @memoized()
   override fetchInfo(exposingNodes: Record<string, Node<unknown>>, options?: FetchInfoOptions) {
     return this.child.fetchInfo(exposingNodes, options);
   }

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

@@ -57,6 +57,7 @@ export class RecordNode<T extends Record<string, Node<unknown>>> extends Abstrac
     return ret;
   }
 
+  @memoized()
   override fetchInfo(exposingNodes: Record<string, Node<unknown>>, options?: FetchInfoOptions) {
     let isFetching = false;
     let ready = true;

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

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