update

1 year ago · d1ccdc2b50
7 changed files with 49 additions and 8 deletions
--- a/code/.gitignore
+++ b/code/.gitignore
@ -0,0 +1,16 @@
+*.bak
+
+#fe
+node_modules/
+dist/
+
+#be
+.vs/
+bin/
+obj/
+*.suo
+*.user
+*.db
+*.db-shm
+*.db-wal
+
--- a/code/.vs/BeiJinSettleAccount/v17/.suo
+++ b/code/.vs/BeiJinSettleAccount/v17/.suo
--- a/code/WebApp/vanilla/index.html
+++ b/code/WebApp/vanilla/index.html
@ -3,7 +3,9 @@

 <head>
  <meta charset="utf-8" />
-  <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+  <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+  <meta name="renderer" content="webkit">
+  <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no">
  <base href="/" />
  <style>
    @keyframes loading-rotate {
@ -69,4 +71,4 @@
  <script type="module" src="./main.js"></script>
 </body>

-</html>
+</html>
--- a/code/WebApp/vanilla/router/index.js
+++ b/code/WebApp/vanilla/router/index.js
@ -89,14 +89,18 @@ router.afterEach((to, from) => {
  }
 });

-const reset = (list, parent = null) => {
-  return list.map((o) => {
+const reset = async (list, parent = null) => {
+  return list.map(async (o) => {
    const item = {
      path: o.path,
      meta: o.meta,
    };
-    if (item.component && item.component !== "Layout") {
-      item.component = import(`../views/${o.component ? o.component : "list"}.js`);
+    if (o.component && typeof o.component === "string" && o.component !== "Layout") {
+      try {
+        item.component = await import(`../views/${o.component}.js`);
+      } catch (error) {
+        item.component = await import(`../views/list.js`);
+      }
    }
    item.meta.path = `${parent === null ? "" : parent.meta.path + "/"}${item.path}`;
    item.meta.fullName = `${parent === null ? "" : parent.meta.title + " > "}${item.meta.title}`;
@ -120,7 +124,7 @@ const refreshRouter = async () => {
  await connect();
  const appStore = useAppStore();
  const permissions = appStore.user.permissions.filter((o) => !o.isHidden);
-  const serverRoutes = reset(permissions);
+  const serverRoutes = await reset(permissions);
  const route = {
    name: "layout",
    path: "",
--- a/code/WebApp/vanilla/views/user/index.js
+++ b/code/WebApp/vanilla/views/user/index.js
@ -0,0 +1,15 @@
+import AppList from "../components/list/index.js";
+import html from "html";
+import router from "../router/index.js";
+
+export default {
+  components: { AppList },
+  template: html`<app-list @command="onCommand"> </app-list>`,
+  setup() {
+    console.log(router.currentRoute.value.fullPath);
+    const onCommand = (item, rows) => {
+      console.log(item.path, item, rows);
+    };
+    return { onCommand };
+  },
+};
--- a/docs/demo/src/WTA.Shared/Attributes/OneToManyAttribute.cs
+++ b/docs/demo/src/WTA.Shared/Attributes/OneToManyAttribute.cs
@ -1,7 +1,7 @@
 namespace WTA.Shared.Attributes;

 [AttributeUsage(AttributeTargets.Property)]
-public class OneToManyAttribute<TEntity> : Attribute
+public class OneToManyAttribute<TEntity> : Attribute, ITypeAttribute
 {
    public Type Type { get; set; } = null!;
    public string? Property { get; }
--- a/docs/demo/src/WTA.Shared/Extensions/JsonSchemaExtensions.cs
+++ b/docs/demo/src/WTA.Shared/Extensions/JsonSchemaExtensions.cs
@ -153,6 +153,10 @@ public static class JsonSchemaExtensions
                    schema.Add("input", "select");
                    schema.Add("url", propertyName[..^2].ToSlugify());
                }
+                if (defaultModelMetadata.Attributes.Attributes.FirstOrDefault(o => o.GetType().IsGenericType && o.GetType().GetGenericTypeDefinition() == typeof(OneToManyAttribute<>)) is ITypeAttribute oneToManyAttribute)
+                {
+                    schema.Add("oneToMany",$"{oneToManyAttribute.Type.Name}.{oneToManyAttribute.GetType().GetProperty("Property")?.GetValue(oneToManyAttribute)??defaultModelMetadata.PropertyName}");
+                }
                if (defaultModelMetadata.Attributes.Attributes.FirstOrDefault(o => o.GetType() == typeof(ScaffoldColumnAttribute)) is ScaffoldColumnAttribute scaffoldColumnAttribute
                    && !scaffoldColumnAttribute.Scaffold)
                {