fix(jsoneditor): should render array in AnyInput

innoai-tech · Dec 18, 2024 · b5ae385 · b5ae385
1 parent c760a68
commit b5ae385
Show file tree

Hide file tree

Showing 4 changed files with 31 additions and 4 deletions.
diff --git a/nodepkg/jsoneditor/example/jsoneditor.tsx b/nodepkg/jsoneditor/example/jsoneditor.tsx
@@ -49,6 +49,11 @@ class JSONSchema {
   @t.record(t.string(), t.any())
   @t.optional()
   manifests!: Record<string, any>;
+
+  @t.annotate({ title: "任意类型" })
+  @t.record(t.string(), t.any())
+  @t.optional()
+  anyjson: any;
 }
 
 export default component(() => {
@@ -62,6 +67,20 @@ export default component(() => {
     ports: [],
     manifests: {
       "x": {}
+    },
+    anyjson: {
+      obj: {
+        a: 1
+      },
+      arr: ["1", "2", "3"],
+      nested: [
+        {
+          a: 1
+        },
+        {
+          a: 2
+        }
+      ]
     }
   });
 

diff --git a/nodepkg/jsoneditor/package.json b/nodepkg/jsoneditor/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@innoai-tech/jsoneditor",
-  "version": "0.3.6",
+  "version": "0.3.7",
   "monobundle": {
     "build": {
       "clean": true

diff --git a/nodepkg/jsoneditor/src/inputs/AnyInput.tsx b/nodepkg/jsoneditor/src/inputs/AnyInput.tsx
@@ -13,14 +13,14 @@ export const AnyInput = component$<{
     props.value$,
     render((value) => {
       if (isArray(value)) {
-        return <ArrayInput value={value} typedef={t.any()} ctx={props.ctx} />;
+        return <ArrayInput value={value} typedef={t.array(t.any())} ctx={props.ctx} />;
       }
 
       if (isObject(value)) {
         return <RecordInput value={value} typedef={t.record(t.string(), t.any())} ctx={props.ctx} />;
       }
 
-      return <ValueInput value={value} typedef={t.any()} ctx={props.ctx} allowRawJSON/>;
+      return <ValueInput value={value} typedef={t.any()} ctx={props.ctx} allowRawJSON />;
     })
   );
 });
diff --git a/nodepkg/jsoneditor/src/inputs/ValueInput.tsx b/nodepkg/jsoneditor/src/inputs/ValueInput.tsx
@@ -529,6 +529,7 @@ export const ValueInputActions = styled("div")({
   roundedRight: "sm",
   display: "flex",
   px: 2,
+  py: 1,
   ml: -4
 });
 
@@ -567,7 +568,14 @@ export const ValueContainer = styled("div")({
     alignItems: "center",
     border: "1px solid",
     overflow: "hidden",
-    borderColor: variant("sys.outline-variant", alpha(0.38))
+    borderColor: variant("sys.outline-variant", alpha(0.38)),
+    opacity: 0.38,
+    "&:hover": {
+      opacity: 1
+    },
+    "&:focus-within": {
+      opacity: 1
+    }
   },
 
   "& textarea,input": {