重新生成多对多模型代码

entropy-cloud · Sep 6, 2024 · f3a10f3 · f3a10f3
1 parent 3b86d65
commit f3a10f3
Show file tree

Hide file tree

Showing 16 changed files with 131 additions and 86 deletions.
diff --git a/nop-auth/nop-auth-meta/src/main/resources/_vfs/nop/auth/model/NopAuthDept/_NopAuthDept.xmeta b/nop-auth/nop-auth-meta/src/main/resources/_vfs/nop/auth/model/NopAuthDept/_NopAuthDept.xmeta
@@ -135,8 +135,10 @@
                         </getter>
         </prop>
         <prop name="relatedGroupList_ids" displayName="relatedGroupList" insertable="true" updatable="true"
-              graphql:labelProp="relatedGroupList_label" lazy="true" internal="true" depends="~groupMappings">
-            <schema type="List&lt;String&gt;"/>
+              graphql:labelProp="relatedGroupList_label" lazy="true"
+              ui:pickerUrl="/nop/auth/pages/NopAuthGroup/picker.page.yaml" ui:refLabelProp="id" internal="true"
+              depends="~groupMappings">
+            <schema type="List&lt;String&gt;" domain="ref-ids"/>
             <getter>
                             import io.nop.orm.support.OrmEntityHelper;
                             return OrmEntityHelper.getRefIds(

diff --git a/...uth/nop-auth-meta/src/main/resources/_vfs/nop/auth/model/NopAuthGroup/_NopAuthGroup.xmeta b/...uth/nop-auth-meta/src/main/resources/_vfs/nop/auth/model/NopAuthGroup/_NopAuthGroup.xmeta
@@ -121,8 +121,10 @@
                         </getter>
         </prop>
         <prop name="relatedDeptList_ids" displayName="relatedDeptList" insertable="true" updatable="true"
-              graphql:labelProp="relatedDeptList_label" lazy="true" internal="true" depends="~deptMappings">
-            <schema type="List&lt;String&gt;"/>
+              graphql:labelProp="relatedDeptList_label" lazy="true"
+              ui:pickerUrl="/nop/auth/pages/NopAuthDept/picker.page.yaml" ui:refLabelProp="id" internal="true"
+              depends="~deptMappings">
+            <schema type="List&lt;String&gt;" domain="ref-ids"/>
             <getter>
                             import io.nop.orm.support.OrmEntityHelper;
                             return OrmEntityHelper.getRefIds(
@@ -155,8 +157,10 @@
                         </getter>
         </prop>
         <prop name="relatedUserList_ids" displayName="relatedUserList" insertable="true" updatable="true"
-              graphql:labelProp="relatedUserList_label" lazy="true" internal="true" depends="~userMappings">
-            <schema type="List&lt;String&gt;"/>
+              graphql:labelProp="relatedUserList_label" lazy="true"
+              ui:pickerUrl="/nop/auth/pages/NopAuthUser/picker.page.yaml" ui:refLabelProp="id" internal="true"
+              depends="~userMappings">
+            <schema type="List&lt;String&gt;" domain="ref-ids"/>
             <getter>
                             import io.nop.orm.support.OrmEntityHelper;
                             return OrmEntityHelper.getRefIds(

diff --git a/...p-auth-meta/src/main/resources/_vfs/nop/auth/model/NopAuthResource/_NopAuthResource.xmeta b/...p-auth-meta/src/main/resources/_vfs/nop/auth/model/NopAuthResource/_NopAuthResource.xmeta
@@ -197,8 +197,10 @@
                         </getter>
         </prop>
         <prop name="relatedRoleList_ids" displayName="relatedRoleList" insertable="true" updatable="true"
-              graphql:labelProp="relatedRoleList_label" lazy="true" internal="true" depends="~roleMappings">
-            <schema type="List&lt;String&gt;"/>
+              graphql:labelProp="relatedRoleList_label" lazy="true"
+              ui:pickerUrl="/nop/auth/pages/NopAuthRole/picker.page.yaml" ui:refLabelProp="id" internal="true"
+              depends="~roleMappings">
+            <schema type="List&lt;String&gt;" domain="ref-ids"/>
             <getter>
                             import io.nop.orm.support.OrmEntityHelper;
                             return OrmEntityHelper.getRefIds(

diff --git a/nop-auth/nop-auth-meta/src/main/resources/_vfs/nop/auth/model/NopAuthRole/_NopAuthRole.xmeta b/nop-auth/nop-auth-meta/src/main/resources/_vfs/nop/auth/model/NopAuthRole/_NopAuthRole.xmeta
@@ -94,8 +94,10 @@
                         </getter>
         </prop>
         <prop name="relatedUserList_ids" displayName="relatedUserList" insertable="true" updatable="true"
-              graphql:labelProp="relatedUserList_label" lazy="true" internal="true" depends="~userMappings">
-            <schema type="List&lt;String&gt;"/>
+              graphql:labelProp="relatedUserList_label" lazy="true"
+              ui:pickerUrl="/nop/auth/pages/NopAuthUser/picker.page.yaml" ui:refLabelProp="id" internal="true"
+              depends="~userMappings">
+            <schema type="List&lt;String&gt;" domain="ref-ids"/>
             <getter>
                             import io.nop.orm.support.OrmEntityHelper;
                             return OrmEntityHelper.getRefIds(
@@ -128,8 +130,10 @@
                         </getter>
         </prop>
         <prop name="relatedResourceList_ids" displayName="relatedResourceList" insertable="true" updatable="true"
-              graphql:labelProp="relatedResourceList_label" lazy="true" internal="true" depends="~resourceMappings">
-            <schema type="List&lt;String&gt;"/>
+              graphql:labelProp="relatedResourceList_label" lazy="true"
+              ui:pickerUrl="/nop/auth/pages/NopAuthResource/picker.page.yaml" ui:refLabelProp="id" internal="true"
+              depends="~resourceMappings">
+            <schema type="List&lt;String&gt;" domain="ref-ids"/>
             <getter>
                             import io.nop.orm.support.OrmEntityHelper;
                             return OrmEntityHelper.getRefIds(

diff --git a/nop-auth/nop-auth-meta/src/main/resources/_vfs/nop/auth/model/NopAuthUser/_NopAuthUser.xmeta b/nop-auth/nop-auth-meta/src/main/resources/_vfs/nop/auth/model/NopAuthUser/_NopAuthUser.xmeta
@@ -242,8 +242,10 @@
                         </getter>
         </prop>
         <prop name="relatedRoleList_ids" displayName="relatedRoleList" insertable="true" updatable="true"
-              graphql:labelProp="relatedRoleList_label" lazy="true" internal="true" depends="~roleMappings">
-            <schema type="List&lt;String&gt;"/>
+              graphql:labelProp="relatedRoleList_label" lazy="true"
+              ui:pickerUrl="/nop/auth/pages/NopAuthRole/picker.page.yaml" ui:refLabelProp="id" internal="true"
+              depends="~roleMappings">
+            <schema type="List&lt;String&gt;" domain="ref-ids"/>
             <getter>
                             import io.nop.orm.support.OrmEntityHelper;
                             return OrmEntityHelper.getRefIds(
@@ -276,8 +278,10 @@
                         </getter>
         </prop>
         <prop name="relatedGroupList_ids" displayName="relatedGroupList" insertable="true" updatable="true"
-              graphql:labelProp="relatedGroupList_label" lazy="true" internal="true" depends="~groupMappings">
-            <schema type="List&lt;String&gt;"/>
+              graphql:labelProp="relatedGroupList_label" lazy="true"
+              ui:pickerUrl="/nop/auth/pages/NopAuthGroup/picker.page.yaml" ui:refLabelProp="id" internal="true"
+              depends="~groupMappings">
+            <schema type="List&lt;String&gt;" domain="ref-ids"/>
             <getter>
                             import io.nop.orm.support.OrmEntityHelper;
                             return OrmEntityHelper.getRefIds(

diff --git a/.../resources/META-INF/native-image/io.github.entropy-cloud/nop-cli-core/reflect-config.json b/.../resources/META-INF/native-image/io.github.entropy-cloud/nop-cli-core/reflect-config.json
@@ -4336,6 +4336,12 @@
           "java.lang.String"
         ]
       },
+      {
+        "name": "decodeBase64Url",
+        "parameterTypes": [
+          "java.lang.String"
+        ]
+      },
       {
         "name": "decodeDupEscape",
         "parameterTypes": [

diff --git a/nop-cli-core/src/main/resources/nop-vfs-index.txt b/nop-cli-core/src/main/resources/nop-vfs-index.txt
@@ -32,7 +32,9 @@
 /nop/core/registry/api.register-model.xml
 /nop/core/registry/dialect.register-model.xml
 /nop/core/registry/dict.register-model.xml
+/nop/core/registry/export-db.register-model.xml
 /nop/core/registry/imp.register-model.xml
+/nop/core/registry/import-db.register-model.xml
 /nop/core/registry/orm-pdm.register-model.xml
 /nop/core/registry/orm.register-model.xml
 /nop/core/registry/task.register-model.xml
@@ -114,6 +116,10 @@
 /nop/schema/conf.xdef
 /nop/schema/data-auth.xdef
 /nop/schema/datav/chart.xdef
+/nop/schema/db/export-db.xdef
+/nop/schema/db/import-db.xdef
+/nop/schema/db/jdbc-connection.xdef
+/nop/schema/db/table-field.xdef
 /nop/schema/designer/graph-designer.xdef
 /nop/schema/errors.xdef
 /nop/schema/excel/anchor.xdef

diff --git a/nop-demo/nop-quarkus-demo/src/main/resources/nop-vfs-index.txt b/nop-demo/nop-quarkus-demo/src/main/resources/nop-vfs-index.txt
@@ -421,6 +421,7 @@
 /nop/dyn/model/NopDynFunctionMeta/_NopDynFunctionMeta.xbiz
 /nop/dyn/model/NopDynFunctionMeta/_NopDynFunctionMeta.xmeta
 /nop/dyn/model/NopDynModule/NopDynModule.xbiz
+/nop/dyn/model/NopDynModule/NopDynModule.xbiz.rej
 /nop/dyn/model/NopDynModule/NopDynModule.xmeta
 /nop/dyn/model/NopDynModule/_NopDynModule.xbiz
 /nop/dyn/model/NopDynModule/_NopDynModule.xmeta
@@ -433,9 +434,7 @@
 /nop/dyn/model/NopDynPage/_NopDynPage.xbiz
 /nop/dyn/model/NopDynPage/_NopDynPage.xmeta
 /nop/dyn/model/NopDynPatch/NopDynPatch.xbiz
-/nop/dyn/model/NopDynPatch/NopDynPatch.xmeta
 /nop/dyn/model/NopDynPatch/_NopDynPatch.xbiz
-/nop/dyn/model/NopDynPatch/_NopDynPatch.xmeta
 /nop/dyn/model/NopDynPatchFile/NopDynPatchFile.xbiz
 /nop/dyn/model/NopDynPatchFile/NopDynPatchFile.xmeta
 /nop/dyn/model/NopDynPatchFile/_NopDynPatchFile.xbiz
@@ -510,11 +509,6 @@
 /nop/dyn/pages/NopDynPage/main.page.yaml
 /nop/dyn/pages/NopDynPage/picker.page.yaml
 /nop/dyn/pages/NopDynPage/ref-module.page.yaml
-/nop/dyn/pages/NopDynPatch/NopDynPatch.lib.xjs
-/nop/dyn/pages/NopDynPatch/NopDynPatch.view.xml
-/nop/dyn/pages/NopDynPatch/_gen/_NopDynPatch.view.xml
-/nop/dyn/pages/NopDynPatch/main.page.yaml
-/nop/dyn/pages/NopDynPatch/picker.page.yaml
 /nop/dyn/pages/NopDynPatchFile/NopDynPatchFile.lib.xjs
 /nop/dyn/pages/NopDynPatchFile/NopDynPatchFile.view.xml
 /nop/dyn/pages/NopDynPatchFile/_gen/_NopDynPatchFile.view.xml
@@ -1072,6 +1066,7 @@
 /nop/web/xlib/view-gen.xlib
 /nop/web/xlib/view-gen/impl_GenFromMeta.xpl
 /nop/web/xlib/web.xlib
+/nop/web/xlib/web.xlib.rej
 /nop/web/xlib/web/grid_crud.xpl
 /nop/web/xlib/web/impl_GenForm.xpl
 /nop/web/xlib/web/impl_GenGrid.xpl

diff --git a/...sources/META-INF/native-image/io.github.entropy-cloud/nop-spring-demo/reflect-config.json b/...sources/META-INF/native-image/io.github.entropy-cloud/nop-spring-demo/reflect-config.json
@@ -34902,6 +34902,20 @@
         "parameterTypes": [
           "io.nop.graphql.core.IGraphQLExecutionContext"
         ]
+      },
+      {
+        "name": "toGraphQLResponse",
+        "parameterTypes": [
+          "java.util.function.Supplier",
+          "io.nop.graphql.core.IGraphQLExecutionContext"
+        ]
+      },
+      {
+        "name": "toRpcResponse",
+        "parameterTypes": [
+          "java.util.function.Supplier",
+          "io.nop.graphql.core.IGraphQLExecutionContext"
+        ]
       }
     ],
     "name": "io.nop.graphql.core.engine.GraphQLEngine",
@@ -50825,6 +50839,16 @@
     "name": "io.nop.web.page.WebPageHelper",
     "unsafeAllocated": false
   },
+  {
+    "allDeclaredConstructors": true,
+    "allDeclaredMethods": true,
+    "allPublicConstructors": true,
+    "allPublicMethods": true,
+    "fields": [],
+    "methods": [],
+    "name": "io.nop.web.page.initialize.WebPageCoreInitializer",
+    "unsafeAllocated": false
+  },
   {
     "allDeclaredConstructors": true,
     "allDeclaredMethods": true,

diff --git a/nop-demo/nop-spring-demo/src/main/resources/nop-vfs-index.txt b/nop-demo/nop-spring-demo/src/main/resources/nop-vfs-index.txt
@@ -365,6 +365,10 @@
 /nop/schema/conf.xdef
 /nop/schema/data-auth.xdef
 /nop/schema/datav/chart.xdef
+/nop/schema/db/export-db.xdef
+/nop/schema/db/import-db.xdef
+/nop/schema/db/jdbc-connection.xdef
+/nop/schema/db/table-field.xdef
 /nop/schema/designer/graph-designer.xdef
 /nop/schema/errors.xdef
 /nop/schema/excel/anchor.xdef

diff --git a/nop-dyn/nop-dyn-meta/src/main/resources/_vfs/i18n/en/_nop-dyn.i18n.yaml b/nop-dyn/nop-dyn-meta/src/main/resources/_vfs/i18n/en/_nop-dyn.i18n.yaml
@@ -12,7 +12,6 @@ entity:
     NopDynModule: Module Definition
     NopDynModuleDep: Module Dependency
     NopDynPage: Page Definition
-    NopDynPatch: Patch
     NopDynPatchFile: Patch File
     NopDynPropMeta: Property Meta
     NopDynSql: Module SQL
@@ -276,18 +275,6 @@ prop:
       module: Module
       module.displayName: Module
       pageContentComponent: null
-    NopDynPatch:
-      patchId: Patch ID
-      patchName: Patch Name
-      patchOrder: Patch Order
-      displayName: Display Name
-      status: Status
-      version: Version
-      createdBy: Created By
-      createTime: Create Time
-      updatedBy: Updated By
-      updateTime: Update Time
-      patchFiles: Patch Files
     NopDynPatchFile:
       fileId: File ID
       appId: App ID

diff --git a/nop-dyn/nop-dyn-meta/src/main/resources/_vfs/i18n/zh-CN/_nop-dyn.i18n.yaml b/nop-dyn/nop-dyn-meta/src/main/resources/_vfs/i18n/zh-CN/_nop-dyn.i18n.yaml
@@ -12,7 +12,6 @@ entity:
     NopDynModule: 模块定义
     NopDynModuleDep: 模块依赖
     NopDynPage: 页面定义
-    NopDynPatch: 补丁定义
     NopDynPatchFile: 补丁文件
     NopDynPropMeta: 属性元数据
     NopDynSql: SQL定义
@@ -276,18 +275,6 @@ prop:
       updateTime: 修改时间
       updatedBy: 修改人
       version: 数据版本
-    NopDynPatch:
-      createTime: 创建时间
-      createdBy: 创建人
-      displayName: 显示名
-      patchFiles: 补丁文件
-      patchId: 补丁ID
-      patchName: 补丁名
-      patchOrder: 补丁顺序
-      status: 状态
-      updateTime: 修改时间
-      updatedBy: 修改人
-      version: 数据版本
     NopDynPatchFile:
       app: 所属应用
       app.displayName: 所属应用

diff --git a/nop-dyn/nop-dyn-web/src/main/resources/_vfs/nop/dyn/auth/_nop-dyn.action-auth.xml b/nop-dyn/nop-dyn-web/src/main/resources/_vfs/nop/dyn/auth/_nop-dyn.action-auth.xml
@@ -136,55 +136,42 @@
                         </resource>
                     </children>
                 </resource>
-                <resource id="NopDynPatch-main" displayName="补丁定义" orderNo="10031" i18n-en:displayName="Patch"
-                          icon="ant-design:appstore-twotone" component="AMIS" resourceType="SUBM"
-                          url="/nop/dyn/pages/NopDynPatch/main.page.yaml">
-                    <children>
-                        <resource id="FNPT:NopDynPatch:query" displayName="查询补丁定义" orderNo="10032" resourceType="FNPT">
-                            <permissions>NopDynPatch:query</permissions>
-                        </resource>
-                        <resource id="FNPT:NopDynPatch:mutation" displayName="修改补丁定义" orderNo="10033"
-                                  resourceType="FNPT">
-                            <permissions>NopDynPatch:mutation</permissions>
-                        </resource>
-                    </children>
-                </resource>
-                <resource id="NopDynPatchFile-main" displayName="补丁文件" orderNo="10034" i18n-en:displayName="Patch File"
+                <resource id="NopDynPatchFile-main" displayName="补丁文件" orderNo="10031" i18n-en:displayName="Patch File"
                           icon="ant-design:appstore-twotone" component="AMIS" resourceType="SUBM"
                           url="/nop/dyn/pages/NopDynPatchFile/main.page.yaml">
                     <children>
-                        <resource id="FNPT:NopDynPatchFile:query" displayName="查询补丁文件" orderNo="10035"
+                        <resource id="FNPT:NopDynPatchFile:query" displayName="查询补丁文件" orderNo="10032"
                                   resourceType="FNPT">
                             <permissions>NopDynPatchFile:query</permissions>
                         </resource>
-                        <resource id="FNPT:NopDynPatchFile:mutation" displayName="修改补丁文件" orderNo="10036"
+                        <resource id="FNPT:NopDynPatchFile:mutation" displayName="修改补丁文件" orderNo="10033"
                                   resourceType="FNPT">
                             <permissions>NopDynPatchFile:mutation</permissions>
                         </resource>
                     </children>
                 </resource>
-                <resource id="NopDynPropMeta-main" displayName="属性元数据" orderNo="10037"
+                <resource id="NopDynPropMeta-main" displayName="属性元数据" orderNo="10034"
                           i18n-en:displayName="Property Meta" icon="ant-design:appstore-twotone" component="AMIS"
                           resourceType="SUBM" url="/nop/dyn/pages/NopDynPropMeta/main.page.yaml">
                     <children>
-                        <resource id="FNPT:NopDynPropMeta:query" displayName="查询属性元数据" orderNo="10038"
+                        <resource id="FNPT:NopDynPropMeta:query" displayName="查询属性元数据" orderNo="10035"
                                   resourceType="FNPT">
                             <permissions>NopDynPropMeta:query</permissions>
                         </resource>
-                        <resource id="FNPT:NopDynPropMeta:mutation" displayName="修改属性元数据" orderNo="10039"
+                        <resource id="FNPT:NopDynPropMeta:mutation" displayName="修改属性元数据" orderNo="10036"
                                   resourceType="FNPT">
                             <permissions>NopDynPropMeta:mutation</permissions>
                         </resource>
                     </children>
                 </resource>
-                <resource id="NopDynSql-main" displayName="SQL定义" orderNo="10040" i18n-en:displayName="Module SQL"
+                <resource id="NopDynSql-main" displayName="SQL定义" orderNo="10037" i18n-en:displayName="Module SQL"
                           icon="ant-design:appstore-twotone" component="AMIS" resourceType="SUBM"
                           url="/nop/dyn/pages/NopDynSql/main.page.yaml">
                     <children>
-                        <resource id="FNPT:NopDynSql:query" displayName="查询SQL定义" orderNo="10041" resourceType="FNPT">
+                        <resource id="FNPT:NopDynSql:query" displayName="查询SQL定义" orderNo="10038" resourceType="FNPT">
                             <permissions>NopDynSql:query</permissions>
                         </resource>
-                        <resource id="FNPT:NopDynSql:mutation" displayName="修改SQL定义" orderNo="10042" resourceType="FNPT">
+                        <resource id="FNPT:NopDynSql:mutation" displayName="修改SQL定义" orderNo="10039" resourceType="FNPT">
                             <permissions>NopDynSql:mutation</permissions>
                         </resource>
                     </children>

diff --git a/nop-wf/nop-wf-web/src/main/resources/_vfs/nop/wf/pages/NopWfDefinition/demo-data.page.json b/nop-wf/nop-wf-web/src/main/resources/_vfs/nop/wf/pages/NopWfDefinition/demo-data.page.json
@@ -0,0 +1,45 @@
+{
+  "startNode": {
+    "id": "start",
+    "name": "StartNode",
+    "nodeType": "start",
+    "childNode": {
+      "nodeType": "approver",
+      "id": "2324fb89-394f-4fa0-a5a5-10dc7306cc94",
+      "name": "审批人",
+      "childNode": {
+        "id": "bc96c847-9dbf-4d01-876c-94cb5c234379",
+        "nodeType": "route",
+        "nodeKind": "route",
+        "conditionNodeList": [
+          {
+            "id": "f65e1ddf-220d-496d-8de3-16fdd56d2219",
+            "nodeType": "condition",
+            "name": "条件1",
+            "childNode": {
+              "nodeType": "audit",
+              "id": "c943d0bf-3543-410a-9a75-1b006b99f654",
+              "name": "办理人"
+            }
+          },
+          {
+            "id": "88a6610f-2ed2-48d4-bcf4-53e8f61b164b",
+            "nodeType": "condition",
+            "name": "条件2",
+            "childNode": {
+              "nodeType": "notifier",
+              "id": "68187b5e-55d8-4f08-8b16-3702090e1eaf",
+              "name": "抄送人"
+            }
+          }
+        ],
+        "name": "条件分支",
+        "childNode": {
+          "nodeType": "notifier",
+          "id": "3f1d31e5-6f12-4e05-8518-bebfeeede702",
+          "name": "抄送人"
+        }
+      }
+    }
+  }
+}