multiChanges: feat: mssql support gui mode

- feat: download action support base64
- feat: dynamic query config
- feat: dynamic datasource extra params
- feat: download action support base64
- feat: refactor withType
- feat: restApi add icon
- feat(table) support edit column width
- feat(grid): develop Grid Comp based on ListView
- bug fixes

Author: ggbond2077

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

@@ -1691,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;
             });
@@ -3329,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;
     }
@@ -3472,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;
     };

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

@@ -687,6 +687,8 @@ declare abstract class MultiBaseComp<
   };
   nodeWithoutCache(): NodeType;
   changeDispatch(dispatch: DispatchType): this;
+  protected ignoreChildDefaultValue(): boolean;
+  readonly IGNORABLE_DEFAULT_VALUE: {};
   toJsonValue(): DataType;
   autoHeight(): boolean;
 }

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

@@ -1683,7 +1683,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;
             });
@@ -3321,6 +3321,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;
     }
@@ -3464,16 +3465,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 && _.isEqual(value, comp["IGNORABLE_DEFAULT_VALUE"])) {
+                return;
+            }
+            result[key] = value;
         });
         return result;
     };

client/packages/openblocks-core/src/baseComps/multiBaseComp.tsx

@@ -230,15 +230,25 @@ export abstract class MultiBaseComp<
     return super.changeDispatch(dispatch).setChildren(newChildren, { keepCacheKeys: ["node"] });
   }
 
+  protected ignoreChildDefaultValue() {
+    return false;
+  }
+
+  readonly IGNORABLE_DEFAULT_VALUE = {};
   override toJsonValue(): DataType {
     const result: Record<string, any> = {};
+    const ignore = this.ignoreChildDefaultValue();
     Object.keys(this.children).forEach((key) => {
       const 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();
+      const value = comp.toJsonValue();
+      if (ignore && _.isEqual(value, (comp as any)["IGNORABLE_DEFAULT_VALUE"])) {
+        return;
+      }
+      result[key] = value;
     });
     return result as DataType;
   }

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

@@ -182,7 +182,7 @@ export class CodeNode extends AbstractNode<ValueAndMsg<unknown>> {
 
       const dependingNodeMap = this.filterNodes(exposingNodes);
       dependingNodeMap.forEach((paths, depend) => {
-        const fi = depend.fetchInfo(exposingNodes);
+        const fi = depend.fetchInfo(exposingNodes, options);
         isFetching = isFetching || fi.isFetching;
         ready = ready && fi.ready;
       });