@fangzhongya/vue-archive 0.0.45 → 0.0.47

package/dist/node/index.cjs

@@ -2594,6 +2594,9 @@ function addTags(tag, obj) {
     case "text":
       addTitle(obj);
       return true;
+    case "html":
+      addTitle(obj);
+      return true;
     default:
       return false;
   }
@@ -2726,22 +2729,32 @@ function getTopDom(props2, h4, isZy) {
       if (is) {
         setDivision();
       }
-      let type = obj.title.type || "div";
-      doms.push(
-        h4(
-          type,
-          {
-            class: "compo-top-title"
-          },
-          [
-            h4("span", {}, [
-              getValue(
-                obj.title.name + " " + obj.title.description
-              )
-            ])
-          ]
-        )
-      );
+      let type = (obj.title.type || "div").split(".");
+      let c = type[1] || "";
+      if (type[0] == "html") {
+        doms.push(
+          h4("div", {
+            class: "compo-top-title " + c,
+            innerHTML: obj.title.name + " " + obj.title.description
+          })
+        );
+      } else {
+        doms.push(
+          h4(
+            type[0],
+            {
+              class: "compo-top-title " + c
+            },
+            [
+              h4("span", {}, [
+                getValue(
+                  obj.title.name + " " + obj.title.description
+                )
+              ])
+            ]
+          )
+        );
+      }
     }
     if (is) {
       if (list.length > 0) {
@@ -2758,24 +2771,46 @@ function getTopDom(props2, h4, isZy) {
         )
       );
     }
-    if (obj.text) {
-      let type = obj.text.type || "div";
+    if (obj.html) {
+      let type = (obj.html.type || "div").split(".");
+      let c = type[1] || "";
       list.push(
-        h4(
-          type,
-          {
-            class: "compo-top-text"
-          },
-          [
-            h4("span", {}, [
-              getValue(
-                obj.text.name + " " + obj.text.description
-              )
-            ])
-          ]
-        )
+        h4(type[0], {
+          class: "compo-top-html " + c,
+          innerHTML: obj.html.name + " " + obj.html.description
+        })
       );
     }
+    ["text"].forEach((v) => {
+      if (obj[v]) {
+        let type = (obj[v].type || "div").split(".");
+        let c = type[1] || "";
+        if (type[0] == "html") {
+          list.push(
+            h4("div", {
+              class: "compo-top-" + v + " " + c,
+              innerHTML: obj[v].name + " " + obj[v].description
+            })
+          );
+        } else {
+          list.push(
+            h4(
+              type[0],
+              {
+                class: "compo-top-" + v + " " + c
+              },
+              [
+                h4("span", {}, [
+                  getValue(
+                    obj[v].name + " " + obj[v].description
+                  )
+                ])
+              ]
+            )
+          );
+        }
+      }
+    });
   });
   setTitle3();
   setDivision();
@@ -2887,22 +2922,32 @@ function getTestTopDom(props2, h4, isZy) {
       if (is) {
         setDivision();
       }
-      let type = obj.title.type || "div";
-      doms.push(
-        h4(
-          type,
-          {
-            class: "test-top-title"
-          },
-          [
-            h4("span", {}, [
-              getValue(
-                obj.title.name + " " + obj.title.description
-              )
-            ])
-          ]
-        )
-      );
+      let type = (obj.title.type || "div").split(".");
+      let c = type[1] || "";
+      if (type[0] == "html") {
+        doms.push(
+          h4("div", {
+            class: "test-top-title " + c,
+            innerHTML: obj.title.name + " " + obj.title.description
+          })
+        );
+      } else {
+        doms.push(
+          h4(
+            type[0],
+            {
+              class: "test-top-title " + c
+            },
+            [
+              h4("span", {}, [
+                getValue(
+                  obj.title.name + " " + obj.title.description
+                )
+              ])
+            ]
+          )
+        );
+      }
     }
     if (is) {
       if (list.length > 0) {
@@ -2919,60 +2964,46 @@ function getTestTopDom(props2, h4, isZy) {
         )
       );
     }
