update: fix module preload and build issues etc.

- feat: select new item after bottom res copied
- fix: module preload before first eval
- fix: fix table edit's changeValue
- fix: download tar by nodejs instead of curl
- fix: oss query command check parameters not empty
- fix: download tarball without curl when build
- fix: cli crash in powershell

Author: sarike

client/packages/create-openblocks-plugin/index.js

@@ -1,7 +1,7 @@
 #!/usr/bin/env node
 import fs from "fs-extra";
 import path from "node:path";
-import { spawn } from "node:child_process";
+import { spawn } from "cross-spawn";
 import { writeFileSync, existsSync } from "node:fs";
 import chalk from "chalk";
 import { createCommand } from "commander";

client/packages/create-openblocks-plugin/package.json

@@ -1,11 +1,12 @@
 {
   "name": "create-openblocks-plugin",
-  "version": "0.0.2",
+  "version": "0.0.3",
   "bin": "./index.js",
   "type": "module",
   "dependencies": {
     "chalk": "4",
     "commander": "^9.4.1",
+    "cross-spawn": "^7.0.3",
     "fs-extra": "^10.1.0",
     "openblocks-dev-utils": "workspace:^"
   },

client/packages/openblocks-cli/actions/init.js

@@ -1,6 +1,6 @@
 import path from "path";
 import fs from "fs-extra";
-import { spawn } from "child_process";
+import { spawn } from "cross-spawn";
 import paths from "../config/paths.js";
 import { createRequire } from "node:module";
 const require = createRequire(import.meta.url);
@@ -84,9 +84,9 @@ export default async function initAction(options) {
 
   const notCopiedFiles = ["package.json", "README.md", "README-template.md", "node_modules"];
   fs.copySync(templateDir, "./", {
-    filter: (src) => notCopiedFiles.every((i) => !src.startsWith(`${templateDir}/${i}`)),
+    filter: (src) => notCopiedFiles.every((i) => !src.startsWith(path.join(templateDir, i))),
   });
-  fs.copyFile(`${templateDir}/README-template.md`, "./README.md");
+  fs.copyFile(path.join(templateDir, "README-template.md"), "./README.md");
   console.log("template files copied");
 
   const dependencies = [];

client/packages/openblocks-cli/package.json

@@ -1,7 +1,7 @@
 {
   "name": "openblocks-cli",
   "description": "CLI tool used to start build publish openblocks components",
-  "version": "0.0.22",
+  "version": "0.0.24",
   "bin": "./index.js",
   "type": "module",
   "exports": {
@@ -26,6 +26,7 @@
     "axios": "^1.1.3",
     "chalk": "4",
     "commander": "^9.4.1",
+    "cross-spawn": "^7.0.3",
     "fs-extra": "^10.1.0",
     "openblocks-dev-utils": "workspace:^",
     "react": "^17",

client/packages/openblocks/src/components/table/EditableCell.tsx

@@ -129,12 +129,3 @@ export function EditableCell<T extends JSONValue>(props: EditableCellProps<T>) {
     </ColumnTypeView>
   );
 }
-
-export function updateChangeValueFn<T extends JSONValue>(
-  dispatch: DispatchType,
-  equalOriginFn: (value: T) => boolean
-) {
-  return (value: T) => {
-    dispatch(changeChildAction("changeValue", equalOriginFn(value) ? null : value));
-  };
-}

client/packages/openblocks/src/comps/comps/moduleComp/moduleComp.tsx

@@ -281,21 +281,22 @@ class ModuleTmpComp extends ModuleCompBase {
         this.dispatch(customAction<ModuleReadyAction>({ type: "moduleReady", comp }));
       });
 
-      return setFieldsNoTypeCheck(this, { moduleRootComp, moduleDsl });
+      return setFieldsNoTypeCheck(this, { moduleDsl });
     }
 
     // module ready
     if (isMyCustomAction<ModuleReadyAction>(action, "moduleReady")) {
-      if (!this.moduleRootComp) {
+      const moduleRootComp = action.value.comp;
+      if (!moduleRootComp) {
         return this;
       }
 
       let updateFields: Record<string, any> = {
         isReady: true,
-        moduleRootComp: action.value.comp,
+        moduleRootComp,
       };
 
-      const moduleLayoutComp = this.moduleRootComp.children.ui.getModuleLayoutComp();
+      const moduleLayoutComp = moduleRootComp.children.ui.getModuleLayoutComp();
       if (moduleLayoutComp) {
         const inputs = moduleLayoutComp.getInputs().map((i) => i.getView());
         const inputChild = this.children.inputs.setInputs(inputs);

client/packages/openblocks/src/comps/comps/tableComp/column/tableColumnComp.tsx

@@ -6,7 +6,6 @@ import { genRandomKey } from "comps/utils/idGenerator";
 import { trans } from "i18n";
 import _ from "lodash";
 import {
-  changeChildAction,
   changeValueAction,
   ConstructorToComp,
   ConstructorToDataType,
@@ -16,7 +15,6 @@ import {
   fromRecord,
   multiChangeAction,
   withFunction,
-  wrapChildAction,
 } from "openblocks-core";
 import { AlignClose, AlignLeft, AlignRight } from "openblocks-design";
 import { ColumnTypeComp, ColumnTypeCompMap } from "./columnTypeComp";

client/packages/openblocks/src/comps/comps/tableComp/tableComp.tsx

@@ -14,7 +14,12 @@ import { UICompBuilder, withPropertyViewFn, withViewFn } from "comps/generators"
 import { childrenToProps } from "comps/generators/multi";
 import { HidableView } from "comps/generators/uiCompBuilder";
 import { withDispatchHook } from "comps/generators/withDispatchHook";
-import { DepsConfig, NameConfig, withExposingConfigs } from "comps/generators/withExposing";
+import {
+  depsConfig,
+  DepsConfig,
+  NameConfig,
+  withExposingConfigs,
+} from "comps/generators/withExposing";
 import { withMethodExposing } from "comps/generators/withMethodExposing";
 import { trans } from "i18n";
 import _ from "lodash";
@@ -454,29 +459,27 @@ export const TableComp = withExposingConfigs(TableTmpComp, [
     },
     trans("table.selectedRowsDesc")
   ),
-  new DepsConfig(
-    "changeSet",
-    (children) => {
-      return { columns: children.columns.exposingNode() };
-    },
-    (input) => {
+  depsConfig({
+    name: "changeSet",
+    desc: trans("table.changeSetDesc"),
+    depKeys: ["columns"],
+    func: (input) => {
       const record: Record<string, Record<string, JSONValue>> = {};
       Object.values(input.columns).forEach((column: any) => {
         const dataIndex: string = column.dataIndex;
         // const title: string = column.title;
         const render = column.render; // {comp, map: [0].comp.changeValue, length}
         _.forEach(render.map, (value, key) => {
           const changeValue = value.comp?.changeValue;
-          if (changeValue) {
+          if (!_.isNil(changeValue)) {
             if (!record[key]) record[key] = {};
             record[key][dataIndex] = changeValue;
           }
         });
       });
       return record;
     },
-    trans("table.changeSetDesc")
-  ),
+  }),
   new DepsConfig(
     "pageNo",
     (children) => {
@@ -517,7 +520,7 @@ export const TableComp = withExposingConfigs(TableTmpComp, [
     },
     (input) => {
       const sortIndex = input.sort[0]?.column;
-      const column = Object.values(input.columns).find(
+      const column = Object.values(input.columns as any).find(
         (c: any) => c.dataIndex === sortIndex
       ) as any;
       if (column?.isCustom && column?.title.value) {
@@ -528,18 +531,14 @@ export const TableComp = withExposingConfigs(TableTmpComp, [
     },
     trans("table.sortColumnDesc")
   ),
-  new DepsConfig(
-    "sortDesc",
-    (children) => {
-      return {
-        sort: children.sort.node(),
-      };
-    },
-    (input) => {
+  depsConfig({
+    name: "sortDesc",
+    desc: trans("table.sortDesc"),
+    depKeys: ["sort"],
+    func: (input) => {
       return input.sort[0]?.desc || false;
     },
-    trans("table.sortDesc")
-  ),
+  }),
   new DepsConfig(
     "pageOffset",
     (children) => {
@@ -579,7 +578,7 @@ export const TableComp = withExposingConfigs(TableTmpComp, [
       return getDisplayData(
         input.data,
         input.pagination,
-        input.columns,
+        input.columns as any,
         input.toolbar.filter,
         input.sort,
         input.toolbar.searchText.value,
@@ -593,11 +592,11 @@ export const TableComp = withExposingConfigs(TableTmpComp, [
     "filter",
     (children) => {
       return {
-        toolbar: children.toolbar.node(),
+        filter: children.toolbar.children.filter.node(),
       };
     },
     (input) => {
-      return input.toolbar.filter;
+      return input.filter;
     },
     trans("table.filterDesc")
   ),

client/packages/openblocks/src/comps/comps/temporaryStateComp.tsx

@@ -198,7 +198,7 @@ export class TemporaryStateListComp
         ]
       )
     );
-    editorState.setSelectedBottomRes(name, BottomResTypeEnum.TempState);
+    editorState.setSelectedBottomRes(newStateName, BottomResTypeEnum.TempState);
   }
 
   delete(name: string) {

client/packages/openblocks/src/comps/comps/transformerListComp.tsx

@@ -176,7 +176,7 @@ export class TransformerListComp extends TransformerListCompBase implements Bott
         ]
       )
     );
-    editorState.setSelectedBottomRes(name, BottomResTypeEnum.Transformer);
+    editorState.setSelectedBottomRes(newCompName, BottomResTypeEnum.Transformer);
   }
 
   delete(name: string) {