-    if (obj.text) {
-      let type = obj.text.type || "div";
-      list.push(
-        h4(
-          type,
-          {
-            class: "test-top-text"
-          },
-          [
-            h4("span", {}, [
-              getValue(
-                obj.text.name + " " + obj.text.description
-              )
-            ])
-          ]
-        )
-      );
-    }
-    if (obj.proposal) {
-      let type = obj.proposal.type || "div";
-      list.push(
-        h4(
-          type,
-          {
-            class: "test-top-proposal"
-          },
-          [
-            h4("span", {}, [
-              getValue(
-                obj.proposal.name + " " + obj.proposal.description
-              )
-            ])
-          ]
-        )
-      );
-    }
-    if (obj.error) {
-      let type = obj.error.type || "div";
+    if (obj.html) {
+      let type = (obj.html.type || "div").split(".");
+      let c = type[1] || "";
       list.push(
-        h4(
-          type,
-          {
-            class: "test-top-error"
-          },
-          [
-            h4("span", {}, [
-              getValue(
-                obj.error.name + " " + obj.error.description
-              )
-            ])
-          ]
-        )
+        h4(type[0], {
+          class: "test-top-html " + c,
+          innerHTML: obj.html.name + " " + obj.html.description
+        })
       );
     }
+    ["text", "proposal", "error"].forEach((v) => {
+      if (obj[v]) {
+        let type = (obj[v].type || "div").split(".");
+        let c = type[1] || "";
+        if (type[0] == "html") {
+          list.push(
+            h4("div", {
+              class: "test-top-" + v + " " + c,
+              innerHTML: obj[v].name + " " + obj[v].description
+            })
+          );
+        } else {
+          list.push(
+            h4(
+              type[0],
+              {
+                class: "test-top-" + v + " " + c
+              },
+              [
+                h4("span", {}, [
+                  getValue(
+                    obj[v].name + " " + obj[v].description
+                  )
+                ])
+              ]
+            )
+          );
+        }
+      }
+    });
   });
   setTitle3();
   setDivision();
@@ -3452,7 +3483,13 @@ ${vueFormat(v, "                ")}
 function getFunctionBody(v, key, propsText) {
   const text = propsText ? propsText[key] : "";
   if (text) {
-    return text;
+    if (text.includes("=>")) {
+      return text;
+    } else if (text.includes("function")) {
+      return text;
+    } else {
+      return funstr(v.toString());
+    }
   } else {
     return funstr(v.toString());
   }
@@ -3555,22 +3592,33 @@ function getType(value) {
   });
   return [...new Set(arr)].sort();
 }
-function getObjValue(d) {
+function getObjValue(d, type) {
   try {
-    return new Function(`{ return ${d} }`)();
+    if (type?.toLowerCase() == "function") {
+      if (typeof d === "string") {
+        if (/^\((.|\n|\r)*\)$/.test(d)) {
+          d = d.substring(1, d.length - 1);
+          return new Function(`{ return ${d} }`)();
+        }
+      } else {
+        return d;
+      }
+    } else {
+      return new Function(`{ return ${d} }`)();
+    }
   } catch (error) {
     return "" + d;
   }
 }
 function getDefaultValue(obj, is = true) {
+  const vo = getSpecType(obj);
+  const v = getTypeValue(vo.dataType);
   if (is) {
-    const vo = getSpecType(obj);
-    const v = getTypeValue(vo.dataType);
     const d = (obj.default || "").trim();
-    return getObjValue(d || v);
+    return getObjValue(d || v, vo.dataType[0]);
   } else {
     const d = (obj.default || "").trim();
-    return getObjValue(d);
+    return getObjValue(d, vo.dataType[0]);
   }
 }
 
@@ -3595,13 +3643,37 @@ function getDefault(ss, iss) {
   const cs = css.map((o) => o[0]);
   let ci = cs.indexOf(c);
   if (ci != -1) {
-    let reg = new RegExp(
-      "^\\" + css[ci][0] + "(([^\\" + css[ci][1] + "])*)\\" + css[ci][1] + (iss ? "\\s" : ""),
-      "gi"
-    );
-    let rs = reg.exec(ss);
-    if (rs) {
-      return rs[0];
+    let bracketStack = [c];
+    for (let i = 1; i < ss.length; i++) {
+      const char = ss[i];
+      if (cs.includes(char)) {
+        bracketStack.push(char);
+      } else {
+        let is = false;
+        char === "]" && bracketStack[bracketStack.length - 1] === "[";
+        for (let v of css) {
+          if (char === v[1] && bracketStack[bracketStack.length - 1] === v[0]) {
+            is = true;
+            break;
+          }
+        }
+        if (is) {
+          bracketStack.pop();
+        }
+      }
+      if (bracketStack.length === 0) {
+        if (iss && ss[i + 1] === " ") {
+          return ss.substring(0, i + 1);
+        } else {
+          return ss.substring(0, i + 1);
+        }
+      }
+    }
+  } else {
+    if (iss) {
+      return ss.substring(0, ss.indexOf(" "));
+    } else {
+      return ss;
     }
   }
 }