From cec0708cc3e6b02996426104745ec68536342aeb Mon Sep 17 00:00:00 2001
From: canonical <canonical_entropy@163.com>
Date: Thu, 27 Jul 2023 18:37:20 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=85=B3=E8=81=94=E5=AD=90?=
 =?UTF-8?q?=E8=A1=A8=E5=BC=B9=E5=87=BA=E7=BC=96=E8=BE=91=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 docs/dev-guide/xui/xview.md                   |  29 +-
 .../NopAuthDept/_gen/_NopAuthDept.view.xml    |  10 +-
 .../_gen/_NopAuthExtLogin.view.xml            |  10 +-
 .../NopAuthOpLog/_gen/_NopAuthOpLog.view.xml  |   8 +-
 .../_gen/_NopAuthPosition.view.xml            |  10 +-
 .../_gen/_NopAuthResource.view.xml            |  10 +-
 .../NopAuthRole/_gen/_NopAuthRole.view.xml    |  10 +-
 .../_gen/_NopAuthRoleDataAuth.view.xml        |  10 +-
 .../_gen/_NopAuthSession.view.xml             |   8 +-
 .../NopAuthSite/_gen/_NopAuthSite.view.xml    |  10 +-
 .../_gen/_NopAuthTenant.view.xml              |  10 +-
 .../NopAuthUser/_gen/_NopAuthUser.view.xml    |  10 +-
 .../_gen/_NopAuthUserSubstitution.view.xml    |  10 +-
 .../io/nop/autotest/core/AutoTestCase.java    |   2 +
 .../NopBatchFile/_gen/_NopBatchFile.view.xml  |  10 +-
 .../_gen/_NopBatchRecordResult.view.xml       |  10 +-
 .../NopBatchTask/_gen/_NopBatchTask.view.xml  |  10 +-
 .../nop-cli-core/reflect-config.json          |  18 +
 .../src/main/resources/nop-vfs-index.txt      |   1 +
 .../_gen/_{metaInfo.objName}.view.xml.xgen    |  13 +-
 .../nop-quarkus-demo/reflect-config.json      | 779 +++++++++++++++++-
 .../src/main/resources/nop-vfs-index.txt      |  37 +-
 .../imp/model/_gen/_ImportFieldModel.java     |   6 +-
 .../core/engine/GraphQLActionAuthChecker.java |  25 +-
 .../_gen/_NopReportDataset.view.xml           |  10 +-
 .../_gen/_NopReportDatasetAuth.view.xml       |  10 +-
 .../_gen/_NopReportDefinition.view.xml        |  10 +-
 .../_gen/_NopReportResultFile.view.xml        |  10 +-
 .../service/entity/NopRuleInputBizModel.java  |  14 -
 .../service/entity/NopRuleOutputBizModel.java |  14 -
 .../_vfs/i18n/en/_nop-rule.i18n.yaml          |  40 -
 .../_vfs/i18n/zh-CN/_nop-rule.i18n.yaml       |  40 -
 .../rule/model/NopRuleInput/NopRuleInput.xbiz |   5 -
 .../model/NopRuleInput/NopRuleInput.xmeta     |   5 -
 .../model/NopRuleInput/_NopRuleInput.xbiz     |   9 -
 .../model/NopRuleInput/_NopRuleInput.xmeta    |  94 ---
 .../model/NopRuleOutput/NopRuleOutput.xbiz    |   5 -
 .../model/NopRuleOutput/NopRuleOutput.xmeta   |   5 -
 .../model/NopRuleOutput/_NopRuleOutput.xbiz   |   9 -
 .../model/NopRuleOutput/_NopRuleOutput.xmeta  |  94 ---
 .../nop/rule/auth/_nop-rule.action-auth.xml   |  46 +-
 .../NopRuleDefinition.view.xml                |  21 +-
 .../_gen/_NopRuleDefinition.view.xml          |  10 +-
 .../pages/NopRuleInput/NopRuleInput.lib.xjs   |  10 -
 .../pages/NopRuleInput/NopRuleInput.view.xml  |  18 -
 .../NopRuleInput/_gen/_NopRuleInput.view.xml  | 146 ----
 .../rule/pages/NopRuleInput/main.page.yaml    |   3 -
 .../rule/pages/NopRuleInput/picker.page.yaml  |   3 -
 .../NopRuleLog/_gen/_NopRuleLog.view.xml      |   8 +-
 .../pages/NopRuleNode/NopRuleNode.view.xml    |   6 +
 .../NopRuleNode/_gen/_NopRuleNode.view.xml    |  10 +-
 .../NopRuleNode/ref-ruleDefinition.page.yaml  |   3 +
 .../pages/NopRuleOutput/NopRuleOutput.lib.xjs |  10 -
 .../NopRuleOutput/NopRuleOutput.view.xml      |  18 -
 .../_gen/_NopRuleOutput.view.xml              | 146 ----
 .../rule/pages/NopRuleOutput/main.page.yaml   |   3 -
 .../rule/pages/NopRuleOutput/picker.page.yaml |   3 -
 .../NopRuleRole/_gen/_NopRuleRole.view.xml    |  10 +-
 .../_gen/_NopSysClusterLeader.view.xml        |  10 +-
 .../_gen/_NopSysCodeRule.view.xml             |  10 +-
 .../NopSysDict/_gen/_NopSysDict.view.xml      |  10 +-
 .../_gen/_NopSysDictOption.view.xml           |  10 +-
 .../_gen/_NopSysExtField.view.xml             |  10 +-
 .../NopSysI18n/_gen/_NopSysI18n.view.xml      |  10 +-
 .../NopSysLock/_gen/_NopSysLock.view.xml      |  10 +-
 .../_gen/_NopSysMakerCheckerRecord.view.xml   |  10 +-
 .../_gen/_NopSysNoticeTemplate.view.xml       |  10 +-
 .../_gen/_NopSysSequence.view.xml             |  10 +-
 .../_gen/_NopSysUserVariable.view.xml         |  10 +-
 .../_gen/_NopSysVariable.view.xml             |  10 +-
 .../main/java/io/nop/xui/utils/XuiHelper.java |  29 +-
 .../main/resources/_vfs/nop/web/xlib/web.xlib |  47 +-
 .../_vfs/nop/web/xlib/web/grid_crud.xpl       |  14 +-
 .../resources/_vfs/nop/schema/excel/imp.xdef  |   1 +
 .../resources/_vfs/nop/schema/xui/action.xdef |   2 +-
 .../resources/_vfs/nop/schema/xui/api.xdef    |   4 +-
 76 files changed, 1150 insertions(+), 971 deletions(-)
 delete mode 100644 nop-rule/nop-rule-service/src/main/java/io/nop/rule/service/entity/NopRuleInputBizModel.java
 delete mode 100644 nop-rule/nop-rule-service/src/main/java/io/nop/rule/service/entity/NopRuleOutputBizModel.java
 delete mode 100644 nop-rule/nop-rule-service/src/main/resources/_vfs/nop/rule/model/NopRuleInput/NopRuleInput.xbiz
 delete mode 100644 nop-rule/nop-rule-service/src/main/resources/_vfs/nop/rule/model/NopRuleInput/NopRuleInput.xmeta
 delete mode 100644 nop-rule/nop-rule-service/src/main/resources/_vfs/nop/rule/model/NopRuleInput/_NopRuleInput.xbiz
 delete mode 100644 nop-rule/nop-rule-service/src/main/resources/_vfs/nop/rule/model/NopRuleInput/_NopRuleInput.xmeta
 delete mode 100644 nop-rule/nop-rule-service/src/main/resources/_vfs/nop/rule/model/NopRuleOutput/NopRuleOutput.xbiz
 delete mode 100644 nop-rule/nop-rule-service/src/main/resources/_vfs/nop/rule/model/NopRuleOutput/NopRuleOutput.xmeta
 delete mode 100644 nop-rule/nop-rule-service/src/main/resources/_vfs/nop/rule/model/NopRuleOutput/_NopRuleOutput.xbiz
 delete mode 100644 nop-rule/nop-rule-service/src/main/resources/_vfs/nop/rule/model/NopRuleOutput/_NopRuleOutput.xmeta
 delete mode 100644 nop-rule/nop-rule-web/src/main/resources/_vfs/nop/rule/pages/NopRuleInput/NopRuleInput.lib.xjs
 delete mode 100644 nop-rule/nop-rule-web/src/main/resources/_vfs/nop/rule/pages/NopRuleInput/NopRuleInput.view.xml
 delete mode 100644 nop-rule/nop-rule-web/src/main/resources/_vfs/nop/rule/pages/NopRuleInput/_gen/_NopRuleInput.view.xml
 delete mode 100644 nop-rule/nop-rule-web/src/main/resources/_vfs/nop/rule/pages/NopRuleInput/main.page.yaml
 delete mode 100644 nop-rule/nop-rule-web/src/main/resources/_vfs/nop/rule/pages/NopRuleInput/picker.page.yaml
 create mode 100644 nop-rule/nop-rule-web/src/main/resources/_vfs/nop/rule/pages/NopRuleNode/ref-ruleDefinition.page.yaml
 delete mode 100644 nop-rule/nop-rule-web/src/main/resources/_vfs/nop/rule/pages/NopRuleOutput/NopRuleOutput.lib.xjs
 delete mode 100644 nop-rule/nop-rule-web/src/main/resources/_vfs/nop/rule/pages/NopRuleOutput/NopRuleOutput.view.xml
 delete mode 100644 nop-rule/nop-rule-web/src/main/resources/_vfs/nop/rule/pages/NopRuleOutput/_gen/_NopRuleOutput.view.xml
 delete mode 100644 nop-rule/nop-rule-web/src/main/resources/_vfs/nop/rule/pages/NopRuleOutput/main.page.yaml
 delete mode 100644 nop-rule/nop-rule-web/src/main/resources/_vfs/nop/rule/pages/NopRuleOutput/picker.page.yaml

diff --git a/docs/dev-guide/xui/xview.md b/docs/dev-guide/xui/xview.md
index c47d4d570..6c45cbcae 100644
--- a/docs/dev-guide/xui/xview.md
+++ b/docs/dev-guide/xui/xview.md
@@ -299,4 +299,31 @@ url: "@query:NopAuthDept__findList/value:id,label:deptName,children @TreeChildre
 <form id="view" layoutControl="tabs" >...</form>
 ```
 
-配置layoutComponent=tabs。
\ No newline at end of file
+配置layoutComponent=tabs。
+
+
+## 11. 点击行上按钮弹出关联子表的增删改查页面
+
+````xml
+<action id="row-edit-rule-nodes" label="@i18n:rule.ruleNodes|规则节点" actionType="drawer">
+    <dialog page="/nop/rule/pages/NopRuleNode/ref-ruleDefinition.page.yaml" size="xl">
+        <data>
+            <ruleId>$ruleId</ruleId>
+            <ruleDefinition>
+                <displayName>$displayName</displayName>
+            </ruleDefinition>
+        </data>
+    </dialog>
+</action>
+````
+
+弹出对话框时通过data段指定在弹出页面中哪些字段的值为固定值。
+
+> ruleId字段转换为使用查看控件显示时，需要使用ruleDefinition.displayName作为显示文本，所以需要传入这个值
+
+在弹出页面文件 ref-ruleDefinition.page.yaml中我们可以引用已有的crud页面，但是通过fixedProps指定哪些字段使用固定值，不允许用户编辑
+
+````yaml
+x:gen-extends: |
+  <web:GenPage view="NopRuleNode.view.xml" page="main" fixedProps="ruleId" xpl:lib="/nop/web/xlib/web.xlib" />
+````
diff --git a/nop-auth/nop-auth-web/src/main/resources/_vfs/nop/auth/pages/NopAuthDept/_gen/_NopAuthDept.view.xml b/nop-auth/nop-auth-web/src/main/resources/_vfs/nop/auth/pages/NopAuthDept/_gen/_NopAuthDept.view.xml
index 5149e0d1e..69957cb62 100644
--- a/nop-auth/nop-auth-web/src/main/resources/_vfs/nop/auth/pages/NopAuthDept/_gen/_NopAuthDept.view.xml
+++ b/nop-auth/nop-auth-web/src/main/resources/_vfs/nop/auth/pages/NopAuthDept/_gen/_NopAuthDept.view.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <view x:schema="/nop/schema/xui/xview.xdef" bizObjName="NopAuthDept" xmlns:i18n-en="i18n-en"
-      xmlns:x="/nop/schema/xdsl.xdef" xmlns:j="j">
+      xmlns:x="/nop/schema/xdsl.xdef" xmlns:j="j" xmlns:gql="gql">
 
     <objMeta>/nop/auth/model/NopAuthDept/NopAuthDept.xmeta</objMeta>
 
@@ -87,7 +87,7 @@
     <pages>
         <crud name="main" grid="tree-list" asideFilterForm="asideFilter" filterForm="query" x:abstract="true">
             <table loadDataOnce="true" sortable="false" pager="none">
-                <api url="@query:NopAuthDept__findList/{@listSelection}?filter_parentId=__null"/>
+                <api url="@query:NopAuthDept__findList?filter_parentId=__null" gql:selection="{@listSelection}"/>
             </table>
             <listActions>
                 <action id="batch-delete-button" label="@i18n:common.batchDelete" batch="true">
@@ -125,17 +125,17 @@
         </crud>
         <picker name="picker" grid="pick-list" asideFilterForm="asideFilter" filterForm="query" x:abstract="true">
             <table>
-                <api url="@query:NopAuthDept__findPage/{@pageSelection}"/>
+                <api url="@query:NopAuthDept__findPage" gql:selection="{@pageSelection}"/>
             </table>
         </picker>
         <simple name="add" form="add">
             <api url="@mutation:NopAuthDept__save/id"/>
         </simple>
         <simple name="view" form="view">
-            <initApi url="@query:NopAuthDept__get/{@formSelection}?id=$id"/>
+            <initApi url="@query:NopAuthDept__get?id=$id" gql:selection="{@formSelection}"/>
         </simple>
         <simple name="update" form="edit">
-            <initApi url="@query:NopAuthDept__get/{@formSelection}?id=$id"/>
+            <initApi url="@query:NopAuthDept__get?id=$id" gql:selection="{@formSelection}"/>
             <api url="@mutation:NopAuthDept__update/id?id=$id" withFormData="true"/>
         </simple>
         <simple name="add-child" form="add">
diff --git a/nop-auth/nop-auth-web/src/main/resources/_vfs/nop/auth/pages/NopAuthExtLogin/_gen/_NopAuthExtLogin.view.xml b/nop-auth/nop-auth-web/src/main/resources/_vfs/nop/auth/pages/NopAuthExtLogin/_gen/_NopAuthExtLogin.view.xml
index 0e29d905f..0a60c30ba 100644
--- a/nop-auth/nop-auth-web/src/main/resources/_vfs/nop/auth/pages/NopAuthExtLogin/_gen/_NopAuthExtLogin.view.xml
+++ b/nop-auth/nop-auth-web/src/main/resources/_vfs/nop/auth/pages/NopAuthExtLogin/_gen/_NopAuthExtLogin.view.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <view x:schema="/nop/schema/xui/xview.xdef" bizObjName="NopAuthExtLogin" xmlns:i18n-en="i18n-en"
-      xmlns:x="/nop/schema/xdsl.xdef" xmlns:j="j">
+      xmlns:x="/nop/schema/xdsl.xdef" xmlns:j="j" xmlns:gql="gql">
 
     <objMeta>/nop/auth/model/NopAuthExtLogin/NopAuthExtLogin.xmeta</objMeta>
 
@@ -69,7 +69,7 @@
     <pages>
         <crud name="main" grid="list" asideFilterForm="asideFilter" filterForm="query" x:abstract="true">
             <table autoFillHeight="true">
-                <api url="@query:NopAuthExtLogin__findPage/{@pageSelection}"/>
+                <api url="@query:NopAuthExtLogin__findPage" gql:selection="{@pageSelection}"/>
             </table>
             <listActions>
                 <action id="batch-delete-button" label="@i18n:common.batchDelete" batch="true">
@@ -104,17 +104,17 @@
         </crud>
         <picker name="picker" grid="pick-list" asideFilterForm="asideFilter" filterForm="query" x:abstract="true">
             <table>
-                <api url="@query:NopAuthExtLogin__findPage/{@pageSelection}"/>
+                <api url="@query:NopAuthExtLogin__findPage" gql:selection="{@pageSelection}"/>
             </table>
         </picker>
         <simple name="add" form="add">
             <api url="@mutation:NopAuthExtLogin__save/id"/>
         </simple>
         <simple name="view" form="view">
-            <initApi url="@query:NopAuthExtLogin__get/{@formSelection}?id=$id"/>
+            <initApi url="@query:NopAuthExtLogin__get?id=$id" gql:selection="{@formSelection}"/>
         </simple>
         <simple name="update" form="edit">
-            <initApi url="@query:NopAuthExtLogin__get/{@formSelection}?id=$id"/>
+            <initApi url="@query:NopAuthExtLogin__get?id=$id" gql:selection="{@formSelection}"/>
             <api url="@mutation:NopAuthExtLogin__update/id?id=$id" withFormData="true"/>
         </simple>
     </pages>
diff --git a/nop-auth/nop-auth-web/src/main/resources/_vfs/nop/auth/pages/NopAuthOpLog/_gen/_NopAuthOpLog.view.xml b/nop-auth/nop-auth-web/src/main/resources/_vfs/nop/auth/pages/NopAuthOpLog/_gen/_NopAuthOpLog.view.xml
index 2e4c8fdd8..ce82739b3 100644
--- a/nop-auth/nop-auth-web/src/main/resources/_vfs/nop/auth/pages/NopAuthOpLog/_gen/_NopAuthOpLog.view.xml
+++ b/nop-auth/nop-auth-web/src/main/resources/_vfs/nop/auth/pages/NopAuthOpLog/_gen/_NopAuthOpLog.view.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <view x:schema="/nop/schema/xui/xview.xdef" bizObjName="NopAuthOpLog" xmlns:i18n-en="i18n-en"
-      xmlns:x="/nop/schema/xdsl.xdef" xmlns:j="j">
+      xmlns:x="/nop/schema/xdsl.xdef" xmlns:j="j" xmlns:gql="gql">
 
     <objMeta>/nop/auth/model/NopAuthOpLog/NopAuthOpLog.xmeta</objMeta>
 
@@ -76,7 +76,7 @@
     <pages>
         <crud name="main" grid="list" asideFilterForm="asideFilter" filterForm="query" x:abstract="true">
             <table autoFillHeight="true">
-                <api url="@query:NopAuthOpLog__findPage/{@pageSelection}"/>
+                <api url="@query:NopAuthOpLog__findPage" gql:selection="{@pageSelection}"/>
             </table>
             <listActions>
                 <action id="batch-delete-button" label="@i18n:common.batchDelete" batch="true">
@@ -108,11 +108,11 @@
         </crud>
         <picker name="picker" grid="pick-list" asideFilterForm="asideFilter" filterForm="query" x:abstract="true">
             <table>
-                <api url="@query:NopAuthOpLog__findPage/{@pageSelection}"/>
+                <api url="@query:NopAuthOpLog__findPage" gql:selection="{@pageSelection}"/>
             </table>
         </picker>
         <simple name="view" form="view">
-            <initApi url="@query:NopAuthOpLog__get/{@formSelection}?id=$id"/>
+            <initApi url="@query:NopAuthOpLog__get?id=$id" gql:selection="{@formSelection}"/>
         </simple>
     </pages>
 </view>
\ No newline at end of file
diff --git a/nop-auth/nop-auth-web/src/main/resources/_vfs/nop/auth/pages/NopAuthPosition/_gen/_NopAuthPosition.view.xml b/nop-auth/nop-auth-web/src/main/resources/_vfs/nop/auth/pages/NopAuthPosition/_gen/_NopAuthPosition.view.xml
index 36e75e478..2c6aa49f4 100644
--- a/nop-auth/nop-auth-web/src/main/resources/_vfs/nop/auth/pages/NopAuthPosition/_gen/_NopAuthPosition.view.xml
+++ b/nop-auth/nop-auth-web/src/main/resources/_vfs/nop/auth/pages/NopAuthPosition/_gen/_NopAuthPosition.view.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <view x:schema="/nop/schema/xui/xview.xdef" bizObjName="NopAuthPosition" xmlns:i18n-en="i18n-en"
-      xmlns:x="/nop/schema/xdsl.xdef" xmlns:j="j">
+      xmlns:x="/nop/schema/xdsl.xdef" xmlns:j="j" xmlns:gql="gql">
 
     <objMeta>/nop/auth/model/NopAuthPosition/NopAuthPosition.xmeta</objMeta>
 
@@ -64,7 +64,7 @@
     <pages>
         <crud name="main" grid="list" asideFilterForm="asideFilter" filterForm="query" x:abstract="true">
             <table autoFillHeight="true">
-                <api url="@query:NopAuthPosition__findPage/{@pageSelection}"/>
+                <api url="@query:NopAuthPosition__findPage" gql:selection="{@pageSelection}"/>
             </table>
             <listActions>
                 <action id="batch-delete-button" label="@i18n:common.batchDelete" batch="true">
@@ -99,17 +99,17 @@
         </crud>
         <picker name="picker" grid="pick-list" asideFilterForm="asideFilter" filterForm="query" x:abstract="true">
             <table>
-                <api url="@query:NopAuthPosition__findPage/{@pageSelection}"/>
+                <api url="@query:NopAuthPosition__findPage" gql:selection="{@pageSelection}"/>
             </table>
         </picker>
         <simple name="add" form="add">
             <api url="@mutation:NopAuthPosition__save/id"/>
         </simple>
         <simple name="view" form="view">
-            <initApi url="@query:NopAuthPosition__get/{@formSelection}?id=$id"/>
+            <initApi url="@query:NopAuthPosition__get?id=$id" gql:selection="{@formSelection}"/>
         </simple>
         <simple name="update" form="edit">
-            <initApi url="@query:NopAuthPosition__get/{@formSelection}?id=$id"/>
+            <initApi url="@query:NopAuthPosition__get?id=$id" gql:selection="{@formSelection}"/>
             <api url="@mutation:NopAuthPosition__update/id?id=$id" withFormData="true"/>
         </simple>
     </pages>
diff --git a/nop-auth/nop-auth-web/src/main/resources/_vfs/nop/auth/pages/NopAuthResource/_gen/_NopAuthResource.view.xml b/nop-auth/nop-auth-web/src/main/resources/_vfs/nop/auth/pages/NopAuthResource/_gen/_NopAuthResource.view.xml
index 17c9b453e..c6224192c 100644
--- a/nop-auth/nop-auth-web/src/main/resources/_vfs/nop/auth/pages/NopAuthResource/_gen/_NopAuthResource.view.xml
+++ b/nop-auth/nop-auth-web/src/main/resources/_vfs/nop/auth/pages/NopAuthResource/_gen/_NopAuthResource.view.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <view x:schema="/nop/schema/xui/xview.xdef" bizObjName="NopAuthResource" xmlns:i18n-en="i18n-en"
-      xmlns:x="/nop/schema/xdsl.xdef" xmlns:j="j">
+      xmlns:x="/nop/schema/xdsl.xdef" xmlns:j="j" xmlns:gql="gql">
 
     <objMeta>/nop/auth/model/NopAuthResource/NopAuthResource.xmeta</objMeta>
 
@@ -137,7 +137,7 @@
     <pages>
         <crud name="main" grid="tree-list" asideFilterForm="asideFilter" filterForm="query" x:abstract="true">
             <table loadDataOnce="true" sortable="false" pager="none">
-                <api url="@query:NopAuthResource__findList/{@listSelection}?filter_parentId=__null"/>
+                <api url="@query:NopAuthResource__findList?filter_parentId=__null" gql:selection="{@listSelection}"/>
             </table>
             <listActions>
                 <action id="batch-delete-button" label="@i18n:common.batchDelete" batch="true">
@@ -175,17 +175,17 @@
         </crud>
         <picker name="picker" grid="pick-list" asideFilterForm="asideFilter" filterForm="query" x:abstract="true">
             <table>
-                <api url="@query:NopAuthResource__findPage/{@pageSelection}"/>
+                <api url="@query:NopAuthResource__findPage" gql:selection="{@pageSelection}"/>
             </table>
         </picker>
         <simple name="add" form="add">
             <api url="@mutation:NopAuthResource__save/id"/>
         </simple>
         <simple name="view" form="view">
-            <initApi url="@query:NopAuthResource__get/{@formSelection}?id=$id"/>
+            <initApi url="@query:NopAuthResource__get?id=$id" gql:selection="{@formSelection}"/>
         </simple>
         <simple name="update" form="edit">
-            <initApi url="@query:NopAuthResource__get/{@formSelection}?id=$id"/>
+            <initApi url="@query:NopAuthResource__get?id=$id" gql:selection="{@formSelection}"/>
             <api url="@mutation:NopAuthResource__update/id?id=$id" withFormData="true"/>
         </simple>
         <simple name="add-child" form="add">
diff --git a/nop-auth/nop-auth-web/src/main/resources/_vfs/nop/auth/pages/NopAuthRole/_gen/_NopAuthRole.view.xml b/nop-auth/nop-auth-web/src/main/resources/_vfs/nop/auth/pages/NopAuthRole/_gen/_NopAuthRole.view.xml
index bca9531b9..2a0bf1b5a 100644
--- a/nop-auth/nop-auth-web/src/main/resources/_vfs/nop/auth/pages/NopAuthRole/_gen/_NopAuthRole.view.xml
+++ b/nop-auth/nop-auth-web/src/main/resources/_vfs/nop/auth/pages/NopAuthRole/_gen/_NopAuthRole.view.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <view x:schema="/nop/schema/xui/xview.xdef" bizObjName="NopAuthRole" xmlns:i18n-en="i18n-en"
-      xmlns:x="/nop/schema/xdsl.xdef" xmlns:j="j">
+      xmlns:x="/nop/schema/xdsl.xdef" xmlns:j="j" xmlns:gql="gql">
 
     <objMeta>/nop/auth/model/NopAuthRole/NopAuthRole.xmeta</objMeta>
 
@@ -74,7 +74,7 @@
     <pages>
         <crud name="main" grid="list" asideFilterForm="asideFilter" filterForm="query" x:abstract="true">
             <table autoFillHeight="true">
-                <api url="@query:NopAuthRole__findPage/{@pageSelection}"/>
+                <api url="@query:NopAuthRole__findPage" gql:selection="{@pageSelection}"/>
             </table>
             <listActions>
                 <action id="batch-delete-button" label="@i18n:common.batchDelete" batch="true">
@@ -109,17 +109,17 @@
         </crud>
         <picker name="picker" grid="pick-list" asideFilterForm="asideFilter" filterForm="query" x:abstract="true">
             <table>
-                <api url="@query:NopAuthRole__findPage/{@pageSelection}"/>
+                <api url="@query:NopAuthRole__findPage" gql:selection="{@pageSelection}"/>
             </table>
         </picker>
         <simple name="add" form="add">
             <api url="@mutation:NopAuthRole__save/id"/>
         </simple>
         <simple name="view" form="view">
-            <initApi url="@query:NopAuthRole__get/{@formSelection}?id=$id"/>
+            <initApi url="@query:NopAuthRole__get?id=$id" gql:selection="{@formSelection}"/>
         </simple>
         <simple name="update" form="edit">
-            <initApi url="@query:NopAuthRole__get/{@formSelection}?id=$id"/>
+            <initApi url="@query:NopAuthRole__get?id=$id" gql:selection="{@formSelection}"/>
             <api url="@mutation:NopAuthRole__update/id?id=$id" withFormData="true"/>
         </simple>
     </pages>
diff --git a/nop-auth/nop-auth-web/src/main/resources/_vfs/nop/auth/pages/NopAuthRoleDataAuth/_gen/_NopAuthRoleDataAuth.view.xml b/nop-auth/nop-auth-web/src/main/resources/_vfs/nop/auth/pages/NopAuthRoleDataAuth/_gen/_NopAuthRoleDataAuth.view.xml
index 27d6e1309..d26cda874 100644
--- a/nop-auth/nop-auth-web/src/main/resources/_vfs/nop/auth/pages/NopAuthRoleDataAuth/_gen/_NopAuthRoleDataAuth.view.xml
+++ b/nop-auth/nop-auth-web/src/main/resources/_vfs/nop/auth/pages/NopAuthRoleDataAuth/_gen/_NopAuthRoleDataAuth.view.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <view x:schema="/nop/schema/xui/xview.xdef" bizObjName="NopAuthRoleDataAuth" xmlns:i18n-en="i18n-en"
-      xmlns:x="/nop/schema/xdsl.xdef" xmlns:j="j">
+      xmlns:x="/nop/schema/xdsl.xdef" xmlns:j="j" xmlns:gql="gql">
 
     <objMeta>/nop/auth/model/NopAuthRoleDataAuth/NopAuthRoleDataAuth.xmeta</objMeta>
 
@@ -82,7 +82,7 @@
     <pages>
         <crud name="main" grid="list" asideFilterForm="asideFilter" filterForm="query" x:abstract="true">
             <table autoFillHeight="true">
-                <api url="@query:NopAuthRoleDataAuth__findPage/{@pageSelection}"/>
+                <api url="@query:NopAuthRoleDataAuth__findPage" gql:selection="{@pageSelection}"/>
             </table>
             <listActions>
                 <action id="batch-delete-button" label="@i18n:common.batchDelete" batch="true">
@@ -117,17 +117,17 @@
         </crud>
         <picker name="picker" grid="pick-list" asideFilterForm="asideFilter" filterForm="query" x:abstract="true">
             <table>
-                <api url="@query:NopAuthRoleDataAuth__findPage/{@pageSelection}"/>
+                <api url="@query:NopAuthRoleDataAuth__findPage" gql:selection="{@pageSelection}"/>
             </table>
         </picker>
         <simple name="add" form="add">
             <api url="@mutation:NopAuthRoleDataAuth__save/id"/>
         </simple>
         <simple name="view" form="view">
-            <initApi url="@query:NopAuthRoleDataAuth__get/{@formSelection}?id=$id"/>
+            <initApi url="@query:NopAuthRoleDataAuth__get?id=$id" gql:selection="{@formSelection}"/>
         </simple>
         <simple name="update" form="edit">
-            <initApi url="@query:NopAuthRoleDataAuth__get/{@formSelection}?id=$id"/>
+            <initApi url="@query:NopAuthRoleDataAuth__get?id=$id" gql:selection="{@formSelection}"/>
             <api url="@mutation:NopAuthRoleDataAuth__update/id?id=$id" withFormData="true"/>
         </simple>
     </pages>
diff --git a/nop-auth/nop-auth-web/src/main/resources/_vfs/nop/auth/pages/NopAuthSession/_gen/_NopAuthSession.view.xml b/nop-auth/nop-auth-web/src/main/resources/_vfs/nop/auth/pages/NopAuthSession/_gen/_NopAuthSession.view.xml
index 0d156db44..25d3cdcd2 100644
--- a/nop-auth/nop-auth-web/src/main/resources/_vfs/nop/auth/pages/NopAuthSession/_gen/_NopAuthSession.view.xml
+++ b/nop-auth/nop-auth-web/src/main/resources/_vfs/nop/auth/pages/NopAuthSession/_gen/_NopAuthSession.view.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <view x:schema="/nop/schema/xui/xview.xdef" bizObjName="NopAuthSession" xmlns:i18n-en="i18n-en"
-      xmlns:x="/nop/schema/xdsl.xdef" xmlns:j="j">
+      xmlns:x="/nop/schema/xdsl.xdef" xmlns:j="j" xmlns:gql="gql">
 
     <objMeta>/nop/auth/model/NopAuthSession/NopAuthSession.xmeta</objMeta>
 
@@ -76,7 +76,7 @@
     <pages>
         <crud name="main" grid="list" asideFilterForm="asideFilter" filterForm="query" x:abstract="true">
             <table autoFillHeight="true">
-                <api url="@query:NopAuthSession__findPage/{@pageSelection}"/>
+                <api url="@query:NopAuthSession__findPage" gql:selection="{@pageSelection}"/>
             </table>
             <listActions>
                 <action id="batch-delete-button" label="@i18n:common.batchDelete" batch="true">
@@ -108,11 +108,11 @@
         </crud>
         <picker name="picker" grid="pick-list" asideFilterForm="asideFilter" filterForm="query" x:abstract="true">
             <table>
-                <api url="@query:NopAuthSession__findPage/{@pageSelection}"/>
+                <api url="@query:NopAuthSession__findPage" gql:selection="{@pageSelection}"/>
             </table>
         </picker>
         <simple name="view" form="view">
-            <initApi url="@query:NopAuthSession__get/{@formSelection}?id=$id"/>
+            <initApi url="@query:NopAuthSession__get?id=$id" gql:selection="{@formSelection}"/>
         </simple>
     </pages>
 </view>
\ No newline at end of file
diff --git a/nop-auth/nop-auth-web/src/main/resources/_vfs/nop/auth/pages/NopAuthSite/_gen/_NopAuthSite.view.xml b/nop-auth/nop-auth-web/src/main/resources/_vfs/nop/auth/pages/NopAuthSite/_gen/_NopAuthSite.view.xml
index e8157c6ca..9375ea4b3 100644
--- a/nop-auth/nop-auth-web/src/main/resources/_vfs/nop/auth/pages/NopAuthSite/_gen/_NopAuthSite.view.xml
+++ b/nop-auth/nop-auth-web/src/main/resources/_vfs/nop/auth/pages/NopAuthSite/_gen/_NopAuthSite.view.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <view x:schema="/nop/schema/xui/xview.xdef" bizObjName="NopAuthSite" xmlns:i18n-en="i18n-en"
-      xmlns:x="/nop/schema/xdsl.xdef" xmlns:j="j">
+      xmlns:x="/nop/schema/xdsl.xdef" xmlns:j="j" xmlns:gql="gql">
 
     <objMeta>/nop/auth/model/NopAuthSite/NopAuthSite.xmeta</objMeta>
 
@@ -89,7 +89,7 @@
     <pages>
         <crud name="main" grid="list" asideFilterForm="asideFilter" filterForm="query" x:abstract="true">
             <table autoFillHeight="true">
-                <api url="@query:NopAuthSite__findPage/{@pageSelection}"/>
+                <api url="@query:NopAuthSite__findPage" gql:selection="{@pageSelection}"/>
             </table>
             <listActions>
                 <action id="batch-delete-button" label="@i18n:common.batchDelete" batch="true">
@@ -124,17 +124,17 @@
         </crud>
         <picker name="picker" grid="pick-list" asideFilterForm="asideFilter" filterForm="query" x:abstract="true">
             <table>
-                <api url="@query:NopAuthSite__findPage/{@pageSelection}"/>
+                <api url="@query:NopAuthSite__findPage" gql:selection="{@pageSelection}"/>
             </table>
         </picker>
         <simple name="add" form="add">
             <api url="@mutation:NopAuthSite__save/id"/>
         </simple>
         <simple name="view" form="view">
-            <initApi url="@query:NopAuthSite__get/{@formSelection}?id=$id"/>
+            <initApi url="@query:NopAuthSite__get?id=$id" gql:selection="{@formSelection}"/>
         </simple>
         <simple name="update" form="edit">
-            <initApi url="@query:NopAuthSite__get/{@formSelection}?id=$id"/>
+            <initApi url="@query:NopAuthSite__get?id=$id" gql:selection="{@formSelection}"/>
             <api url="@mutation:NopAuthSite__update/id?id=$id" withFormData="true"/>
         </simple>
     </pages>
diff --git a/nop-auth/nop-auth-web/src/main/resources/_vfs/nop/auth/pages/NopAuthTenant/_gen/_NopAuthTenant.view.xml b/nop-auth/nop-auth-web/src/main/resources/_vfs/nop/auth/pages/NopAuthTenant/_gen/_NopAuthTenant.view.xml
index 4b496ee2a..526ac1ac7 100644
--- a/nop-auth/nop-auth-web/src/main/resources/_vfs/nop/auth/pages/NopAuthTenant/_gen/_NopAuthTenant.view.xml
+++ b/nop-auth/nop-auth-web/src/main/resources/_vfs/nop/auth/pages/NopAuthTenant/_gen/_NopAuthTenant.view.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <view x:schema="/nop/schema/xui/xview.xdef" bizObjName="NopAuthTenant" xmlns:i18n-en="i18n-en"
-      xmlns:x="/nop/schema/xdsl.xdef" xmlns:j="j">
+      xmlns:x="/nop/schema/xdsl.xdef" xmlns:j="j" xmlns:gql="gql">
 
     <objMeta>/nop/auth/model/NopAuthTenant/NopAuthTenant.xmeta</objMeta>
 
@@ -79,7 +79,7 @@
     <pages>
         <crud name="main" grid="list" asideFilterForm="asideFilter" filterForm="query" x:abstract="true">
             <table autoFillHeight="true">
-                <api url="@query:NopAuthTenant__findPage/{@pageSelection}"/>
+                <api url="@query:NopAuthTenant__findPage" gql:selection="{@pageSelection}"/>
             </table>
             <listActions>
                 <action id="batch-delete-button" label="@i18n:common.batchDelete" batch="true">
@@ -114,17 +114,17 @@
         </crud>
         <picker name="picker" grid="pick-list" asideFilterForm="asideFilter" filterForm="query" x:abstract="true">
             <table>
-                <api url="@query:NopAuthTenant__findPage/{@pageSelection}"/>
+                <api url="@query:NopAuthTenant__findPage" gql:selection="{@pageSelection}"/>
             </table>
         </picker>
         <simple name="add" form="add">
             <api url="@mutation:NopAuthTenant__save/id"/>
         </simple>
         <simple name="view" form="view">
-            <initApi url="@query:NopAuthTenant__get/{@formSelection}?id=$id"/>
+            <initApi url="@query:NopAuthTenant__get?id=$id" gql:selection="{@formSelection}"/>
         </simple>
         <simple name="update" form="edit">
-            <initApi url="@query:NopAuthTenant__get/{@formSelection}?id=$id"/>
+            <initApi url="@query:NopAuthTenant__get?id=$id" gql:selection="{@formSelection}"/>
             <api url="@mutation:NopAuthTenant__update/id?id=$id" withFormData="true"/>
         </simple>
     </pages>
diff --git a/nop-auth/nop-auth-web/src/main/resources/_vfs/nop/auth/pages/NopAuthUser/_gen/_NopAuthUser.view.xml b/nop-auth/nop-auth-web/src/main/resources/_vfs/nop/auth/pages/NopAuthUser/_gen/_NopAuthUser.view.xml
index 2da1ee4db..f5d05e6bf 100644
--- a/nop-auth/nop-auth-web/src/main/resources/_vfs/nop/auth/pages/NopAuthUser/_gen/_NopAuthUser.view.xml
+++ b/nop-auth/nop-auth-web/src/main/resources/_vfs/nop/auth/pages/NopAuthUser/_gen/_NopAuthUser.view.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <view x:schema="/nop/schema/xui/xview.xdef" bizObjName="NopAuthUser" xmlns:i18n-en="i18n-en"
-      xmlns:x="/nop/schema/xdsl.xdef" xmlns:j="j">
+      xmlns:x="/nop/schema/xdsl.xdef" xmlns:j="j" xmlns:gql="gql">
 
     <objMeta>/nop/auth/model/NopAuthUser/NopAuthUser.xmeta</objMeta>
 
@@ -133,7 +133,7 @@
     <pages>
         <crud name="main" grid="list" asideFilterForm="asideFilter" filterForm="query" x:abstract="true">
             <table autoFillHeight="true">
-                <api url="@query:NopAuthUser__findPage/{@pageSelection}"/>
+                <api url="@query:NopAuthUser__findPage" gql:selection="{@pageSelection}"/>
             </table>
             <listActions>
                 <action id="batch-delete-button" label="@i18n:common.batchDelete" batch="true">
@@ -168,17 +168,17 @@
         </crud>
         <picker name="picker" grid="pick-list" asideFilterForm="asideFilter" filterForm="query" x:abstract="true">
             <table>
-                <api url="@query:NopAuthUser__findPage/{@pageSelection}"/>
+                <api url="@query:NopAuthUser__findPage" gql:selection="{@pageSelection}"/>
             </table>
         </picker>
         <simple name="add" form="add">
             <api url="@mutation:NopAuthUser__save/id"/>
         </simple>
         <simple name="view" form="view">
-            <initApi url="@query:NopAuthUser__get/{@formSelection}?id=$id"/>
+            <initApi url="@query:NopAuthUser__get?id=$id" gql:selection="{@formSelection}"/>
         </simple>
         <simple name="update" form="edit">
-            <initApi url="@query:NopAuthUser__get/{@formSelection}?id=$id"/>
+            <initApi url="@query:NopAuthUser__get?id=$id" gql:selection="{@formSelection}"/>
             <api url="@mutation:NopAuthUser__update/id?id=$id" withFormData="true"/>
         </simple>
     </pages>
diff --git a/nop-auth/nop-auth-web/src/main/resources/_vfs/nop/auth/pages/NopAuthUserSubstitution/_gen/_NopAuthUserSubstitution.view.xml b/nop-auth/nop-auth-web/src/main/resources/_vfs/nop/auth/pages/NopAuthUserSubstitution/_gen/_NopAuthUserSubstitution.view.xml
index 354370847..b43fd3ae6 100644
--- a/nop-auth/nop-auth-web/src/main/resources/_vfs/nop/auth/pages/NopAuthUserSubstitution/_gen/_NopAuthUserSubstitution.view.xml
+++ b/nop-auth/nop-auth-web/src/main/resources/_vfs/nop/auth/pages/NopAuthUserSubstitution/_gen/_NopAuthUserSubstitution.view.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <view x:schema="/nop/schema/xui/xview.xdef" bizObjName="NopAuthUserSubstitution" xmlns:i18n-en="i18n-en"
-      xmlns:x="/nop/schema/xdsl.xdef" xmlns:j="j">
+      xmlns:x="/nop/schema/xdsl.xdef" xmlns:j="j" xmlns:gql="gql">
 
     <objMeta>/nop/auth/model/NopAuthUserSubstitution/NopAuthUserSubstitution.xmeta</objMeta>
 
@@ -80,7 +80,7 @@
     <pages>
         <crud name="main" grid="list" asideFilterForm="asideFilter" filterForm="query" x:abstract="true">
             <table autoFillHeight="true">
-                <api url="@query:NopAuthUserSubstitution__findPage/{@pageSelection}"/>
+                <api url="@query:NopAuthUserSubstitution__findPage" gql:selection="{@pageSelection}"/>
             </table>
             <listActions>
                 <action id="batch-delete-button" label="@i18n:common.batchDelete" batch="true">
@@ -115,17 +115,17 @@
         </crud>
         <picker name="picker" grid="pick-list" asideFilterForm="asideFilter" filterForm="query" x:abstract="true">
             <table>
-                <api url="@query:NopAuthUserSubstitution__findPage/{@pageSelection}"/>
+                <api url="@query:NopAuthUserSubstitution__findPage" gql:selection="{@pageSelection}"/>
             </table>
         </picker>
         <simple name="add" form="add">
             <api url="@mutation:NopAuthUserSubstitution__save/id"/>
         </simple>
         <simple name="view" form="view">
-            <initApi url="@query:NopAuthUserSubstitution__get/{@formSelection}?id=$id"/>
+            <initApi url="@query:NopAuthUserSubstitution__get?id=$id" gql:selection="{@formSelection}"/>
         </simple>
         <simple name="update" form="edit">
-            <initApi url="@query:NopAuthUserSubstitution__get/{@formSelection}?id=$id"/>
+            <initApi url="@query:NopAuthUserSubstitution__get?id=$id" gql:selection="{@formSelection}"/>
             <api url="@mutation:NopAuthUserSubstitution__update/id?id=$id" withFormData="true"/>
         </simple>
     </pages>
diff --git a/nop-autotest/nop-autotest-core/src/main/java/io/nop/autotest/core/AutoTestCase.java b/nop-autotest/nop-autotest-core/src/main/java/io/nop/autotest/core/AutoTestCase.java
index 9ae6aa1ec..733e3dd45 100644
--- a/nop-autotest/nop-autotest-core/src/main/java/io/nop/autotest/core/AutoTestCase.java
+++ b/nop-autotest/nop-autotest-core/src/main/java/io/nop/autotest/core/AutoTestCase.java
@@ -7,6 +7,7 @@
  */
 package io.nop.autotest.core;
 
+import io.nop.api.core.auth.IUserContext;
 import io.nop.api.core.beans.ApiRequest;
 import io.nop.api.core.context.ContextProvider;
 import io.nop.api.core.context.IContext;
@@ -155,6 +156,7 @@ public void initDao() {
         context.setUserId("autotest");
         context.setUserName("autotest-name");
         context.setUserRefNo("autotest-ref");
+        IUserContext.set(null);
     }
 
     protected void configLocalDb() {
diff --git a/nop-batch/nop-batch-web/src/main/resources/_vfs/nop/batch/pages/NopBatchFile/_gen/_NopBatchFile.view.xml b/nop-batch/nop-batch-web/src/main/resources/_vfs/nop/batch/pages/NopBatchFile/_gen/_NopBatchFile.view.xml
index bd5be052e..4475bd949 100644
--- a/nop-batch/nop-batch-web/src/main/resources/_vfs/nop/batch/pages/NopBatchFile/_gen/_NopBatchFile.view.xml
+++ b/nop-batch/nop-batch-web/src/main/resources/_vfs/nop/batch/pages/NopBatchFile/_gen/_NopBatchFile.view.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <view x:schema="/nop/schema/xui/xview.xdef" bizObjName="NopBatchFile" xmlns:i18n-en="i18n-en"
-      xmlns:x="/nop/schema/xdsl.xdef" xmlns:j="j">
+      xmlns:x="/nop/schema/xdsl.xdef" xmlns:j="j" xmlns:gql="gql">
 
     <objMeta>/nop/batch/model/NopBatchFile/NopBatchFile.xmeta</objMeta>
 
@@ -93,7 +93,7 @@
     <pages>
         <crud name="main" grid="list" asideFilterForm="asideFilter" filterForm="query" x:abstract="true">
             <table autoFillHeight="true">
-                <api url="@query:NopBatchFile__findPage/{@pageSelection}"/>
+                <api url="@query:NopBatchFile__findPage" gql:selection="{@pageSelection}"/>
             </table>
             <listActions>
                 <action id="batch-delete-button" label="@i18n:common.batchDelete" batch="true">
@@ -128,17 +128,17 @@
         </crud>
         <picker name="picker" grid="pick-list" asideFilterForm="asideFilter" filterForm="query" x:abstract="true">
             <table>
-                <api url="@query:NopBatchFile__findPage/{@pageSelection}"/>
+                <api url="@query:NopBatchFile__findPage" gql:selection="{@pageSelection}"/>
             </table>
         </picker>
         <simple name="add" form="add">
             <api url="@mutation:NopBatchFile__save/id"/>
         </simple>
         <simple name="view" form="view">
-            <initApi url="@query:NopBatchFile__get/{@formSelection}?id=$id"/>
+            <initApi url="@query:NopBatchFile__get?id=$id" gql:selection="{@formSelection}"/>
         </simple>
         <simple name="update" form="edit">
-            <initApi url="@query:NopBatchFile__get/{@formSelection}?id=$id"/>
+            <initApi url="@query:NopBatchFile__get?id=$id" gql:selection="{@formSelection}"/>
             <api url="@mutation:NopBatchFile__update/id?id=$id" withFormData="true"/>
         </simple>
     </pages>
diff --git a/nop-batch/nop-batch-web/src/main/resources/_vfs/nop/batch/pages/NopBatchRecordResult/_gen/_NopBatchRecordResult.view.xml b/nop-batch/nop-batch-web/src/main/resources/_vfs/nop/batch/pages/NopBatchRecordResult/_gen/_NopBatchRecordResult.view.xml
index 835d66010..347a428c0 100644
--- a/nop-batch/nop-batch-web/src/main/resources/_vfs/nop/batch/pages/NopBatchRecordResult/_gen/_NopBatchRecordResult.view.xml
+++ b/nop-batch/nop-batch-web/src/main/resources/_vfs/nop/batch/pages/NopBatchRecordResult/_gen/_NopBatchRecordResult.view.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <view x:schema="/nop/schema/xui/xview.xdef" bizObjName="NopBatchRecordResult" xmlns:i18n-en="i18n-en"
-      xmlns:x="/nop/schema/xdsl.xdef" xmlns:j="j">
+      xmlns:x="/nop/schema/xdsl.xdef" xmlns:j="j" xmlns:gql="gql">
 
     <objMeta>/nop/batch/model/NopBatchRecordResult/NopBatchRecordResult.xmeta</objMeta>
 
@@ -80,7 +80,7 @@
     <pages>
         <crud name="main" grid="list" asideFilterForm="asideFilter" filterForm="query" x:abstract="true">
             <table autoFillHeight="true">
-                <api url="@query:NopBatchRecordResult__findPage/{@pageSelection}"/>
+                <api url="@query:NopBatchRecordResult__findPage" gql:selection="{@pageSelection}"/>
             </table>
             <listActions>
                 <action id="batch-delete-button" label="@i18n:common.batchDelete" batch="true">
@@ -115,17 +115,17 @@
         </crud>
         <picker name="picker" grid="pick-list" asideFilterForm="asideFilter" filterForm="query" x:abstract="true">
             <table>
-                <api url="@query:NopBatchRecordResult__findPage/{@pageSelection}"/>
+                <api url="@query:NopBatchRecordResult__findPage" gql:selection="{@pageSelection}"/>
             </table>
         </picker>
         <simple name="add" form="add">
             <api url="@mutation:NopBatchRecordResult__save/id"/>
         </simple>
         <simple name="view" form="view">
-            <initApi url="@query:NopBatchRecordResult__get/{@formSelection}?id=$id"/>
+            <initApi url="@query:NopBatchRecordResult__get?id=$id" gql:selection="{@formSelection}"/>
         </simple>
         <simple name="update" form="edit">
-            <initApi url="@query:NopBatchRecordResult__get/{@formSelection}?id=$id"/>
+            <initApi url="@query:NopBatchRecordResult__get?id=$id" gql:selection="{@formSelection}"/>
             <api url="@mutation:NopBatchRecordResult__update/id?id=$id" withFormData="true"/>
         </simple>
     </pages>
diff --git a/nop-batch/nop-batch-web/src/main/resources/_vfs/nop/batch/pages/NopBatchTask/_gen/_NopBatchTask.view.xml b/nop-batch/nop-batch-web/src/main/resources/_vfs/nop/batch/pages/NopBatchTask/_gen/_NopBatchTask.view.xml
index dda04b694..c2dd22756 100644
--- a/nop-batch/nop-batch-web/src/main/resources/_vfs/nop/batch/pages/NopBatchTask/_gen/_NopBatchTask.view.xml
+++ b/nop-batch/nop-batch-web/src/main/resources/_vfs/nop/batch/pages/NopBatchTask/_gen/_NopBatchTask.view.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <view x:schema="/nop/schema/xui/xview.xdef" bizObjName="NopBatchTask" xmlns:i18n-en="i18n-en"
-      xmlns:x="/nop/schema/xdsl.xdef" xmlns:j="j">
+      xmlns:x="/nop/schema/xdsl.xdef" xmlns:j="j" xmlns:gql="gql">
 
     <objMeta>/nop/batch/model/NopBatchTask/NopBatchTask.xmeta</objMeta>
 
@@ -132,7 +132,7 @@
     <pages>
         <crud name="main" grid="list" asideFilterForm="asideFilter" filterForm="query" x:abstract="true">
             <table autoFillHeight="true">
-                <api url="@query:NopBatchTask__findPage/{@pageSelection}"/>
+                <api url="@query:NopBatchTask__findPage" gql:selection="{@pageSelection}"/>
             </table>
             <listActions>
                 <action id="batch-delete-button" label="@i18n:common.batchDelete" batch="true">
@@ -167,17 +167,17 @@
         </crud>
         <picker name="picker" grid="pick-list" asideFilterForm="asideFilter" filterForm="query" x:abstract="true">
             <table>
-                <api url="@query:NopBatchTask__findPage/{@pageSelection}"/>
+                <api url="@query:NopBatchTask__findPage" gql:selection="{@pageSelection}"/>
             </table>
         </picker>
         <simple name="add" form="add">
             <api url="@mutation:NopBatchTask__save/id"/>
         </simple>
         <simple name="view" form="view">
-            <initApi url="@query:NopBatchTask__get/{@formSelection}?id=$id"/>
+            <initApi url="@query:NopBatchTask__get?id=$id" gql:selection="{@formSelection}"/>
         </simple>
         <simple name="update" form="edit">
-            <initApi url="@query:NopBatchTask__get/{@formSelection}?id=$id"/>
+            <initApi url="@query:NopBatchTask__get?id=$id" gql:selection="{@formSelection}"/>
             <api url="@mutation:NopBatchTask__update/id?id=$id" withFormData="true"/>
         </simple>
     </pages>
diff --git a/nop-cli-core/src/main/resources/META-INF/native-image/io.github.entropy-cloud/nop-cli-core/reflect-config.json b/nop-cli-core/src/main/resources/META-INF/native-image/io.github.entropy-cloud/nop-cli-core/reflect-config.json
index dfd4bebb5..8081abdad 100644
--- a/nop-cli-core/src/main/resources/META-INF/native-image/io.github.entropy-cloud/nop-cli-core/reflect-config.json
+++ b/nop-cli-core/src/main/resources/META-INF/native-image/io.github.entropy-cloud/nop-cli-core/reflect-config.json
@@ -6067,6 +6067,10 @@
         "name": "getGeometryDataParameterBinder",
         "parameterTypes": []
       },
+      {
+        "name": "getGeometryTypeHandler",
+        "parameterTypes": []
+      },
       {
         "name": "getHexValueLiteral",
         "parameterTypes": [
@@ -6408,6 +6412,10 @@
         "name": "getGeometryDataParameterBinder",
         "parameterTypes": []
       },
+      {
+        "name": "getGeometryTypeHandler",
+        "parameterTypes": []
+      },
       {
         "name": "getHexValueLiteral",
         "parameterTypes": [
@@ -7256,6 +7264,10 @@
         "name": "getGeometryParameterBinder",
         "parameterTypes": []
       },
+      {
+        "name": "getGeometryTypeHandler",
+        "parameterTypes": []
+      },
       {
         "name": "getJdbcUrlPattern",
         "parameterTypes": []
@@ -7422,6 +7434,12 @@
           "java.lang.String"
         ]
       },
+      {
+        "name": "setGeometryTypeHandler",
+        "parameterTypes": [
+          "java.lang.String"
+        ]
+      },
       {
         "name": "setJdbcUrlPattern",
         "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
index 0473456ba..eefbed453 100644
--- a/nop-cli-core/src/main/resources/nop-vfs-index.txt
+++ b/nop-cli-core/src/main/resources/nop-vfs-index.txt
@@ -49,6 +49,7 @@
 /nop/dao/dialect/mssql.dialect.xml
 /nop/dao/dialect/mysql.dialect.xml
 /nop/dao/dialect/oracle.dialect.xml
+/nop/dao/dialect/postgis.dialect.xml
 /nop/dao/dialect/postgresql.dialect.xml
 /nop/dao/dialect/selector/db2.selector.yaml
 /nop/dao/dialect/selector/h2.selector.yaml
diff --git a/nop-codegen/src/main/resources/_vfs/nop/templates/orm-web/src/main/resources/_vfs/{moduleId}/pages/{metaInfo.forEntity}{metaInfo.baseObjName}/_gen/_{metaInfo.objName}.view.xml.xgen b/nop-codegen/src/main/resources/_vfs/nop/templates/orm-web/src/main/resources/_vfs/{moduleId}/pages/{metaInfo.forEntity}{metaInfo.baseObjName}/_gen/_{metaInfo.objName}.view.xml.xgen
index f90d87d7f..242ae8f8c 100644
--- a/nop-codegen/src/main/resources/_vfs/nop/templates/orm-web/src/main/resources/_vfs/{moduleId}/pages/{metaInfo.forEntity}{metaInfo.baseObjName}/_gen/_{metaInfo.objName}.view.xml.xgen
+++ b/nop-codegen/src/main/resources/_vfs/nop/templates/orm-web/src/main/resources/_vfs/{moduleId}/pages/{metaInfo.forEntity}{metaInfo.baseObjName}/_gen/_{metaInfo.objName}.view.xml.xgen
@@ -1,5 +1,5 @@
 <view x:schema="/nop/schema/xui/xview.xdef" bizObjName="${metaInfo.objName}"
-xmlns:i18n-en="i18n-en" xmlns:x="/nop/schema/xdsl.xdef" xmlns:j="j">
+xmlns:i18n-en="i18n-en" xmlns:x="/nop/schema/xdsl.xdef" xmlns:j="j" xmlns:gql="gql">
     <c:script>
       let objMeta = metaInfo.objMeta;
     </c:script>
@@ -88,7 +88,7 @@ xmlns:i18n-en="i18n-en" xmlns:x="/nop/schema/xdsl.xdef" xmlns:j="j">
             x:abstract="true">
 
             <table autoFillHeight="true" xpl:if="!childrenProp">
-                <api url="@query:${metaInfo.objName}__findPage/{@pageSelection}" />
+                <api url="@query:${metaInfo.objName}__findPage" gql:selection="{@pageSelection}" />
             </table>
 
 
@@ -96,7 +96,8 @@ xmlns:i18n-en="i18n-en" xmlns:x="/nop/schema/xdsl.xdef" xmlns:j="j">
                 <!--
                 在url中可以通过{@gql:listSelection}来引用后台根据grid配置生成的字段选择列表
                 -->
-                <api url="@query:${metaInfo.objName}__findList/{@listSelection}?filter_${parentProp}=__null"/>
+                <api url="@query:${metaInfo.objName}__findList?filter_${parentProp}=__null"
+                    gql:selection="{@listSelection}"/>
             </table>
 
             <listActions>
@@ -156,7 +157,7 @@ xmlns:i18n-en="i18n-en" xmlns:x="/nop/schema/xdsl.xdef" xmlns:j="j">
         <picker name="picker" grid="pick-list"  asideFilterForm="asideFilter"
             filterForm="query" x:abstract="true">
             <table>
-                <api url="@query:${metaInfo.objName}__findPage/{@pageSelection}"/>
+                <api url="@query:${metaInfo.objName}__findPage" gql:selection="{@pageSelection}"/>
             </table>
         </picker>
 
@@ -165,11 +166,11 @@ xmlns:i18n-en="i18n-en" xmlns:x="/nop/schema/xdsl.xdef" xmlns:j="j">
         </simple>
 
         <simple name="view" form="view">
-            <initApi url="@query:${metaInfo.objName}__get/{@formSelection}?id=$id" />
+            <initApi url="@query:${metaInfo.objName}__get?id=$id" gql:selection="{@formSelection}" />
         </simple>
 
         <simple name="update" form="edit" xpl:if="supportUpdate">
-            <initApi url="@query:${metaInfo.objName}__get/{@formSelection}?id=$id" />
+            <initApi url="@query:${metaInfo.objName}__get?id=$id" gql:selection="{@formSelection}"/>
             <api url="@mutation:${metaInfo.objName}__update/id?id=$id" withFormData="true" />
         </simple>
 
diff --git a/nop-demo/nop-quarkus-demo/src/main/resources/META-INF/native-image/io.nop.demo/nop-quarkus-demo/reflect-config.json b/nop-demo/nop-quarkus-demo/src/main/resources/META-INF/native-image/io.nop.demo/nop-quarkus-demo/reflect-config.json
index 147b49843..c049ab9e1 100644
--- a/nop-demo/nop-quarkus-demo/src/main/resources/META-INF/native-image/io.nop.demo/nop-quarkus-demo/reflect-config.json
+++ b/nop-demo/nop-quarkus-demo/src/main/resources/META-INF/native-image/io.nop.demo/nop-quarkus-demo/reflect-config.json
@@ -25822,6 +25822,30 @@
     "name": "io.nop.dao.api.AbstractSqlExecutor",
     "unsafeAllocated": false
   },
+  {
+    "allDeclaredConstructors": true,
+    "allDeclaredMethods": true,
+    "allPublicConstructors": true,
+    "allPublicMethods": true,
+    "fields": [],
+    "methods": [
+      {
+        "name": "orm_propValueByName",
+        "parameterTypes": [
+          "java.lang.String"
+        ]
+      },
+      {
+        "name": "orm_propValueByName",
+        "parameterTypes": [
+          "java.lang.String",
+          "java.lang.Object"
+        ]
+      }
+    ],
+    "name": "io.nop.dao.api.IDaoComponent",
+    "unsafeAllocated": false
+  },
   {
     "allDeclaredConstructors": true,
     "allDeclaredMethods": true,
@@ -32325,6 +32349,12 @@
         "parameterTypes": [
           "io.nop.graphql.core.schema.IGraphQLSchemaLoader"
         ]
+      },
+      {
+        "name": "subscribeGraphQL",
+        "parameterTypes": [
+          "io.nop.graphql.core.IGraphQLExecutionContext"
+        ]
       }
     ],
     "name": "io.nop.graphql.core.engine.GraphQLEngine",
@@ -35937,6 +35967,41 @@
     "name": "io.nop.ooxml.xlsx.imp.XlsxObjectLoader",
     "unsafeAllocated": false
   },
+  {
+    "allDeclaredConstructors": true,
+    "allDeclaredMethods": true,
+    "allPublicConstructors": true,
+    "allPublicMethods": true,
+    "fields": [],
+    "methods": [
+      {
+        "name": "bindToEntity",
+        "parameterTypes": [
+          "io.nop.orm.IOrmEntity",
+          "java.util.Map"
+        ]
+      },
+      {
+        "name": "flushToEntity",
+        "parameterTypes": []
+      },
+      {
+        "name": "orm_propValueByName",
+        "parameterTypes": [
+          "java.lang.String"
+        ]
+      },
+      {
+        "name": "orm_propValueByName",
+        "parameterTypes": [
+          "java.lang.String",
+          "java.lang.Object"
+        ]
+      }
+    ],
+    "name": "io.nop.orm.IOrmComponent",
+    "unsafeAllocated": false
+  },
   {
     "allDeclaredConstructors": true,
     "allDeclaredMethods": true,
@@ -36961,6 +37026,12 @@
           "io.nop.orm.IOrmEntity"
         ]
       },
+      {
+        "name": "deleteDirectly",
+        "parameterTypes": [
+          "io.nop.orm.IOrmEntity"
+        ]
+      },
       {
         "name": "detach",
         "parameterTypes": [
@@ -37070,6 +37141,12 @@
         "name": "getCacheProvider",
         "parameterTypes": []
       },
+      {
+        "name": "getDbEstimatedClock",
+        "parameterTypes": [
+          "java.lang.String"
+        ]
+      },
       {
         "name": "getDefaultRowMapper",
         "parameterTypes": []
@@ -37184,6 +37261,12 @@
           "io.nop.orm.IOrmEntity"
         ]
       },
+      {
+        "name": "saveDirectly",
+        "parameterTypes": [
+          "io.nop.orm.IOrmEntity"
+        ]
+      },
       {
         "name": "saveOrUpdate",
         "parameterTypes": [
@@ -37203,6 +37286,12 @@
       {
         "name": "unregisterSession",
         "parameterTypes": []
+      },
+      {
+        "name": "updateDirectly",
+        "parameterTypes": [
+          "io.nop.orm.IOrmEntity"
+        ]
       }
     ],
     "name": "io.nop.orm.impl.OrmTemplateImpl",
@@ -40851,6 +40940,58 @@
     "name": "io.nop.orm.sql_lib.proxy.SqlLibProxyFactoryBean",
     "unsafeAllocated": false
   },
+  {
+    "allDeclaredConstructors": true,
+    "allDeclaredMethods": true,
+    "allPublicConstructors": true,
+    "allPublicMethods": true,
+    "fields": [],
+    "methods": [
+      {
+        "name": "bindToEntity",
+        "parameterTypes": [
+          "io.nop.orm.IOrmEntity",
+          "java.util.Map"
+        ]
+      },
+      {
+        "name": "flushToEntity",
+        "parameterTypes": []
+      },
+      {
+        "name": "internalGetPropValue",
+        "parameterTypes": [
+          "java.lang.String"
+        ]
+      },
+      {
+        "name": "internalSetPropValue",
+        "parameterTypes": [
+          "java.lang.String",
+          "java.lang.Object"
+        ]
+      },
+      {
+        "name": "orm_owner",
+        "parameterTypes": []
+      },
+      {
+        "name": "orm_propValueByName",
+        "parameterTypes": [
+          "java.lang.String"
+        ]
+      },
+      {
+        "name": "orm_propValueByName",
+        "parameterTypes": [
+          "java.lang.String",
+          "java.lang.Object"
+        ]
+      }
+    ],
+    "name": "io.nop.orm.support.AbstractOrmComponent",
+    "unsafeAllocated": false
+  },
   {
     "allDeclaredConstructors": true,
     "allDeclaredMethods": true,
@@ -41341,6 +41482,108 @@
     "name": "io.nop.orm.support.DynamicOrmEntity",
     "unsafeAllocated": false
   },
+  {
+    "allDeclaredConstructors": true,
+    "allDeclaredMethods": true,
+    "allPublicConstructors": true,
+    "allPublicMethods": true,
+    "fields": [
+      {
+        "allowUnsafeAccess": false,
+        "allowWrite": false,
+        "name": "NOT_INITED"
+      },
+      {
+        "allowUnsafeAccess": false,
+        "allowWrite": false,
+        "name": "PROP_NAME__jsonText"
+      }
+    ],
+    "methods": [
+      {
+        "name": "flushToEntity",
+        "parameterTypes": []
+      },
+      {
+        "name": "getStringList",
+        "parameterTypes": []
+      },
+      {
+        "name": "getValue",
+        "parameterTypes": [
+          "java.lang.String"
+        ]
+      },
+      {
+        "name": "get_jsonText",
+        "parameterTypes": []
+      },
+      {
+        "name": "get_jsonValue",
+        "parameterTypes": []
+      },
+      {
+        "name": "isJsonList",
+        "parameterTypes": []
+      },
+      {
+        "name": "prop_get",
+        "parameterTypes": [
+          "java.lang.String"
+        ]
+      },
+      {
+        "name": "prop_has",
+        "parameterTypes": [
+          "java.lang.String"
+        ]
+      },
+      {
+        "name": "prop_names",
+        "parameterTypes": []
+      },
+      {
+        "name": "prop_set",
+        "parameterTypes": [
+          "java.lang.String",
+          "java.lang.Object"
+        ]
+      },
+      {
+        "name": "serializeToJson",
+        "parameterTypes": [
+          "io.nop.core.lang.json.IJsonHandler"
+        ]
+      },
+      {
+        "name": "setStringList",
+        "parameterTypes": [
+          "java.util.List"
+        ]
+      },
+      {
+        "name": "setValue",
+        "parameterTypes": [
+          "java.lang.String",
+          "java.lang.Object"
+        ]
+      },
+      {
+        "name": "set_jsonText",
+        "parameterTypes": [
+          "java.lang.String"
+        ]
+      },
+      {
+        "name": "set_jsonValue",
+        "parameterTypes": [
+          "java.lang.Object"
+        ]
+      }
+    ],
+    "name": "io.nop.orm.support.JsonOrmComponent",
+    "unsafeAllocated": false
+  },
   {
     "allDeclaredConstructors": true,
     "allDeclaredMethods": true,
@@ -46058,6 +46301,16 @@
     "name": "io.nop.sys.dao.dict.SysDictLoader",
     "unsafeAllocated": false
   },
+  {
+    "allDeclaredConstructors": true,
+    "allDeclaredMethods": true,
+    "allPublicConstructors": true,
+    "allPublicMethods": true,
+    "fields": [],
+    "methods": [],
+    "name": "io.nop.sys.dao.entity.NopSysClusterLeader",
+    "unsafeAllocated": false
+  },
   {
     "allDeclaredConstructors": true,
     "allDeclaredMethods": true,
@@ -46118,6 +46371,21 @@
     "name": "io.nop.sys.dao.entity.NopSysI18n",
     "unsafeAllocated": false
   },
+  {
+    "allDeclaredConstructors": true,
+    "allDeclaredMethods": true,
+    "allPublicConstructors": true,
+    "allPublicMethods": true,
+    "fields": [],
+    "methods": [
+      {
+        "name": "newPk",
+        "parameterTypes": []
+      }
+    ],
+    "name": "io.nop.sys.dao.entity.NopSysLock",
+    "unsafeAllocated": false
+  },
   {
     "allDeclaredConstructors": true,
     "allDeclaredMethods": true,
@@ -46196,62 +46464,282 @@
       {
         "allowUnsafeAccess": false,
         "allowWrite": false,
-        "name": "PROP_ID_codePattern"
+        "name": "PROP_ID_appId"
       },
       {
         "allowUnsafeAccess": false,
         "allowWrite": false,
-        "name": "PROP_ID_createTime"
+        "name": "PROP_ID_clusterId"
       },
       {
         "allowUnsafeAccess": false,
         "allowWrite": false,
-        "name": "PROP_ID_createdBy"
+        "name": "PROP_ID_electTime"
       },
       {
         "allowUnsafeAccess": false,
         "allowWrite": false,
-        "name": "PROP_ID_delFlag"
+        "name": "PROP_ID_expireAt"
       },
       {
         "allowUnsafeAccess": false,
         "allowWrite": false,
-        "name": "PROP_ID_displayName"
+        "name": "PROP_ID_leaderAdder"
       },
       {
         "allowUnsafeAccess": false,
         "allowWrite": false,
-        "name": "PROP_ID_name"
+        "name": "PROP_ID_leaderEpoch"
       },
       {
         "allowUnsafeAccess": false,
         "allowWrite": false,
-        "name": "PROP_ID_remark"
+        "name": "PROP_ID_leaderId"
       },
       {
         "allowUnsafeAccess": false,
         "allowWrite": false,
-        "name": "PROP_ID_seqName"
+        "name": "PROP_NAME_appId"
       },
       {
         "allowUnsafeAccess": false,
         "allowWrite": false,
-        "name": "PROP_ID_sid"
+        "name": "PROP_NAME_clusterId"
       },
       {
         "allowUnsafeAccess": false,
         "allowWrite": false,
-        "name": "PROP_ID_updateTime"
+        "name": "PROP_NAME_electTime"
       },
       {
         "allowUnsafeAccess": false,
         "allowWrite": false,
-        "name": "PROP_ID_updatedBy"
+        "name": "PROP_NAME_expireAt"
       },
       {
         "allowUnsafeAccess": false,
         "allowWrite": false,
-        "name": "PROP_ID_version"
+        "name": "PROP_NAME_leaderAdder"
+      },
+      {
+        "allowUnsafeAccess": false,
+        "allowWrite": false,
+        "name": "PROP_NAME_leaderEpoch"
+      },
+      {
+        "allowUnsafeAccess": false,
+        "allowWrite": false,
+        "name": "PROP_NAME_leaderId"
+      }
+    ],
+    "methods": [
+      {
+        "name": "cloneInstance",
+        "parameterTypes": []
+      },
+      {
+        "name": "getAppId",
+        "parameterTypes": []
+      },
+      {
+        "name": "getClusterId",
+        "parameterTypes": []
+      },
+      {
+        "name": "getElectTime",
+        "parameterTypes": []
+      },
+      {
+        "name": "getExpireAt",
+        "parameterTypes": []
+      },
+      {
+        "name": "getLeaderAdder",
+        "parameterTypes": []
+      },
+      {
+        "name": "getLeaderEpoch",
+        "parameterTypes": []
+      },
+      {
+        "name": "getLeaderId",
+        "parameterTypes": []
+      },
+      {
+        "name": "newInstance",
+        "parameterTypes": []
+      },
+      {
+        "name": "orm_entityName",
+        "parameterTypes": []
+      },
+      {
+        "name": "orm_id",
+        "parameterTypes": []
+      },
+      {
+        "name": "orm_internalSet",
+        "parameterTypes": [
+          "int",
+          "java.lang.Object"
+        ]
+      },
+      {
+        "name": "orm_isPrimary",
+        "parameterTypes": [
+          "int"
+        ]
+      },
+      {
+        "name": "orm_propId",
+        "parameterTypes": [
+          "java.lang.String"
+        ]
+      },
+      {
+        "name": "orm_propIdBound",
+        "parameterTypes": []
+      },
+      {
+        "name": "orm_propName",
+        "parameterTypes": [
+          "int"
+        ]
+      },
+      {
+        "name": "orm_propValue",
+        "parameterTypes": [
+          "int"
+        ]
+      },
+      {
+        "name": "orm_propValue",
+        "parameterTypes": [
+          "int",
+          "java.lang.Object"
+        ]
+      },
+      {
+        "name": "setAppId",
+        "parameterTypes": [
+          "java.lang.String"
+        ]
+      },
+      {
+        "name": "setClusterId",
+        "parameterTypes": [
+          "java.lang.String"
+        ]
+      },
+      {
+        "name": "setElectTime",
+        "parameterTypes": [
+          "java.sql.Timestamp"
+        ]
+      },
+      {
+        "name": "setExpireAt",
+        "parameterTypes": [
+          "java.sql.Timestamp"
+        ]
+      },
+      {
+        "name": "setLeaderAdder",
+        "parameterTypes": [
+          "java.lang.String"
+        ]
+      },
+      {
+        "name": "setLeaderEpoch",
+        "parameterTypes": [
+          "java.lang.Long"
+        ]
+      },
+      {
+        "name": "setLeaderId",
+        "parameterTypes": [
+          "java.lang.String"
+        ]
+      }
+    ],
+    "name": "io.nop.sys.dao.entity._gen._NopSysClusterLeader",
+    "unsafeAllocated": false
+  },
+  {
+    "allDeclaredConstructors": true,
+    "allDeclaredMethods": true,
+    "allPublicConstructors": true,
+    "allPublicMethods": true,
+    "fields": [
+      {
+        "allowUnsafeAccess": false,
+        "allowWrite": false,
+        "name": "PK_PROP_IDS"
+      },
+      {
+        "allowUnsafeAccess": false,
+        "allowWrite": false,
+        "name": "PK_PROP_NAMES"
+      },
+      {
+        "allowUnsafeAccess": false,
+        "allowWrite": false,
+        "name": "PROP_ID_codePattern"
+      },
+      {
+        "allowUnsafeAccess": false,
+        "allowWrite": false,
+        "name": "PROP_ID_createTime"
+      },
+      {
+        "allowUnsafeAccess": false,
+        "allowWrite": false,
+        "name": "PROP_ID_createdBy"
+      },
+      {
+        "allowUnsafeAccess": false,
+        "allowWrite": false,
+        "name": "PROP_ID_delFlag"
+      },
+      {
+        "allowUnsafeAccess": false,
+        "allowWrite": false,
+        "name": "PROP_ID_displayName"
+      },
+      {
+        "allowUnsafeAccess": false,
+        "allowWrite": false,
+        "name": "PROP_ID_name"
+      },
+      {
+        "allowUnsafeAccess": false,
+        "allowWrite": false,
+        "name": "PROP_ID_remark"
+      },
+      {
+        "allowUnsafeAccess": false,
+        "allowWrite": false,
+        "name": "PROP_ID_seqName"
+      },
+      {
+        "allowUnsafeAccess": false,
+        "allowWrite": false,
+        "name": "PROP_ID_sid"
+      },
+      {
+        "allowUnsafeAccess": false,
+        "allowWrite": false,
+        "name": "PROP_ID_updateTime"
+      },
+      {
+        "allowUnsafeAccess": false,
+        "allowWrite": false,
+        "name": "PROP_ID_updatedBy"
+      },
+      {
+        "allowUnsafeAccess": false,
+        "allowWrite": false,
+        "name": "PROP_ID_version"
       },
       {
         "allowUnsafeAccess": false,
@@ -47821,6 +48309,246 @@
     "name": "io.nop.sys.dao.entity._gen._NopSysI18n",
     "unsafeAllocated": false
   },
+  {
+    "allDeclaredConstructors": true,
+    "allDeclaredMethods": true,
+    "allPublicConstructors": true,
+    "allPublicMethods": true,
+    "fields": [
+      {
+        "allowUnsafeAccess": false,
+        "allowWrite": false,
+        "name": "PK_PROP_IDS"
+      },
+      {
+        "allowUnsafeAccess": false,
+        "allowWrite": false,
+        "name": "PK_PROP_NAMES"
+      },
+      {
+        "allowUnsafeAccess": false,
+        "allowWrite": false,
+        "name": "PROP_ID_appId"
+      },
+      {
+        "allowUnsafeAccess": false,
+        "allowWrite": false,
+        "name": "PROP_ID_expireAt"
+      },
+      {
+        "allowUnsafeAccess": false,
+        "allowWrite": false,
+        "name": "PROP_ID_holderAdder"
+      },
+      {
+        "allowUnsafeAccess": false,
+        "allowWrite": false,
+        "name": "PROP_ID_holderId"
+      },
+      {
+        "allowUnsafeAccess": false,
+        "allowWrite": false,
+        "name": "PROP_ID_lockGroup"
+      },
+      {
+        "allowUnsafeAccess": false,
+        "allowWrite": false,
+        "name": "PROP_ID_lockName"
+      },
+      {
+        "allowUnsafeAccess": false,
+        "allowWrite": false,
+        "name": "PROP_ID_lockReason"
+      },
+      {
+        "allowUnsafeAccess": false,
+        "allowWrite": false,
+        "name": "PROP_ID_lockTime"
+      },
+      {
+        "allowUnsafeAccess": false,
+        "allowWrite": false,
+        "name": "PROP_NAME_appId"
+      },
+      {
+        "allowUnsafeAccess": false,
+        "allowWrite": false,
+        "name": "PROP_NAME_expireAt"
+      },
+      {
+        "allowUnsafeAccess": false,
+        "allowWrite": false,
+        "name": "PROP_NAME_holderAdder"
+      },
+      {
+        "allowUnsafeAccess": false,
+        "allowWrite": false,
+        "name": "PROP_NAME_holderId"
+      },
+      {
+        "allowUnsafeAccess": false,
+        "allowWrite": false,
+        "name": "PROP_NAME_lockGroup"
+      },
+      {
+        "allowUnsafeAccess": false,
+        "allowWrite": false,
+        "name": "PROP_NAME_lockName"
+      },
+      {
+        "allowUnsafeAccess": false,
+        "allowWrite": false,
+        "name": "PROP_NAME_lockReason"
+      },
+      {
+        "allowUnsafeAccess": false,
+        "allowWrite": false,
+        "name": "PROP_NAME_lockTime"
+      }
+    ],
+    "methods": [
+      {
+        "name": "cloneInstance",
+        "parameterTypes": []
+      },
+      {
+        "name": "getAppId",
+        "parameterTypes": []
+      },
+      {
+        "name": "getExpireAt",
+        "parameterTypes": []
+      },
+      {
+        "name": "getHolderAdder",
+        "parameterTypes": []
+      },
+      {
+        "name": "getHolderId",
+        "parameterTypes": []
+      },
+      {
+        "name": "getLockGroup",
+        "parameterTypes": []
+      },
+      {
+        "name": "getLockName",
+        "parameterTypes": []
+      },
+      {
+        "name": "getLockReason",
+        "parameterTypes": []
+      },
+      {
+        "name": "getLockTime",
+        "parameterTypes": []
+      },
+      {
+        "name": "newInstance",
+        "parameterTypes": []
+      },
+      {
+        "name": "orm_entityName",
+        "parameterTypes": []
+      },
+      {
+        "name": "orm_id",
+        "parameterTypes": []
+      },
+      {
+        "name": "orm_internalSet",
+        "parameterTypes": [
+          "int",
+          "java.lang.Object"
+        ]
+      },
+      {
+        "name": "orm_isPrimary",
+        "parameterTypes": [
+          "int"
+        ]
+      },
+      {
+        "name": "orm_propId",
+        "parameterTypes": [
+          "java.lang.String"
+        ]
+      },
+      {
+        "name": "orm_propIdBound",
+        "parameterTypes": []
+      },
+      {
+        "name": "orm_propName",
+        "parameterTypes": [
+          "int"
+        ]
+      },
+      {
+        "name": "orm_propValue",
+        "parameterTypes": [
+          "int"
+        ]
+      },
+      {
+        "name": "orm_propValue",
+        "parameterTypes": [
+          "int",
+          "java.lang.Object"
+        ]
+      },
+      {
+        "name": "setAppId",
+        "parameterTypes": [
+          "java.lang.String"
+        ]
+      },
+      {
+        "name": "setExpireAt",
+        "parameterTypes": [
+          "java.sql.Timestamp"
+        ]
+      },
+      {
+        "name": "setHolderAdder",
+        "parameterTypes": [
+          "java.lang.String"
+        ]
+      },
+      {
+        "name": "setHolderId",
+        "parameterTypes": [
+          "java.lang.String"
+        ]
+      },
+      {
+        "name": "setLockGroup",
+        "parameterTypes": [
+          "java.lang.String"
+        ]
+      },
+      {
+        "name": "setLockName",
+        "parameterTypes": [
+          "java.lang.String"
+        ]
+      },
+      {
+        "name": "setLockReason",
+        "parameterTypes": [
+          "java.lang.String"
+        ]
+      },
+      {
+        "name": "setLockTime",
+        "parameterTypes": [
+          "java.sql.Timestamp"
+        ]
+      }
+    ],
+    "name": "io.nop.sys.dao.entity._gen._NopSysLock",
+    "unsafeAllocated": false
+  },
   {
     "allDeclaredConstructors": true,
     "allDeclaredMethods": true,
@@ -49740,6 +50468,16 @@
     "name": "io.nop.sys.dao.seq.SysSequenceGenerator",
     "unsafeAllocated": false
   },
+  {
+    "allDeclaredConstructors": true,
+    "allDeclaredMethods": true,
+    "allPublicConstructors": true,
+    "allPublicMethods": true,
+    "fields": [],
+    "methods": [],
+    "name": "io.nop.sys.service.entity.NopSysClusterLeaderBizModel",
+    "unsafeAllocated": false
+  },
   {
     "allDeclaredConstructors": true,
     "allDeclaredMethods": true,
@@ -49790,6 +50528,16 @@
     "name": "io.nop.sys.service.entity.NopSysI18nBizModel",
     "unsafeAllocated": false
   },
+  {
+    "allDeclaredConstructors": true,
+    "allDeclaredMethods": true,
+    "allPublicConstructors": true,
+    "allPublicMethods": true,
+    "fields": [],
+    "methods": [],
+    "name": "io.nop.sys.service.entity.NopSysLockBizModel",
+    "unsafeAllocated": false
+  },
   {
     "allDeclaredConstructors": true,
     "allDeclaredMethods": true,
@@ -56809,6 +57557,13 @@
       }
     ],
     "methods": [
+      {
+        "name": "appendFilterProps",
+        "parameterTypes": [
+          "java.lang.String",
+          "java.lang.Object"
+        ]
+      },
       {
         "name": "getControlTag",
         "parameterTypes": [
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
index ea8a1086d..4a13b0eee 100644
--- 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
@@ -304,10 +304,6 @@
 /nop/rule/model/NopRuleDefinition/NopRuleDefinition.xmeta
 /nop/rule/model/NopRuleDefinition/_NopRuleDefinition.xbiz
 /nop/rule/model/NopRuleDefinition/_NopRuleDefinition.xmeta
-/nop/rule/model/NopRuleInput/NopRuleInput.xbiz
-/nop/rule/model/NopRuleInput/NopRuleInput.xmeta
-/nop/rule/model/NopRuleInput/_NopRuleInput.xbiz
-/nop/rule/model/NopRuleInput/_NopRuleInput.xmeta
 /nop/rule/model/NopRuleLog/NopRuleLog.xbiz
 /nop/rule/model/NopRuleLog/NopRuleLog.xmeta
 /nop/rule/model/NopRuleLog/_NopRuleLog.xbiz
@@ -316,10 +312,6 @@
 /nop/rule/model/NopRuleNode/NopRuleNode.xmeta
 /nop/rule/model/NopRuleNode/_NopRuleNode.xbiz
 /nop/rule/model/NopRuleNode/_NopRuleNode.xmeta
-/nop/rule/model/NopRuleOutput/NopRuleOutput.xbiz
-/nop/rule/model/NopRuleOutput/NopRuleOutput.xmeta
-/nop/rule/model/NopRuleOutput/_NopRuleOutput.xbiz
-/nop/rule/model/NopRuleOutput/_NopRuleOutput.xmeta
 /nop/rule/model/NopRuleRole/NopRuleRole.xbiz
 /nop/rule/model/NopRuleRole/NopRuleRole.xmeta
 /nop/rule/model/NopRuleRole/_NopRuleRole.xbiz
@@ -337,11 +329,6 @@
 /nop/rule/pages/NopRuleDefinition/_gen/_NopRuleDefinition.view.xml
 /nop/rule/pages/NopRuleDefinition/main.page.yaml
 /nop/rule/pages/NopRuleDefinition/picker.page.yaml
-/nop/rule/pages/NopRuleInput/NopRuleInput.lib.xjs
-/nop/rule/pages/NopRuleInput/NopRuleInput.view.xml
-/nop/rule/pages/NopRuleInput/_gen/_NopRuleInput.view.xml
-/nop/rule/pages/NopRuleInput/main.page.yaml
-/nop/rule/pages/NopRuleInput/picker.page.yaml
 /nop/rule/pages/NopRuleLog/NopRuleLog.lib.xjs
 /nop/rule/pages/NopRuleLog/NopRuleLog.view.xml
 /nop/rule/pages/NopRuleLog/_gen/_NopRuleLog.view.xml
@@ -352,11 +339,7 @@
 /nop/rule/pages/NopRuleNode/_gen/_NopRuleNode.view.xml
 /nop/rule/pages/NopRuleNode/main.page.yaml
 /nop/rule/pages/NopRuleNode/picker.page.yaml
-/nop/rule/pages/NopRuleOutput/NopRuleOutput.lib.xjs
-/nop/rule/pages/NopRuleOutput/NopRuleOutput.view.xml
-/nop/rule/pages/NopRuleOutput/_gen/_NopRuleOutput.view.xml
-/nop/rule/pages/NopRuleOutput/main.page.yaml
-/nop/rule/pages/NopRuleOutput/picker.page.yaml
+/nop/rule/pages/NopRuleNode/ref-ruleDefinition.page.yaml
 /nop/rule/pages/NopRuleRole/NopRuleRole.lib.xjs
 /nop/rule/pages/NopRuleRole/NopRuleRole.view.xml
 /nop/rule/pages/NopRuleRole/_gen/_NopRuleRole.view.xml
@@ -429,6 +412,10 @@
 /nop/sys/beans/_service.beans.xml
 /nop/sys/beans/app-dao.beans.xml
 /nop/sys/beans/app-service.beans.xml
+/nop/sys/model/NopSysClusterLeader/NopSysClusterLeader.xbiz
+/nop/sys/model/NopSysClusterLeader/NopSysClusterLeader.xmeta
+/nop/sys/model/NopSysClusterLeader/_NopSysClusterLeader.xbiz
+/nop/sys/model/NopSysClusterLeader/_NopSysClusterLeader.xmeta
 /nop/sys/model/NopSysCodeRule/NopSysCodeRule.xbiz
 /nop/sys/model/NopSysCodeRule/NopSysCodeRule.xmeta
 /nop/sys/model/NopSysCodeRule/_NopSysCodeRule.xbiz
@@ -449,6 +436,10 @@
 /nop/sys/model/NopSysI18n/NopSysI18n.xmeta
 /nop/sys/model/NopSysI18n/_NopSysI18n.xbiz
 /nop/sys/model/NopSysI18n/_NopSysI18n.xmeta
+/nop/sys/model/NopSysLock/NopSysLock.xbiz
+/nop/sys/model/NopSysLock/NopSysLock.xmeta
+/nop/sys/model/NopSysLock/_NopSysLock.xbiz
+/nop/sys/model/NopSysLock/_NopSysLock.xmeta
 /nop/sys/model/NopSysMakerCheckerRecord/NopSysMakerCheckerRecord.xbiz
 /nop/sys/model/NopSysMakerCheckerRecord/NopSysMakerCheckerRecord.xmeta
 /nop/sys/model/NopSysMakerCheckerRecord/_NopSysMakerCheckerRecord.xbiz
@@ -471,6 +462,11 @@
 /nop/sys/model/NopSysVariable/_NopSysVariable.xmeta
 /nop/sys/orm/_app.orm.xml
 /nop/sys/orm/app.orm.xml
+/nop/sys/pages/NopSysClusterLeader/NopSysClusterLeader.lib.xjs
+/nop/sys/pages/NopSysClusterLeader/NopSysClusterLeader.view.xml
+/nop/sys/pages/NopSysClusterLeader/_gen/_NopSysClusterLeader.view.xml
+/nop/sys/pages/NopSysClusterLeader/main.page.yaml
+/nop/sys/pages/NopSysClusterLeader/picker.page.yaml
 /nop/sys/pages/NopSysCodeRule/NopSysCodeRule.lib.xjs
 /nop/sys/pages/NopSysCodeRule/NopSysCodeRule.view.xml
 /nop/sys/pages/NopSysCodeRule/_gen/_NopSysCodeRule.view.xml
@@ -497,6 +493,11 @@
 /nop/sys/pages/NopSysI18n/_gen/_NopSysI18n.view.xml
 /nop/sys/pages/NopSysI18n/main.page.yaml
 /nop/sys/pages/NopSysI18n/picker.page.yaml
+/nop/sys/pages/NopSysLock/NopSysLock.lib.xjs
+/nop/sys/pages/NopSysLock/NopSysLock.view.xml
+/nop/sys/pages/NopSysLock/_gen/_NopSysLock.view.xml
+/nop/sys/pages/NopSysLock/main.page.yaml
+/nop/sys/pages/NopSysLock/picker.page.yaml
 /nop/sys/pages/NopSysMakerCheckerRecord/NopSysMakerCheckerRecord.lib.xjs
 /nop/sys/pages/NopSysMakerCheckerRecord/NopSysMakerCheckerRecord.view.xml
 /nop/sys/pages/NopSysMakerCheckerRecord/_gen/_NopSysMakerCheckerRecord.view.xml
diff --git a/nop-excel/src/main/java/io/nop/excel/imp/model/_gen/_ImportFieldModel.java b/nop-excel/src/main/java/io/nop/excel/imp/model/_gen/_ImportFieldModel.java
index 6395f9ffc..00f696709 100644
--- a/nop-excel/src/main/java/io/nop/excel/imp/model/_gen/_ImportFieldModel.java
+++ b/nop-excel/src/main/java/io/nop/excel/imp/model/_gen/_ImportFieldModel.java
@@ -7,7 +7,7 @@
 
 // tell cpd to start ignoring code - CPD-OFF
 /**
- * generate from [59:18:0:0]/nop/schema/excel/imp.xdef <p>
+ * generate from [60:18:0:0]/nop/schema/excel/imp.xdef <p>
  * 
  */
 @SuppressWarnings({"PMD.UselessOverridingMethod","PMD.UnusedLocalVariable",
@@ -66,7 +66,7 @@ public abstract class _ImportFieldModel extends io.nop.core.resource.component.A
     /**
      *  
      * xml name: keyProp
-     * 
+     * 当list=true时，keyProp表示集合中每个对象采用这个属性作为唯一键。解析的得到的列表会使用KeyedList对象
      */
     private java.lang.String _keyProp ;
     
@@ -325,7 +325,7 @@ public void setIgnoreWhenEmpty(boolean value){
     /**
      * 
      * xml name: keyProp
-     *  
+     *  当list=true时，keyProp表示集合中每个对象采用这个属性作为唯一键。解析的得到的列表会使用KeyedList对象
      */
     
     public java.lang.String getKeyProp(){
diff --git a/nop-graphql/nop-graphql-core/src/main/java/io/nop/graphql/core/engine/GraphQLActionAuthChecker.java b/nop-graphql/nop-graphql-core/src/main/java/io/nop/graphql/core/engine/GraphQLActionAuthChecker.java
index 606eebc2c..36a6eb7a3 100644
--- a/nop-graphql/nop-graphql-core/src/main/java/io/nop/graphql/core/engine/GraphQLActionAuthChecker.java
+++ b/nop-graphql/nop-graphql-core/src/main/java/io/nop/graphql/core/engine/GraphQLActionAuthChecker.java
@@ -50,7 +50,7 @@ public void check(IGraphQLExecutionContext context) {
             if (subSelection == null)
                 continue;
 
-            checkAuth(objTypeName, selection, checker, context);
+            checkAuth(objTypeName, selection, checker, context, true);
 
             checkSelectionSet(selection.getSelectionSet(), subSelection, checker, userContext, context);
         }
@@ -74,14 +74,15 @@ void checkSelectionSet(GraphQLSelectionSet selectionSet, FieldSelectionBean sele
                 if (subSelection == null)
                     continue;
 
-                checkAuth(objTypeName, fieldSelection, checker, context);
+                checkAuth(objTypeName, fieldSelection, checker, context, false);
 
                 checkSelectionSet(fieldSelection.getSelectionSet(), subSelection, checker, userContext, context);
             }
         }
     }
 
-    void checkAuth(String objTypeName, GraphQLFieldSelection selection, IActionAuthChecker checker, IGraphQLExecutionContext context) {
+    void checkAuth(String objTypeName, GraphQLFieldSelection selection, IActionAuthChecker checker,
+                   IGraphQLExecutionContext context, boolean action) {
         GraphQLFieldDefinition field = selection.getFieldDefinition();
         ActionAuthMeta auth = field.getAuth();
         if (auth == null)
@@ -100,10 +101,18 @@ void checkAuth(String objTypeName, GraphQLFieldSelection selection, IActionAuthC
                 return;
         }
 
-        throw new NopException(AuthApiErrors.ERR_AUTH_NO_PERMISSION_FOR_FIELD)
-                .param(AuthApiErrors.ARG_FIELD_NAME, field.getName())
-                .param(ARG_PERMISSION, auth.getPermissions())
-                .param(ARG_ROLES, auth.getRoles())
-                .param(ARG_OBJ_TYPE_NAME, objTypeName);
+        if (action) {
+            throw new NopException(AuthApiErrors.ERR_AUTH_NO_PERMISSION)
+                    .param(AuthApiErrors.ARG_ACTION_NAME, field.getName())
+                    .param(ARG_PERMISSION, auth.getPermissions())
+                    .param(ARG_ROLES, auth.getRoles())
+                    .param(ARG_OBJ_TYPE_NAME, objTypeName);
+        } else {
+            throw new NopException(AuthApiErrors.ERR_AUTH_NO_PERMISSION_FOR_FIELD)
+                    .param(AuthApiErrors.ARG_FIELD_NAME, field.getName())
+                    .param(ARG_PERMISSION, auth.getPermissions())
+                    .param(ARG_ROLES, auth.getRoles())
+                    .param(ARG_OBJ_TYPE_NAME, objTypeName);
+        }
     }
 }
\ No newline at end of file
diff --git a/nop-report/nop-report-web/src/main/resources/_vfs/nop/report/pages/NopReportDataset/_gen/_NopReportDataset.view.xml b/nop-report/nop-report-web/src/main/resources/_vfs/nop/report/pages/NopReportDataset/_gen/_NopReportDataset.view.xml
index 1c88e7410..7dcd2cfca 100644
--- a/nop-report/nop-report-web/src/main/resources/_vfs/nop/report/pages/NopReportDataset/_gen/_NopReportDataset.view.xml
+++ b/nop-report/nop-report-web/src/main/resources/_vfs/nop/report/pages/NopReportDataset/_gen/_NopReportDataset.view.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <view x:schema="/nop/schema/xui/xview.xdef" bizObjName="NopReportDataset" xmlns:i18n-en="i18n-en"
-      xmlns:x="/nop/schema/xdsl.xdef" xmlns:j="j">
+      xmlns:x="/nop/schema/xdsl.xdef" xmlns:j="j" xmlns:gql="gql">
 
     <objMeta>/nop/report/model/NopReportDataset/NopReportDataset.xmeta</objMeta>
 
@@ -93,7 +93,7 @@
     <pages>
         <crud name="main" grid="list" asideFilterForm="asideFilter" filterForm="query" x:abstract="true">
             <table autoFillHeight="true">
-                <api url="@query:NopReportDataset__findPage/{@pageSelection}"/>
+                <api url="@query:NopReportDataset__findPage" gql:selection="{@pageSelection}"/>
             </table>
             <listActions>
                 <action id="batch-delete-button" label="@i18n:common.batchDelete" batch="true">
@@ -128,17 +128,17 @@
         </crud>
         <picker name="picker" grid="pick-list" asideFilterForm="asideFilter" filterForm="query" x:abstract="true">
             <table>
-                <api url="@query:NopReportDataset__findPage/{@pageSelection}"/>
+                <api url="@query:NopReportDataset__findPage" gql:selection="{@pageSelection}"/>
             </table>
         </picker>
         <simple name="add" form="add">
             <api url="@mutation:NopReportDataset__save/id"/>
         </simple>
         <simple name="view" form="view">
-            <initApi url="@query:NopReportDataset__get/{@formSelection}?id=$id"/>
+            <initApi url="@query:NopReportDataset__get?id=$id" gql:selection="{@formSelection}"/>
         </simple>
         <simple name="update" form="edit">
-            <initApi url="@query:NopReportDataset__get/{@formSelection}?id=$id"/>
+            <initApi url="@query:NopReportDataset__get?id=$id" gql:selection="{@formSelection}"/>
             <api url="@mutation:NopReportDataset__update/id?id=$id" withFormData="true"/>
         </simple>
     </pages>
diff --git a/nop-report/nop-report-web/src/main/resources/_vfs/nop/report/pages/NopReportDatasetAuth/_gen/_NopReportDatasetAuth.view.xml b/nop-report/nop-report-web/src/main/resources/_vfs/nop/report/pages/NopReportDatasetAuth/_gen/_NopReportDatasetAuth.view.xml
index 956c7bc00..d6540c994 100644
--- a/nop-report/nop-report-web/src/main/resources/_vfs/nop/report/pages/NopReportDatasetAuth/_gen/_NopReportDatasetAuth.view.xml
+++ b/nop-report/nop-report-web/src/main/resources/_vfs/nop/report/pages/NopReportDatasetAuth/_gen/_NopReportDatasetAuth.view.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <view x:schema="/nop/schema/xui/xview.xdef" bizObjName="NopReportDatasetAuth" xmlns:i18n-en="i18n-en"
-      xmlns:x="/nop/schema/xdsl.xdef" xmlns:j="j">
+      xmlns:x="/nop/schema/xdsl.xdef" xmlns:j="j" xmlns:gql="gql">
 
     <objMeta>/nop/report/model/NopReportDatasetAuth/NopReportDatasetAuth.xmeta</objMeta>
 
@@ -69,7 +69,7 @@
     <pages>
         <crud name="main" grid="list" asideFilterForm="asideFilter" filterForm="query" x:abstract="true">
             <table autoFillHeight="true">
-                <api url="@query:NopReportDatasetAuth__findPage/{@pageSelection}"/>
+                <api url="@query:NopReportDatasetAuth__findPage" gql:selection="{@pageSelection}"/>
             </table>
             <listActions>
                 <action id="batch-delete-button" label="@i18n:common.batchDelete" batch="true">
@@ -104,17 +104,17 @@
         </crud>
         <picker name="picker" grid="pick-list" asideFilterForm="asideFilter" filterForm="query" x:abstract="true">
             <table>
-                <api url="@query:NopReportDatasetAuth__findPage/{@pageSelection}"/>
+                <api url="@query:NopReportDatasetAuth__findPage" gql:selection="{@pageSelection}"/>
             </table>
         </picker>
         <simple name="add" form="add">
             <api url="@mutation:NopReportDatasetAuth__save/id"/>
         </simple>
         <simple name="view" form="view">
-            <initApi url="@query:NopReportDatasetAuth__get/{@formSelection}?id=$id"/>
+            <initApi url="@query:NopReportDatasetAuth__get?id=$id" gql:selection="{@formSelection}"/>
         </simple>
         <simple name="update" form="edit">
-            <initApi url="@query:NopReportDatasetAuth__get/{@formSelection}?id=$id"/>
+            <initApi url="@query:NopReportDatasetAuth__get?id=$id" gql:selection="{@formSelection}"/>
             <api url="@mutation:NopReportDatasetAuth__update/id?id=$id" withFormData="true"/>
         </simple>
     </pages>
diff --git a/nop-report/nop-report-web/src/main/resources/_vfs/nop/report/pages/NopReportDefinition/_gen/_NopReportDefinition.view.xml b/nop-report/nop-report-web/src/main/resources/_vfs/nop/report/pages/NopReportDefinition/_gen/_NopReportDefinition.view.xml
index 4c29abef0..bc96c0196 100644
--- a/nop-report/nop-report-web/src/main/resources/_vfs/nop/report/pages/NopReportDefinition/_gen/_NopReportDefinition.view.xml
+++ b/nop-report/nop-report-web/src/main/resources/_vfs/nop/report/pages/NopReportDefinition/_gen/_NopReportDefinition.view.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <view x:schema="/nop/schema/xui/xview.xdef" bizObjName="NopReportDefinition" xmlns:i18n-en="i18n-en"
-      xmlns:x="/nop/schema/xdsl.xdef" xmlns:j="j">
+      xmlns:x="/nop/schema/xdsl.xdef" xmlns:j="j" xmlns:gql="gql">
 
     <objMeta>/nop/report/model/NopReportDefinition/NopReportDefinition.xmeta</objMeta>
 
@@ -80,7 +80,7 @@
     <pages>
         <crud name="main" grid="list" asideFilterForm="asideFilter" filterForm="query" x:abstract="true">
             <table autoFillHeight="true">
-                <api url="@query:NopReportDefinition__findPage/{@pageSelection}"/>
+                <api url="@query:NopReportDefinition__findPage" gql:selection="{@pageSelection}"/>
             </table>
             <listActions>
                 <action id="batch-delete-button" label="@i18n:common.batchDelete" batch="true">
@@ -115,17 +115,17 @@
         </crud>
         <picker name="picker" grid="pick-list" asideFilterForm="asideFilter" filterForm="query" x:abstract="true">
             <table>
-                <api url="@query:NopReportDefinition__findPage/{@pageSelection}"/>
+                <api url="@query:NopReportDefinition__findPage" gql:selection="{@pageSelection}"/>
             </table>
         </picker>
         <simple name="add" form="add">
             <api url="@mutation:NopReportDefinition__save/id"/>
         </simple>
         <simple name="view" form="view">
-            <initApi url="@query:NopReportDefinition__get/{@formSelection}?id=$id"/>
+            <initApi url="@query:NopReportDefinition__get?id=$id" gql:selection="{@formSelection}"/>
         </simple>
         <simple name="update" form="edit">
-            <initApi url="@query:NopReportDefinition__get/{@formSelection}?id=$id"/>
+            <initApi url="@query:NopReportDefinition__get?id=$id" gql:selection="{@formSelection}"/>
             <api url="@mutation:NopReportDefinition__update/id?id=$id" withFormData="true"/>
         </simple>
     </pages>
diff --git a/nop-report/nop-report-web/src/main/resources/_vfs/nop/report/pages/NopReportResultFile/_gen/_NopReportResultFile.view.xml b/nop-report/nop-report-web/src/main/resources/_vfs/nop/report/pages/NopReportResultFile/_gen/_NopReportResultFile.view.xml
index a9deff744..f86756d1d 100644
--- a/nop-report/nop-report-web/src/main/resources/_vfs/nop/report/pages/NopReportResultFile/_gen/_NopReportResultFile.view.xml
+++ b/nop-report/nop-report-web/src/main/resources/_vfs/nop/report/pages/NopReportResultFile/_gen/_NopReportResultFile.view.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <view x:schema="/nop/schema/xui/xview.xdef" bizObjName="NopReportResultFile" xmlns:i18n-en="i18n-en"
-      xmlns:x="/nop/schema/xdsl.xdef" xmlns:j="j">
+      xmlns:x="/nop/schema/xdsl.xdef" xmlns:j="j" xmlns:gql="gql">
 
     <objMeta>/nop/report/model/NopReportResultFile/NopReportResultFile.xmeta</objMeta>
 
@@ -95,7 +95,7 @@
     <pages>
         <crud name="main" grid="list" asideFilterForm="asideFilter" filterForm="query" x:abstract="true">
             <table autoFillHeight="true">
-                <api url="@query:NopReportResultFile__findPage/{@pageSelection}"/>
+                <api url="@query:NopReportResultFile__findPage" gql:selection="{@pageSelection}"/>
             </table>
             <listActions>
                 <action id="batch-delete-button" label="@i18n:common.batchDelete" batch="true">
@@ -130,17 +130,17 @@
         </crud>
         <picker name="picker" grid="pick-list" asideFilterForm="asideFilter" filterForm="query" x:abstract="true">
             <table>
-                <api url="@query:NopReportResultFile__findPage/{@pageSelection}"/>
+                <api url="@query:NopReportResultFile__findPage" gql:selection="{@pageSelection}"/>
             </table>
         </picker>
         <simple name="add" form="add">
             <api url="@mutation:NopReportResultFile__save/id"/>
         </simple>
         <simple name="view" form="view">
-            <initApi url="@query:NopReportResultFile__get/{@formSelection}?id=$id"/>
+            <initApi url="@query:NopReportResultFile__get?id=$id" gql:selection="{@formSelection}"/>
         </simple>
         <simple name="update" form="edit">
-            <initApi url="@query:NopReportResultFile__get/{@formSelection}?id=$id"/>
+            <initApi url="@query:NopReportResultFile__get?id=$id" gql:selection="{@formSelection}"/>
             <api url="@mutation:NopReportResultFile__update/id?id=$id" withFormData="true"/>
         </simple>
     </pages>
diff --git a/nop-rule/nop-rule-service/src/main/java/io/nop/rule/service/entity/NopRuleInputBizModel.java b/nop-rule/nop-rule-service/src/main/java/io/nop/rule/service/entity/NopRuleInputBizModel.java
deleted file mode 100644
index 76c185fb8..000000000
--- a/nop-rule/nop-rule-service/src/main/java/io/nop/rule/service/entity/NopRuleInputBizModel.java
+++ /dev/null
@@ -1,14 +0,0 @@
-
-package io.nop.rule.service.entity;
-
-import io.nop.api.core.annotations.biz.BizModel;
-import io.nop.biz.crud.CrudBizModel;
-
-import io.nop.rule.dao.entity.NopRuleInput;
-
-@BizModel("NopRuleInput")
-public class NopRuleInputBizModel extends CrudBizModel<NopRuleInput>{
-    public NopRuleInputBizModel(){
-        setEntityName(NopRuleInput.class.getName());
-    }
-}
diff --git a/nop-rule/nop-rule-service/src/main/java/io/nop/rule/service/entity/NopRuleOutputBizModel.java b/nop-rule/nop-rule-service/src/main/java/io/nop/rule/service/entity/NopRuleOutputBizModel.java
deleted file mode 100644
index b761521e1..000000000
--- a/nop-rule/nop-rule-service/src/main/java/io/nop/rule/service/entity/NopRuleOutputBizModel.java
+++ /dev/null
@@ -1,14 +0,0 @@
-
-package io.nop.rule.service.entity;
-
-import io.nop.api.core.annotations.biz.BizModel;
-import io.nop.biz.crud.CrudBizModel;
-
-import io.nop.rule.dao.entity.NopRuleOutput;
-
-@BizModel("NopRuleOutput")
-public class NopRuleOutputBizModel extends CrudBizModel<NopRuleOutput>{
-    public NopRuleOutputBizModel(){
-        setEntityName(NopRuleOutput.class.getName());
-    }
-}
diff --git a/nop-rule/nop-rule-service/src/main/resources/_vfs/i18n/en/_nop-rule.i18n.yaml b/nop-rule/nop-rule-service/src/main/resources/_vfs/i18n/en/_nop-rule.i18n.yaml
index 0ce59dc5b..036e5b1cb 100644
--- a/nop-rule/nop-rule-service/src/main/resources/_vfs/i18n/en/_nop-rule.i18n.yaml
+++ b/nop-rule/nop-rule-service/src/main/resources/_vfs/i18n/en/_nop-rule.i18n.yaml
@@ -1,10 +1,8 @@
 entity:
   label:
     NopRuleDefinition: Rule Definition
-    NopRuleInput: Rule Input Variable
     NopRuleLog: Rule Log
     NopRuleNode: Rule Node
-    NopRuleOutput: Rule Output Variable
     NopRuleRole: Rule Role
     RuleKeyBean: Rule Key
     RuleMetaBean: Rule Meta
@@ -30,25 +28,6 @@ prop:
       updateTime: Update Time
       remark: Remark
       ruleNodes: Rule Nodes
-    NopRuleInput:
-      sid: SID
-      ruleId: Rule ID
-      name: Name
-      isMandatory: Is Mandatory
-      isComputed: Is Computed
-      displayName: Display Name
-      defaultValue: Default Value
-      schema: Schema
-      description: Description
-      version: Version
-      createdBy: Created By
-      createTime: Create Time
-      updatedBy: Updated By
-      updateTime: Update Time
-      remark: Remark
-      ruleDefinition: Rule Definition
-      ruleDefinition.displayName: Rule Definition
-      schemaComponent: null
     NopRuleLog:
       sid: SID
       ruleId: RULE ID
@@ -81,25 +60,6 @@ prop:
       children: Children
       predicateComponent: null
       outputsComponent: null
-    NopRuleOutput:
-      sid: SID
-      ruleId: Rule ID
-      name: Name
-      isMandatory: Is Mandatory
-      aggMethod: Aggregate Method
-      displayName: Display Name
-      defaultValue: Default Value
-      schema: Schema
-      description: Description
-      version: Version
-      createdBy: Created By
-      createTime: Create Time
-      updatedBy: Updated By
-      updateTime: Update Time
-      remark: Remark
-      ruleDefinition: Rule Definition
-      ruleDefinition.displayName: Rule Definition
-      schemaComponent: null
     NopRuleRole:
       sid: SID
       ruleId: Rule ID
diff --git a/nop-rule/nop-rule-service/src/main/resources/_vfs/i18n/zh-CN/_nop-rule.i18n.yaml b/nop-rule/nop-rule-service/src/main/resources/_vfs/i18n/zh-CN/_nop-rule.i18n.yaml
index 75cf077bb..44324781e 100644
--- a/nop-rule/nop-rule-service/src/main/resources/_vfs/i18n/zh-CN/_nop-rule.i18n.yaml
+++ b/nop-rule/nop-rule-service/src/main/resources/_vfs/i18n/zh-CN/_nop-rule.i18n.yaml
@@ -1,10 +1,8 @@
 entity:
   label:
     NopRuleDefinition: 规则模型定义
-    NopRuleInput: 规则输入变量
     NopRuleLog: 规则执行日志
     NopRuleNode: 规则节点
-    NopRuleOutput: 规则输出变量
     NopRuleRole: 规则角色
     RuleKeyBean: 规则唯一标识
     RuleMetaBean: 规则元数据
@@ -30,25 +28,6 @@ prop:
       updateTime: 修改时间
       updatedBy: 修改人
       version: 数据版本
-    NopRuleInput:
-      createTime: 创建时间
-      createdBy: 创建人
-      defaultValue: 缺省值
-      description: 描述
-      displayName: 显示名称
-      isComputed: 自动计算
-      isMandatory: 非空
-      name: 名称
-      remark: 备注
-      ruleDefinition: 规则定义
-      ruleDefinition.displayName: 规则定义
-      ruleId: 规则ID
-      schema: 结构定义
-      schemaComponent: null
-      sid: 主键
-      updateTime: 修改时间
-      updatedBy: 修改人
-      version: 数据版本
     NopRuleLog:
       createTime: 创建时间
       createdBy: 创建人
@@ -81,25 +60,6 @@ prop:
       updateTime: 修改时间
       updatedBy: 修改人
       version: 数据版本
-    NopRuleOutput:
-      aggMethod: 汇总方式
-      createTime: 创建时间
-      createdBy: 创建人
-      defaultValue: 缺省值
-      description: 描述
-      displayName: 显示名称
-      isMandatory: 非空
-      name: 名称
-      remark: 备注
-      ruleDefinition: 规则定义
-      ruleDefinition.displayName: 规则定义
-      ruleId: 规则ID
-      schema: 结构定义
-      schemaComponent: null
-      sid: 主键
-      updateTime: 修改时间
-      updatedBy: 修改人
-      version: 数据版本
     NopRuleRole:
       createTime: 创建时间
       createdBy: 创建人
diff --git a/nop-rule/nop-rule-service/src/main/resources/_vfs/nop/rule/model/NopRuleInput/NopRuleInput.xbiz b/nop-rule/nop-rule-service/src/main/resources/_vfs/nop/rule/model/NopRuleInput/NopRuleInput.xbiz
deleted file mode 100644
index 314632814..000000000
--- a/nop-rule/nop-rule-service/src/main/resources/_vfs/nop/rule/model/NopRuleInput/NopRuleInput.xbiz
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<biz x:schema="/nop/schema/biz/xbiz.xdef" xmlns:x="/nop/schema/xdsl.xdef" x:extends="_NopRuleInput.xbiz">
-
-    <actions/>
-</biz>
\ No newline at end of file
diff --git a/nop-rule/nop-rule-service/src/main/resources/_vfs/nop/rule/model/NopRuleInput/NopRuleInput.xmeta b/nop-rule/nop-rule-service/src/main/resources/_vfs/nop/rule/model/NopRuleInput/NopRuleInput.xmeta
deleted file mode 100644
index bf078ddd6..000000000
--- a/nop-rule/nop-rule-service/src/main/resources/_vfs/nop/rule/model/NopRuleInput/NopRuleInput.xmeta
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<meta x:schema="/nop/schema/xmeta.xdef" xmlns:x="/nop/schema/xdsl.xdef" x:extends="_NopRuleInput.xmeta">
-
-    <props/>
-</meta>
\ No newline at end of file
diff --git a/nop-rule/nop-rule-service/src/main/resources/_vfs/nop/rule/model/NopRuleInput/_NopRuleInput.xbiz b/nop-rule/nop-rule-service/src/main/resources/_vfs/nop/rule/model/NopRuleInput/_NopRuleInput.xbiz
deleted file mode 100644
index 43f2df4a7..000000000
--- a/nop-rule/nop-rule-service/src/main/resources/_vfs/nop/rule/model/NopRuleInput/_NopRuleInput.xbiz
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<biz x:schema="/nop/schema/biz/xbiz.xdef" xmlns:x="/nop/schema/xdsl.xdef" xmlns:xpl="xpl" xmlns:biz-gen="biz-gen">
-
-    <x:post-extends>
-        <biz-gen:DefaultBizPostExtends xpl:lib="/nop/biz/xlib/biz-gen.xlib"/>
-    </x:post-extends>
-
-    <actions/>
-</biz>
\ No newline at end of file
diff --git a/nop-rule/nop-rule-service/src/main/resources/_vfs/nop/rule/model/NopRuleInput/_NopRuleInput.xmeta b/nop-rule/nop-rule-service/src/main/resources/_vfs/nop/rule/model/NopRuleInput/_NopRuleInput.xmeta
deleted file mode 100644
index a83ae5cc8..000000000
--- a/nop-rule/nop-rule-service/src/main/resources/_vfs/nop/rule/model/NopRuleInput/_NopRuleInput.xmeta
+++ /dev/null
@@ -1,94 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<meta x:schema="/nop/schema/xmeta.xdef" xmlns:x="/nop/schema/xdsl.xdef" xmlns:i18n-en="i18n-en" xmlns:ext="ext"
-      xmlns:xpl="xpl" xmlns:biz-gen="biz-gen" ext:model="orm" xmlns:c="c" xmlns:graphql="graphql" displayName="规则输入变量"
-      i18n-en:displayName="Rule Input Variable">
-
-    <entityName>io.nop.rule.dao.entity.NopRuleInput</entityName>
-
-    <primaryKey>sid</primaryKey>
-
-    <displayProp>name</displayProp>
-
-    <x:post-extends>
-        <biz-gen:DefaultMetaPostExtends xpl:lib="/nop/biz/xlib/biz-gen.xlib"/>
-    </x:post-extends>
-
-    <keys/>
-
-    <props>
-        <prop name="sid" displayName="主键" i18n-en:displayName="SID" tagSet="seq" mandatory="true" queryable="true"
-              sortable="true" insertable="true" updatable="false" internal="true" ext:show="X">
-            <schema type="java.lang.String" precision="32"/>
-        </prop>
-        <prop name="ruleId" displayName="规则ID" i18n-en:displayName="Rule ID" mandatory="true" queryable="true"
-              sortable="true" insertable="true" updatable="true" ext:relation="ruleDefinition">
-            <schema type="java.lang.String" precision="32"/>
-        </prop>
-        <prop name="name" displayName="名称" i18n-en:displayName="Name" tagSet="disp" mandatory="true" queryable="true"
-              sortable="true" insertable="true" updatable="true">
-            <schema type="java.lang.String" precision="50"/>
-        </prop>
-        <prop name="isMandatory" displayName="非空" i18n-en:displayName="Is Mandatory" mandatory="true" queryable="true"
-              sortable="true" insertable="true" updatable="true">
-            <schema type="java.lang.Boolean"/>
-        </prop>
-        <prop name="isComputed" displayName="自动计算" i18n-en:displayName="Is Computed" mandatory="true" queryable="true"
-              sortable="true" insertable="true" updatable="true">
-            <schema type="java.lang.Boolean"/>
-        </prop>
-        <prop name="displayName" displayName="显示名称" i18n-en:displayName="Display Name" mandatory="true" queryable="true"
-              sortable="true" insertable="true" updatable="true">
-            <schema type="java.lang.String" precision="200"/>
-        </prop>
-        <prop name="defaultValue" displayName="缺省值" i18n-en:displayName="Default Value" queryable="true" sortable="true"
-              insertable="true" updatable="true">
-            <schema type="java.lang.String" precision="1000"/>
-        </prop>
-        <prop name="schema" displayName="结构定义" i18n-en:displayName="Schema" queryable="true" sortable="true"
-              insertable="true" updatable="true" graphql:jsonComponentProp="schemaComponent">
-            <schema stdDomain="json" domain="json-4k" type="java.lang.String" precision="4000"/>
-        </prop>
-        <prop name="description" displayName="描述" i18n-en:displayName="Description" queryable="true" sortable="true"
-              insertable="true" updatable="true">
-            <schema type="java.lang.String" precision="4000"/>
-        </prop>
-        <prop name="version" displayName="数据版本" i18n-en:displayName="Version" mandatory="true" queryable="true"
-              sortable="true" insertable="false" updatable="false" internal="true" ext:show="X">
-            <schema domain="version" type="java.lang.Integer"/>
-        </prop>
-        <prop name="createdBy" displayName="创建人" i18n-en:displayName="Created By" mandatory="true" queryable="true"
-              sortable="true" insertable="false" updatable="false">
-            <schema domain="createdBy" type="java.lang.String" precision="50"/>
-        </prop>
-        <prop name="createTime" displayName="创建时间" i18n-en:displayName="Create Time" mandatory="true" queryable="true"
-              sortable="true" insertable="false" updatable="false">
-            <schema domain="createTime" type="java.sql.Timestamp"/>
-        </prop>
-        <prop name="updatedBy" displayName="修改人" i18n-en:displayName="Updated By" mandatory="true" queryable="true"
-              sortable="true" insertable="false" updatable="false">
-            <schema domain="updatedBy" type="java.lang.String" precision="50"/>
-        </prop>
-        <prop name="updateTime" displayName="修改时间" i18n-en:displayName="Update Time" mandatory="true" queryable="true"
-              sortable="true" insertable="false" updatable="false">
-            <schema domain="updateTime" type="java.sql.Timestamp"/>
-        </prop>
-        <prop name="remark" displayName="备注" i18n-en:displayName="Remark" queryable="true" sortable="true"
-              insertable="true" updatable="true" ext:show="S">
-            <schema domain="remark" type="java.lang.String" precision="200"/>
-        </prop>
-        <prop name="ruleDefinition" displayName="规则定义" i18n-en:displayName="Rule Definition"
-              tagSet="pub,ref-pub,ref-cascade-delete,ref-insertable,ref-updatable" ext:kind="to-one" internal="true"
-              queryable="true" ext:joinLeftProp="ruleId" ext:joinRightProp="ruleId"
-              ext:joinRightDisplayProp="displayName" insertable="false" updatable="false" mandatory="true" lazy="true">
-            <schema type="io.nop.rule.dao.entity.NopRuleDefinition" bizObjName="NopRuleDefinition"/>
-        </prop>
-        <prop name="ruleDefinition.displayName" displayName="规则定义" i18n-en:displayName="Rule Definition" internal="true"
-              queryable="true" sortable="true" lazy="true">
-            <schema type="String"/>
-        </prop>
-        <prop name="schemaComponent" tagSet="json,pub" ext:kind="component" internal="true" insertable="true"
-              updatable="true" lazy="true">
-            <schema type="io.nop.orm.support.JsonOrmComponent"/>
-        </prop>
-    </props>
-</meta>
\ No newline at end of file
diff --git a/nop-rule/nop-rule-service/src/main/resources/_vfs/nop/rule/model/NopRuleOutput/NopRuleOutput.xbiz b/nop-rule/nop-rule-service/src/main/resources/_vfs/nop/rule/model/NopRuleOutput/NopRuleOutput.xbiz
deleted file mode 100644
index 80a6c595e..000000000
--- a/nop-rule/nop-rule-service/src/main/resources/_vfs/nop/rule/model/NopRuleOutput/NopRuleOutput.xbiz
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<biz x:schema="/nop/schema/biz/xbiz.xdef" xmlns:x="/nop/schema/xdsl.xdef" x:extends="_NopRuleOutput.xbiz">
-
-    <actions/>
-</biz>
\ No newline at end of file
diff --git a/nop-rule/nop-rule-service/src/main/resources/_vfs/nop/rule/model/NopRuleOutput/NopRuleOutput.xmeta b/nop-rule/nop-rule-service/src/main/resources/_vfs/nop/rule/model/NopRuleOutput/NopRuleOutput.xmeta
deleted file mode 100644
index 74a5bdbb4..000000000
--- a/nop-rule/nop-rule-service/src/main/resources/_vfs/nop/rule/model/NopRuleOutput/NopRuleOutput.xmeta
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<meta x:schema="/nop/schema/xmeta.xdef" xmlns:x="/nop/schema/xdsl.xdef" x:extends="_NopRuleOutput.xmeta">
-
-    <props/>
-</meta>
\ No newline at end of file
diff --git a/nop-rule/nop-rule-service/src/main/resources/_vfs/nop/rule/model/NopRuleOutput/_NopRuleOutput.xbiz b/nop-rule/nop-rule-service/src/main/resources/_vfs/nop/rule/model/NopRuleOutput/_NopRuleOutput.xbiz
deleted file mode 100644
index 43f2df4a7..000000000
--- a/nop-rule/nop-rule-service/src/main/resources/_vfs/nop/rule/model/NopRuleOutput/_NopRuleOutput.xbiz
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<biz x:schema="/nop/schema/biz/xbiz.xdef" xmlns:x="/nop/schema/xdsl.xdef" xmlns:xpl="xpl" xmlns:biz-gen="biz-gen">
-
-    <x:post-extends>
-        <biz-gen:DefaultBizPostExtends xpl:lib="/nop/biz/xlib/biz-gen.xlib"/>
-    </x:post-extends>
-
-    <actions/>
-</biz>
\ No newline at end of file
diff --git a/nop-rule/nop-rule-service/src/main/resources/_vfs/nop/rule/model/NopRuleOutput/_NopRuleOutput.xmeta b/nop-rule/nop-rule-service/src/main/resources/_vfs/nop/rule/model/NopRuleOutput/_NopRuleOutput.xmeta
deleted file mode 100644
index c97ad30c6..000000000
--- a/nop-rule/nop-rule-service/src/main/resources/_vfs/nop/rule/model/NopRuleOutput/_NopRuleOutput.xmeta
+++ /dev/null
@@ -1,94 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<meta x:schema="/nop/schema/xmeta.xdef" xmlns:x="/nop/schema/xdsl.xdef" xmlns:i18n-en="i18n-en" xmlns:ext="ext"
-      xmlns:xpl="xpl" xmlns:biz-gen="biz-gen" ext:model="orm" xmlns:c="c" xmlns:graphql="graphql" displayName="规则输出变量"
-      i18n-en:displayName="Rule Output Variable">
-
-    <entityName>io.nop.rule.dao.entity.NopRuleOutput</entityName>
-
-    <primaryKey>sid</primaryKey>
-
-    <displayProp>name</displayProp>
-
-    <x:post-extends>
-        <biz-gen:DefaultMetaPostExtends xpl:lib="/nop/biz/xlib/biz-gen.xlib"/>
-    </x:post-extends>
-
-    <keys/>
-
-    <props>
-        <prop name="sid" displayName="主键" i18n-en:displayName="SID" tagSet="seq" mandatory="true" queryable="true"
-              sortable="true" insertable="true" updatable="false" internal="true" ext:show="X">
-            <schema type="java.lang.String" precision="32"/>
-        </prop>
-        <prop name="ruleId" displayName="规则ID" i18n-en:displayName="Rule ID" mandatory="true" queryable="true"
-              sortable="true" insertable="true" updatable="true" ext:relation="ruleDefinition">
-            <schema type="java.lang.String" precision="32"/>
-        </prop>
-        <prop name="name" displayName="名称" i18n-en:displayName="Name" tagSet="disp" mandatory="true" queryable="true"
-              sortable="true" insertable="true" updatable="true">
-            <schema type="java.lang.String" precision="50"/>
-        </prop>
-        <prop name="isMandatory" displayName="非空" i18n-en:displayName="Is Mandatory" mandatory="true" queryable="true"
-              sortable="true" insertable="true" updatable="true">
-            <schema type="java.lang.Boolean"/>
-        </prop>
-        <prop name="aggMethod" displayName="汇总方式" i18n-en:displayName="Aggregate Method" mandatory="true"
-              queryable="true" sortable="true" insertable="true" updatable="true">
-            <schema type="java.lang.String" precision="10"/>
-        </prop>
-        <prop name="displayName" displayName="显示名称" i18n-en:displayName="Display Name" mandatory="true" queryable="true"
-              sortable="true" insertable="true" updatable="true">
-            <schema type="java.lang.String" precision="200"/>
-        </prop>
-        <prop name="defaultValue" displayName="缺省值" i18n-en:displayName="Default Value" queryable="true" sortable="true"
-              insertable="true" updatable="true">
-            <schema type="java.lang.String" precision="1000"/>
-        </prop>
-        <prop name="schema" displayName="结构定义" i18n-en:displayName="Schema" queryable="true" sortable="true"
-              insertable="true" updatable="true" graphql:jsonComponentProp="schemaComponent">
-            <schema stdDomain="json" domain="json-4k" type="java.lang.String" precision="4000"/>
-        </prop>
-        <prop name="description" displayName="描述" i18n-en:displayName="Description" queryable="true" sortable="true"
-              insertable="true" updatable="true">
-            <schema type="java.lang.String" precision="4000"/>
-        </prop>
-        <prop name="version" displayName="数据版本" i18n-en:displayName="Version" mandatory="true" queryable="true"
-              sortable="true" insertable="false" updatable="false" internal="true" ext:show="X">
-            <schema domain="version" type="java.lang.Integer"/>
-        </prop>
-        <prop name="createdBy" displayName="创建人" i18n-en:displayName="Created By" mandatory="true" queryable="true"
-              sortable="true" insertable="false" updatable="false">
-            <schema domain="createdBy" type="java.lang.String" precision="50"/>
-        </prop>
-        <prop name="createTime" displayName="创建时间" i18n-en:displayName="Create Time" mandatory="true" queryable="true"
-              sortable="true" insertable="false" updatable="false">
-            <schema domain="createTime" type="java.sql.Timestamp"/>
-        </prop>
-        <prop name="updatedBy" displayName="修改人" i18n-en:displayName="Updated By" mandatory="true" queryable="true"
-              sortable="true" insertable="false" updatable="false">
-            <schema domain="updatedBy" type="java.lang.String" precision="50"/>
-        </prop>
-        <prop name="updateTime" displayName="修改时间" i18n-en:displayName="Update Time" mandatory="true" queryable="true"
-              sortable="true" insertable="false" updatable="false">
-            <schema domain="updateTime" type="java.sql.Timestamp"/>
-        </prop>
-        <prop name="remark" displayName="备注" i18n-en:displayName="Remark" queryable="true" sortable="true"
-              insertable="true" updatable="true" ext:show="S">
-            <schema domain="remark" type="java.lang.String" precision="200"/>
-        </prop>
-        <prop name="ruleDefinition" displayName="规则定义" i18n-en:displayName="Rule Definition"
-              tagSet="pub,ref-pub,ref-cascade-delete,ref-insertable,ref-updatable" ext:kind="to-one" internal="true"
-              queryable="true" ext:joinLeftProp="ruleId" ext:joinRightProp="ruleId"
-              ext:joinRightDisplayProp="displayName" insertable="false" updatable="false" mandatory="true" lazy="true">
-            <schema type="io.nop.rule.dao.entity.NopRuleDefinition" bizObjName="NopRuleDefinition"/>
-        </prop>
-        <prop name="ruleDefinition.displayName" displayName="规则定义" i18n-en:displayName="Rule Definition" internal="true"
-              queryable="true" sortable="true" lazy="true">
-            <schema type="String"/>
-        </prop>
-        <prop name="schemaComponent" tagSet="json,pub" ext:kind="component" internal="true" insertable="true"
-              updatable="true" lazy="true">
-            <schema type="io.nop.orm.support.JsonOrmComponent"/>
-        </prop>
-    </props>
-</meta>
\ No newline at end of file
diff --git a/nop-rule/nop-rule-web/src/main/resources/_vfs/nop/rule/auth/_nop-rule.action-auth.xml b/nop-rule/nop-rule-web/src/main/resources/_vfs/nop/rule/auth/_nop-rule.action-auth.xml
index fb2570352..3c23d85ce 100644
--- a/nop-rule/nop-rule-web/src/main/resources/_vfs/nop/rule/auth/_nop-rule.action-auth.xml
+++ b/nop-rule/nop-rule-web/src/main/resources/_vfs/nop/rule/auth/_nop-rule.action-auth.xml
@@ -19,68 +19,40 @@
                         </resource>
                     </children>
                 </resource>
-                <resource id="NopRuleInput-main" displayName="规则输入变量" orderNo="10004"
-                          i18n-en:displayName="Rule Input Variable" icon="ant-design:appstore-twotone" component="AMIS"
-                          resourceType="SUBM" url="/nop/rule/pages/NopRuleInput/main.page.yaml">
-                    <children>
-                        <resource id="FNPT:NopRuleInput:query" displayName="查询规则输入变量" orderNo="10005"
-                                  resourceType="FNPT">
-                            <permissions>NopRuleInput:query</permissions>
-                        </resource>
-                        <resource id="FNPT:NopRuleInput:mutation" displayName="修改规则输入变量" orderNo="10006"
-                                  resourceType="FNPT">
-                            <permissions>NopRuleInput:mutation</permissions>
-                        </resource>
-                    </children>
-                </resource>
-                <resource id="NopRuleLog-main" displayName="规则执行日志" orderNo="10007" i18n-en:displayName="Rule Log"
+                <resource id="NopRuleLog-main" displayName="规则执行日志" orderNo="10004" i18n-en:displayName="Rule Log"
                           icon="ant-design:appstore-twotone" component="AMIS" resourceType="SUBM"
                           url="/nop/rule/pages/NopRuleLog/main.page.yaml">
                     <children>
-                        <resource id="FNPT:NopRuleLog:query" displayName="查询规则执行日志" orderNo="10008" resourceType="FNPT">
+                        <resource id="FNPT:NopRuleLog:query" displayName="查询规则执行日志" orderNo="10005" resourceType="FNPT">
                             <permissions>NopRuleLog:query</permissions>
                         </resource>
-                        <resource id="FNPT:NopRuleLog:mutation" displayName="修改规则执行日志" orderNo="10009"
+                        <resource id="FNPT:NopRuleLog:mutation" displayName="修改规则执行日志" orderNo="10006"
                                   resourceType="FNPT">
                             <permissions>NopRuleLog:mutation</permissions>
                         </resource>
                     </children>
                 </resource>
-                <resource id="NopRuleNode-main" displayName="规则节点" orderNo="10010" i18n-en:displayName="Rule Node"
+                <resource id="NopRuleNode-main" displayName="规则节点" orderNo="10007" i18n-en:displayName="Rule Node"
                           icon="ant-design:appstore-twotone" component="AMIS" resourceType="SUBM"
                           url="/nop/rule/pages/NopRuleNode/main.page.yaml">
                     <children>
-                        <resource id="FNPT:NopRuleNode:query" displayName="查询规则节点" orderNo="10011" resourceType="FNPT">
+                        <resource id="FNPT:NopRuleNode:query" displayName="查询规则节点" orderNo="10008" resourceType="FNPT">
                             <permissions>NopRuleNode:query</permissions>
                         </resource>
-                        <resource id="FNPT:NopRuleNode:mutation" displayName="修改规则节点" orderNo="10012"
+                        <resource id="FNPT:NopRuleNode:mutation" displayName="修改规则节点" orderNo="10009"
                                   resourceType="FNPT">
                             <permissions>NopRuleNode:mutation</permissions>
                         </resource>
                     </children>
                 </resource>
-                <resource id="NopRuleOutput-main" displayName="规则输出变量" orderNo="10013"
-                          i18n-en:displayName="Rule Output Variable" icon="ant-design:appstore-twotone" component="AMIS"
-                          resourceType="SUBM" url="/nop/rule/pages/NopRuleOutput/main.page.yaml">
-                    <children>
-                        <resource id="FNPT:NopRuleOutput:query" displayName="查询规则输出变量" orderNo="10014"
-                                  resourceType="FNPT">
-                            <permissions>NopRuleOutput:query</permissions>
-                        </resource>
-                        <resource id="FNPT:NopRuleOutput:mutation" displayName="修改规则输出变量" orderNo="10015"
-                                  resourceType="FNPT">
-                            <permissions>NopRuleOutput:mutation</permissions>
-                        </resource>
-                    </children>
-                </resource>
-                <resource id="NopRuleRole-main" displayName="规则角色" orderNo="10016" i18n-en:displayName="Rule Role"
+                <resource id="NopRuleRole-main" displayName="规则角色" orderNo="10010" i18n-en:displayName="Rule Role"
                           icon="ant-design:appstore-twotone" component="AMIS" resourceType="SUBM"
                           url="/nop/rule/pages/NopRuleRole/main.page.yaml">
                     <children>
-                        <resource id="FNPT:NopRuleRole:query" displayName="查询规则角色" orderNo="10017" resourceType="FNPT">
+                        <resource id="FNPT:NopRuleRole:query" displayName="查询规则角色" orderNo="10011" resourceType="FNPT">
                             <permissions>NopRuleRole:query</permissions>
                         </resource>
-                        <resource id="FNPT:NopRuleRole:mutation" displayName="修改规则角色" orderNo="10018"
+                        <resource id="FNPT:NopRuleRole:mutation" displayName="修改规则角色" orderNo="10012"
                                   resourceType="FNPT">
                             <permissions>NopRuleRole:mutation</permissions>
                         </resource>
diff --git a/nop-rule/nop-rule-web/src/main/resources/_vfs/nop/rule/pages/NopRuleDefinition/NopRuleDefinition.view.xml b/nop-rule/nop-rule-web/src/main/resources/_vfs/nop/rule/pages/NopRuleDefinition/NopRuleDefinition.view.xml
index 5bddd1af0..fa67cc8c3 100644
--- a/nop-rule/nop-rule-web/src/main/resources/_vfs/nop/rule/pages/NopRuleDefinition/NopRuleDefinition.view.xml
+++ b/nop-rule/nop-rule-web/src/main/resources/_vfs/nop/rule/pages/NopRuleDefinition/NopRuleDefinition.view.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<view x:extends="_gen/_NopRuleDefinition.view.xml" x:schema="/nop/schema/xui/xview.xdef" xmlns:x="/nop/schema/xdsl.xdef">
+<view x:extends="_gen/_NopRuleDefinition.view.xml" x:schema="/nop/schema/xui/xview.xdef"
+      xmlns:x="/nop/schema/xdsl.xdef">
 
     <grids>
         <grid id="list"/>
@@ -32,7 +33,23 @@
     </forms>
 
     <pages>
-        <crud name="main"/>
+        <crud name="main">
+            <rowActions>
+                <actionGroup id="row-more-button">
+                    <action id="row-edit-rule-nodes" label="@i18n:rule.ruleNodes|规则节点" actionType="drawer">
+                        <dialog page="/nop/rule/pages/NopRuleNode/ref-ruleDefinition.page.yaml" size="xl">
+                            <data>
+                                <ruleId>$ruleId</ruleId>
+                                <ruleDefinition>
+                                    <displayName>$displayName</displayName>
+                                </ruleDefinition>
+                            </data>
+                        </dialog>
+                    </action>
+                    <action id="row-update-button"/>
+                </actionGroup>
+            </rowActions>
+        </crud>
         <picker name="picker"/>
     </pages>
 </view>
\ No newline at end of file
diff --git a/nop-rule/nop-rule-web/src/main/resources/_vfs/nop/rule/pages/NopRuleDefinition/_gen/_NopRuleDefinition.view.xml b/nop-rule/nop-rule-web/src/main/resources/_vfs/nop/rule/pages/NopRuleDefinition/_gen/_NopRuleDefinition.view.xml
index 843cb6c68..6282812b9 100644
--- a/nop-rule/nop-rule-web/src/main/resources/_vfs/nop/rule/pages/NopRuleDefinition/_gen/_NopRuleDefinition.view.xml
+++ b/nop-rule/nop-rule-web/src/main/resources/_vfs/nop/rule/pages/NopRuleDefinition/_gen/_NopRuleDefinition.view.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <view x:schema="/nop/schema/xui/xview.xdef" bizObjName="NopRuleDefinition" xmlns:i18n-en="i18n-en"
-      xmlns:x="/nop/schema/xdsl.xdef" xmlns:j="j">
+      xmlns:x="/nop/schema/xdsl.xdef" xmlns:j="j" xmlns:gql="gql">
 
     <objMeta>/nop/rule/model/NopRuleDefinition/NopRuleDefinition.xmeta</objMeta>
 
@@ -94,7 +94,7 @@
     <pages>
         <crud name="main" grid="list" asideFilterForm="asideFilter" filterForm="query" x:abstract="true">
             <table autoFillHeight="true">
-                <api url="@query:NopRuleDefinition__findPage/{@pageSelection}"/>
+                <api url="@query:NopRuleDefinition__findPage" gql:selection="{@pageSelection}"/>
             </table>
             <listActions>
                 <action id="batch-delete-button" label="@i18n:common.batchDelete" batch="true">
@@ -129,17 +129,17 @@
         </crud>
         <picker name="picker" grid="pick-list" asideFilterForm="asideFilter" filterForm="query" x:abstract="true">
             <table>
-                <api url="@query:NopRuleDefinition__findPage/{@pageSelection}"/>
+                <api url="@query:NopRuleDefinition__findPage" gql:selection="{@pageSelection}"/>
             </table>
         </picker>
         <simple name="add" form="add">
             <api url="@mutation:NopRuleDefinition__save/id"/>
         </simple>
         <simple name="view" form="view">
-            <initApi url="@query:NopRuleDefinition__get/{@formSelection}?id=$id"/>
+            <initApi url="@query:NopRuleDefinition__get?id=$id" gql:selection="{@formSelection}"/>
         </simple>
         <simple name="update" form="edit">
-            <initApi url="@query:NopRuleDefinition__get/{@formSelection}?id=$id"/>
+            <initApi url="@query:NopRuleDefinition__get?id=$id" gql:selection="{@formSelection}"/>
             <api url="@mutation:NopRuleDefinition__update/id?id=$id" withFormData="true"/>
         </simple>
     </pages>
diff --git a/nop-rule/nop-rule-web/src/main/resources/_vfs/nop/rule/pages/NopRuleInput/NopRuleInput.lib.xjs b/nop-rule/nop-rule-web/src/main/resources/_vfs/nop/rule/pages/NopRuleInput/NopRuleInput.lib.xjs
deleted file mode 100644
index 6bb977c92..000000000
--- a/nop-rule/nop-rule-web/src/main/resources/_vfs/nop/rule/pages/NopRuleInput/NopRuleInput.lib.xjs
+++ /dev/null
@@ -1,10 +0,0 @@
-// x:gen-extends用于动态生成代码
-/* @x:gen-extends:
-*/
-
-/*
-// @action:name 触发这里的函数，options为ajax请求参数
-export function myAction(options, page,scoped){
-    return page.env.fetcher(options)
-}
-*/
\ No newline at end of file
diff --git a/nop-rule/nop-rule-web/src/main/resources/_vfs/nop/rule/pages/NopRuleInput/NopRuleInput.view.xml b/nop-rule/nop-rule-web/src/main/resources/_vfs/nop/rule/pages/NopRuleInput/NopRuleInput.view.xml
deleted file mode 100644
index 1ddac174c..000000000
--- a/nop-rule/nop-rule-web/src/main/resources/_vfs/nop/rule/pages/NopRuleInput/NopRuleInput.view.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<view x:extends="_gen/_NopRuleInput.view.xml" x:schema="/nop/schema/xui/xview.xdef" xmlns:x="/nop/schema/xdsl.xdef">
-
-    <grids>
-        <grid id="list"/>
-        <grid id="pick-list"/>
-    </grids>
-
-    <forms>
-        <form id="view"/>
-        <form id="edit"/>
-    </forms>
-
-    <pages>
-        <crud name="main"/>
-        <picker name="picker"/>
-    </pages>
-</view>
\ No newline at end of file
diff --git a/nop-rule/nop-rule-web/src/main/resources/_vfs/nop/rule/pages/NopRuleInput/_gen/_NopRuleInput.view.xml b/nop-rule/nop-rule-web/src/main/resources/_vfs/nop/rule/pages/NopRuleInput/_gen/_NopRuleInput.view.xml
deleted file mode 100644
index 651462f51..000000000
--- a/nop-rule/nop-rule-web/src/main/resources/_vfs/nop/rule/pages/NopRuleInput/_gen/_NopRuleInput.view.xml
+++ /dev/null
@@ -1,146 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<view x:schema="/nop/schema/xui/xview.xdef" bizObjName="NopRuleInput" xmlns:i18n-en="i18n-en"
-      xmlns:x="/nop/schema/xdsl.xdef" xmlns:j="j">
-
-    <objMeta>/nop/rule/model/NopRuleInput/NopRuleInput.xmeta</objMeta>
-
-    <controlLib>/nop/web/xlib/control.xlib</controlLib>
-
-    <grids>
-        <grid id="list" x:abstract="true">
-            <cols>
-
-                <!--规则ID-->
-                <col id="ruleId" mandatory="true" sortable="true"/>
-
-                <!--名称-->
-                <col id="name" mandatory="true" sortable="true"/>
-
-                <!--非空-->
-                <col id="isMandatory" mandatory="true" sortable="true"/>
-
-                <!--自动计算-->
-                <col id="isComputed" mandatory="true" sortable="true"/>
-
-                <!--显示名称-->
-                <col id="displayName" mandatory="true" sortable="true"/>
-
-                <!--缺省值-->
-                <col id="defaultValue" sortable="true"/>
-
-                <!--结构定义-->
-                <col id="schema" sortable="true"/>
-
-                <!--描述-->
-                <col id="description" sortable="true"/>
-
-                <!--创建人-->
-                <col id="createdBy" mandatory="true" sortable="true"/>
-
-                <!--创建时间-->
-                <col id="createTime" mandatory="true" sortable="true"/>
-
-                <!--修改人-->
-                <col id="updatedBy" mandatory="true" sortable="true"/>
-
-                <!--修改时间-->
-                <col id="updateTime" mandatory="true" sortable="true"/>
-
-                <!--备注-->
-                <col id="remark" sortable="true"/>
-            </cols>
-        </grid>
-        <grid id="pick-list" x:prototype="list" x:abstract="true"/>
-    </grids>
-
-    <forms>
-        <form id="view" editMode="view" title="查看-规则输入变量" i18n-en:title="View Rule Input Variable">
-            <layout>
- ruleId[规则ID] name[名称]
- isMandatory[非空] isComputed[自动计算]
- displayName[显示名称] defaultValue[缺省值]
- schema[结构定义] description[描述]
- createdBy[创建人] createTime[创建时间]
- updatedBy[修改人] updateTime[修改时间]
- remark[备注] 
-</layout>
-        </form>
-        <form id="add" editMode="add" title="新增-规则输入变量" i18n-en:title="Add Rule Input Variable" x:prototype="edit"/>
-        <form id="edit" editMode="update" title="编辑-规则输入变量" i18n-en:title="Edit Rule Input Variable">
-            <layout>
- ruleId[规则ID]
- name[名称]
- isMandatory[非空]
- isComputed[自动计算]
- displayName[显示名称]
- defaultValue[缺省值]
- schema[结构定义]
- description[描述]
- remark[备注]
-</layout>
-        </form>
-        <form id="query" editMode="query" title="查询条件" i18n-en:title="Query Condition" x:abstract="true">
-            <layout/>
-        </form>
-        <form id="asideFilter" editMode="query" x:abstract="true" submitOnChange="true">
-            <layout/>
-        </form>
-        <form id="batchUpdate" editMode="update" x:abstract="true" title="修改-规则输入变量"
-              i18n-en:title="Update Rule Input Variable">
-            <layout/>
-        </form>
-    </forms>
-
-    <pages>
-        <crud name="main" grid="list" asideFilterForm="asideFilter" filterForm="query" x:abstract="true">
-            <table autoFillHeight="true">
-                <api url="@query:NopRuleInput__findPage/{@pageSelection}"/>
-            </table>
-            <listActions>
-                <action id="batch-delete-button" label="@i18n:common.batchDelete" batch="true">
-                    <api url="@mutation:NopRuleInput__batchDelete?ids=$ids"/>
-                    <confirmText>@i18n:common.confirmBatchDelete</confirmText>
-                </action>
-                <action id="add-button" level="primary" label="@i18n:common.add" icon="fa fa-plus pull-left">
-                    <dialog page="add"/>
-                </action>
-            </listActions>
-            <rowActions>
-                <action id="row-view-button" level="primary" label="@i18n:common.view">
-                    <dialog page="view"/>
-                </action>
-                <action id="row-update-button" level="primary" label="@i18n:common.edit" x:abstract="true">
-                    <dialog page="update"/>
-                </action>
-                <action id="row-delete-button" level="danger" label="@i18n:common.delete" x:abstract="true">
-                    <api url="@mutation:NopRuleInput__delete?id=$id"/>
-                    <confirmText>@i18n:common.confirmDelete</confirmText>
-                </action>
-                <actionGroup id="row-more-button" label="@i18n:common.more" level="primary">
-                    <action id="row-update-button" level="primary" label="@i18n:common.edit">
-                        <dialog page="update"/>
-                    </action>
-                    <action id="row-delete-button" level="danger" label="@i18n:common.delete">
-                        <api url="@mutation:NopRuleInput__delete?id=$id"/>
-                        <confirmText>@i18n:common.confirmDelete</confirmText>
-                    </action>
-                </actionGroup>
-            </rowActions>
-        </crud>
-        <picker name="picker" grid="pick-list" asideFilterForm="asideFilter" filterForm="query" x:abstract="true">
-            <table>
-                <api url="@query:NopRuleInput__findPage/{@pageSelection}"/>
-            </table>
-        </picker>
-        <simple name="add" form="add">
-            <api url="@mutation:NopRuleInput__save/id"/>
-        </simple>
-        <simple name="view" form="view">
-            <initApi url="@query:NopRuleInput__get/{@formSelection}?id=$id"/>
-        </simple>
-        <simple name="update" form="edit">
-            <initApi url="@query:NopRuleInput__get/{@formSelection}?id=$id"/>
-            <api url="@mutation:NopRuleInput__update/id?id=$id" withFormData="true"/>
-        </simple>
-    </pages>
-</view>
\ No newline at end of file
diff --git a/nop-rule/nop-rule-web/src/main/resources/_vfs/nop/rule/pages/NopRuleInput/main.page.yaml b/nop-rule/nop-rule-web/src/main/resources/_vfs/nop/rule/pages/NopRuleInput/main.page.yaml
deleted file mode 100644
index fb042d2bd..000000000
--- a/nop-rule/nop-rule-web/src/main/resources/_vfs/nop/rule/pages/NopRuleInput/main.page.yaml
+++ /dev/null
@@ -1,3 +0,0 @@
-
-x:gen-extends: |
-    <web:GenPage view="NopRuleInput.view.xml" page="main" xpl:lib="/nop/web/xlib/web.xlib" />
diff --git a/nop-rule/nop-rule-web/src/main/resources/_vfs/nop/rule/pages/NopRuleInput/picker.page.yaml b/nop-rule/nop-rule-web/src/main/resources/_vfs/nop/rule/pages/NopRuleInput/picker.page.yaml
deleted file mode 100644
index c160d0132..000000000
--- a/nop-rule/nop-rule-web/src/main/resources/_vfs/nop/rule/pages/NopRuleInput/picker.page.yaml
+++ /dev/null
@@ -1,3 +0,0 @@
-
-x:gen-extends: |
-    <web:GenPage view="NopRuleInput.view.xml" page="picker" xpl:lib="/nop/web/xlib/web.xlib" />
diff --git a/nop-rule/nop-rule-web/src/main/resources/_vfs/nop/rule/pages/NopRuleLog/_gen/_NopRuleLog.view.xml b/nop-rule/nop-rule-web/src/main/resources/_vfs/nop/rule/pages/NopRuleLog/_gen/_NopRuleLog.view.xml
index 2705b8ac1..4822157f1 100644
--- a/nop-rule/nop-rule-web/src/main/resources/_vfs/nop/rule/pages/NopRuleLog/_gen/_NopRuleLog.view.xml
+++ b/nop-rule/nop-rule-web/src/main/resources/_vfs/nop/rule/pages/NopRuleLog/_gen/_NopRuleLog.view.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <view x:schema="/nop/schema/xui/xview.xdef" bizObjName="NopRuleLog" xmlns:i18n-en="i18n-en"
-      xmlns:x="/nop/schema/xdsl.xdef" xmlns:j="j">
+      xmlns:x="/nop/schema/xdsl.xdef" xmlns:j="j" xmlns:gql="gql">
 
     <objMeta>/nop/rule/model/NopRuleLog/NopRuleLog.xmeta</objMeta>
 
@@ -54,7 +54,7 @@
     <pages>
         <crud name="main" grid="list" asideFilterForm="asideFilter" filterForm="query" x:abstract="true">
             <table autoFillHeight="true">
-                <api url="@query:NopRuleLog__findPage/{@pageSelection}"/>
+                <api url="@query:NopRuleLog__findPage" gql:selection="{@pageSelection}"/>
             </table>
             <listActions>
                 <action id="batch-delete-button" label="@i18n:common.batchDelete" batch="true">
@@ -86,11 +86,11 @@
         </crud>
         <picker name="picker" grid="pick-list" asideFilterForm="asideFilter" filterForm="query" x:abstract="true">
             <table>
-                <api url="@query:NopRuleLog__findPage/{@pageSelection}"/>
+                <api url="@query:NopRuleLog__findPage" gql:selection="{@pageSelection}"/>
             </table>
         </picker>
         <simple name="view" form="view">
-            <initApi url="@query:NopRuleLog__get/{@formSelection}?id=$id"/>
+            <initApi url="@query:NopRuleLog__get?id=$id" gql:selection="{@formSelection}"/>
         </simple>
     </pages>
 </view>
\ No newline at end of file
diff --git a/nop-rule/nop-rule-web/src/main/resources/_vfs/nop/rule/pages/NopRuleNode/NopRuleNode.view.xml b/nop-rule/nop-rule-web/src/main/resources/_vfs/nop/rule/pages/NopRuleNode/NopRuleNode.view.xml
index 2d95a4c4b..3257ed8ab 100644
--- a/nop-rule/nop-rule-web/src/main/resources/_vfs/nop/rule/pages/NopRuleNode/NopRuleNode.view.xml
+++ b/nop-rule/nop-rule-web/src/main/resources/_vfs/nop/rule/pages/NopRuleNode/NopRuleNode.view.xml
@@ -14,5 +14,11 @@
     <pages>
         <crud name="main"/>
         <picker name="picker"/>
+
+        <crud name="ref-ruleDefinition" x:prototype="main">
+            <table loadDataOnce="true">
+
+            </table>
+        </crud>
     </pages>
 </view>
\ No newline at end of file
diff --git a/nop-rule/nop-rule-web/src/main/resources/_vfs/nop/rule/pages/NopRuleNode/_gen/_NopRuleNode.view.xml b/nop-rule/nop-rule-web/src/main/resources/_vfs/nop/rule/pages/NopRuleNode/_gen/_NopRuleNode.view.xml
index 6bc33565c..a381ae88c 100644
--- a/nop-rule/nop-rule-web/src/main/resources/_vfs/nop/rule/pages/NopRuleNode/_gen/_NopRuleNode.view.xml
+++ b/nop-rule/nop-rule-web/src/main/resources/_vfs/nop/rule/pages/NopRuleNode/_gen/_NopRuleNode.view.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <view x:schema="/nop/schema/xui/xview.xdef" bizObjName="NopRuleNode" xmlns:i18n-en="i18n-en"
-      xmlns:x="/nop/schema/xdsl.xdef" xmlns:j="j">
+      xmlns:x="/nop/schema/xdsl.xdef" xmlns:j="j" xmlns:gql="gql">
 
     <objMeta>/nop/rule/model/NopRuleNode/NopRuleNode.xmeta</objMeta>
 
@@ -92,7 +92,7 @@
     <pages>
         <crud name="main" grid="tree-list" asideFilterForm="asideFilter" filterForm="query" x:abstract="true">
             <table loadDataOnce="true" sortable="false" pager="none">
-                <api url="@query:NopRuleNode__findList/{@listSelection}?filter_parentId=__null"/>
+                <api url="@query:NopRuleNode__findList?filter_parentId=__null" gql:selection="{@listSelection}"/>
             </table>
             <listActions>
                 <action id="batch-delete-button" label="@i18n:common.batchDelete" batch="true">
@@ -130,17 +130,17 @@
         </crud>
         <picker name="picker" grid="pick-list" asideFilterForm="asideFilter" filterForm="query" x:abstract="true">
             <table>
-                <api url="@query:NopRuleNode__findPage/{@pageSelection}"/>
+                <api url="@query:NopRuleNode__findPage" gql:selection="{@pageSelection}"/>
             </table>
         </picker>
         <simple name="add" form="add">
             <api url="@mutation:NopRuleNode__save/id"/>
         </simple>
         <simple name="view" form="view">
-            <initApi url="@query:NopRuleNode__get/{@formSelection}?id=$id"/>
+            <initApi url="@query:NopRuleNode__get?id=$id" gql:selection="{@formSelection}"/>
         </simple>
         <simple name="update" form="edit">
-            <initApi url="@query:NopRuleNode__get/{@formSelection}?id=$id"/>
+            <initApi url="@query:NopRuleNode__get?id=$id" gql:selection="{@formSelection}"/>
             <api url="@mutation:NopRuleNode__update/id?id=$id" withFormData="true"/>
         </simple>
         <simple name="add-child" form="add">
diff --git a/nop-rule/nop-rule-web/src/main/resources/_vfs/nop/rule/pages/NopRuleNode/ref-ruleDefinition.page.yaml b/nop-rule/nop-rule-web/src/main/resources/_vfs/nop/rule/pages/NopRuleNode/ref-ruleDefinition.page.yaml
new file mode 100644
index 000000000..386f491d1
--- /dev/null
+++ b/nop-rule/nop-rule-web/src/main/resources/_vfs/nop/rule/pages/NopRuleNode/ref-ruleDefinition.page.yaml
@@ -0,0 +1,3 @@
+
+x:gen-extends: |
+  <web:GenPage view="NopRuleNode.view.xml" page="main" fixedProps="ruleId" xpl:lib="/nop/web/xlib/web.xlib" />
diff --git a/nop-rule/nop-rule-web/src/main/resources/_vfs/nop/rule/pages/NopRuleOutput/NopRuleOutput.lib.xjs b/nop-rule/nop-rule-web/src/main/resources/_vfs/nop/rule/pages/NopRuleOutput/NopRuleOutput.lib.xjs
deleted file mode 100644
index 6bb977c92..000000000
--- a/nop-rule/nop-rule-web/src/main/resources/_vfs/nop/rule/pages/NopRuleOutput/NopRuleOutput.lib.xjs
+++ /dev/null
@@ -1,10 +0,0 @@
-// x:gen-extends用于动态生成代码
-/* @x:gen-extends:
-*/
-
-/*
-// @action:name 触发这里的函数，options为ajax请求参数
-export function myAction(options, page,scoped){
-    return page.env.fetcher(options)
-}
-*/
\ No newline at end of file
diff --git a/nop-rule/nop-rule-web/src/main/resources/_vfs/nop/rule/pages/NopRuleOutput/NopRuleOutput.view.xml b/nop-rule/nop-rule-web/src/main/resources/_vfs/nop/rule/pages/NopRuleOutput/NopRuleOutput.view.xml
deleted file mode 100644
index 038465b43..000000000
--- a/nop-rule/nop-rule-web/src/main/resources/_vfs/nop/rule/pages/NopRuleOutput/NopRuleOutput.view.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<view x:extends="_gen/_NopRuleOutput.view.xml" x:schema="/nop/schema/xui/xview.xdef" xmlns:x="/nop/schema/xdsl.xdef">
-
-    <grids>
-        <grid id="list"/>
-        <grid id="pick-list"/>
-    </grids>
-
-    <forms>
-        <form id="view"/>
-        <form id="edit"/>
-    </forms>
-
-    <pages>
-        <crud name="main"/>
-        <picker name="picker"/>
-    </pages>
-</view>
\ No newline at end of file
diff --git a/nop-rule/nop-rule-web/src/main/resources/_vfs/nop/rule/pages/NopRuleOutput/_gen/_NopRuleOutput.view.xml b/nop-rule/nop-rule-web/src/main/resources/_vfs/nop/rule/pages/NopRuleOutput/_gen/_NopRuleOutput.view.xml
deleted file mode 100644
index fb71b397a..000000000
--- a/nop-rule/nop-rule-web/src/main/resources/_vfs/nop/rule/pages/NopRuleOutput/_gen/_NopRuleOutput.view.xml
+++ /dev/null
@@ -1,146 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<view x:schema="/nop/schema/xui/xview.xdef" bizObjName="NopRuleOutput" xmlns:i18n-en="i18n-en"
-      xmlns:x="/nop/schema/xdsl.xdef" xmlns:j="j">
-
-    <objMeta>/nop/rule/model/NopRuleOutput/NopRuleOutput.xmeta</objMeta>
-
-    <controlLib>/nop/web/xlib/control.xlib</controlLib>
-
-    <grids>
-        <grid id="list" x:abstract="true">
-            <cols>
-
-                <!--规则ID-->
-                <col id="ruleId" mandatory="true" sortable="true"/>
-
-                <!--名称-->
-                <col id="name" mandatory="true" sortable="true"/>
-
-                <!--非空-->
-                <col id="isMandatory" mandatory="true" sortable="true"/>
-
-                <!--汇总方式-->
-                <col id="aggMethod" mandatory="true" sortable="true"/>
-
-                <!--显示名称-->
-                <col id="displayName" mandatory="true" sortable="true"/>
-
-                <!--缺省值-->
-                <col id="defaultValue" sortable="true"/>
-
-                <!--结构定义-->
-                <col id="schema" sortable="true"/>
-
-                <!--描述-->
-                <col id="description" sortable="true"/>
-
-                <!--创建人-->
-                <col id="createdBy" mandatory="true" sortable="true"/>
-
-                <!--创建时间-->
-                <col id="createTime" mandatory="true" sortable="true"/>
-
-                <!--修改人-->
-                <col id="updatedBy" mandatory="true" sortable="true"/>
-
-                <!--修改时间-->
-                <col id="updateTime" mandatory="true" sortable="true"/>
-
-                <!--备注-->
-                <col id="remark" sortable="true"/>
-            </cols>
-        </grid>
-        <grid id="pick-list" x:prototype="list" x:abstract="true"/>
-    </grids>
-
-    <forms>
-        <form id="view" editMode="view" title="查看-规则输出变量" i18n-en:title="View Rule Output Variable">
-            <layout>
- ruleId[规则ID] name[名称]
- isMandatory[非空] aggMethod[汇总方式]
- displayName[显示名称] defaultValue[缺省值]
- schema[结构定义] description[描述]
- createdBy[创建人] createTime[创建时间]
- updatedBy[修改人] updateTime[修改时间]
- remark[备注] 
-</layout>
-        </form>
-        <form id="add" editMode="add" title="新增-规则输出变量" i18n-en:title="Add Rule Output Variable" x:prototype="edit"/>
-        <form id="edit" editMode="update" title="编辑-规则输出变量" i18n-en:title="Edit Rule Output Variable">
-            <layout>
- ruleId[规则ID]
- name[名称]
- isMandatory[非空]
- aggMethod[汇总方式]
- displayName[显示名称]
- defaultValue[缺省值]
- schema[结构定义]
- description[描述]
- remark[备注]
-</layout>
-        </form>
-        <form id="query" editMode="query" title="查询条件" i18n-en:title="Query Condition" x:abstract="true">
-            <layout/>
-        </form>
-        <form id="asideFilter" editMode="query" x:abstract="true" submitOnChange="true">
-            <layout/>
-        </form>
-        <form id="batchUpdate" editMode="update" x:abstract="true" title="修改-规则输出变量"
-              i18n-en:title="Update Rule Output Variable">
-            <layout/>
-        </form>
-    </forms>
-
-    <pages>
-        <crud name="main" grid="list" asideFilterForm="asideFilter" filterForm="query" x:abstract="true">
-            <table autoFillHeight="true">
-                <api url="@query:NopRuleOutput__findPage/{@pageSelection}"/>
-            </table>
-            <listActions>
-                <action id="batch-delete-button" label="@i18n:common.batchDelete" batch="true">
-                    <api url="@mutation:NopRuleOutput__batchDelete?ids=$ids"/>
-                    <confirmText>@i18n:common.confirmBatchDelete</confirmText>
-                </action>
-                <action id="add-button" level="primary" label="@i18n:common.add" icon="fa fa-plus pull-left">
-                    <dialog page="add"/>
-                </action>
-            </listActions>
-            <rowActions>
-                <action id="row-view-button" level="primary" label="@i18n:common.view">
-                    <dialog page="view"/>
-                </action>
-                <action id="row-update-button" level="primary" label="@i18n:common.edit" x:abstract="true">
-                    <dialog page="update"/>
-                </action>
-                <action id="row-delete-button" level="danger" label="@i18n:common.delete" x:abstract="true">
-                    <api url="@mutation:NopRuleOutput__delete?id=$id"/>
-                    <confirmText>@i18n:common.confirmDelete</confirmText>
-                </action>
-                <actionGroup id="row-more-button" label="@i18n:common.more" level="primary">
-                    <action id="row-update-button" level="primary" label="@i18n:common.edit">
-                        <dialog page="update"/>
-                    </action>
-                    <action id="row-delete-button" level="danger" label="@i18n:common.delete">
-                        <api url="@mutation:NopRuleOutput__delete?id=$id"/>
-                        <confirmText>@i18n:common.confirmDelete</confirmText>
-                    </action>
-                </actionGroup>
-            </rowActions>
-        </crud>
-        <picker name="picker" grid="pick-list" asideFilterForm="asideFilter" filterForm="query" x:abstract="true">
-            <table>
-                <api url="@query:NopRuleOutput__findPage/{@pageSelection}"/>
-            </table>
-        </picker>
-        <simple name="add" form="add">
-            <api url="@mutation:NopRuleOutput__save/id"/>
-        </simple>
-        <simple name="view" form="view">
-            <initApi url="@query:NopRuleOutput__get/{@formSelection}?id=$id"/>
-        </simple>
-        <simple name="update" form="edit">
-            <initApi url="@query:NopRuleOutput__get/{@formSelection}?id=$id"/>
-            <api url="@mutation:NopRuleOutput__update/id?id=$id" withFormData="true"/>
-        </simple>
-    </pages>
-</view>
\ No newline at end of file
diff --git a/nop-rule/nop-rule-web/src/main/resources/_vfs/nop/rule/pages/NopRuleOutput/main.page.yaml b/nop-rule/nop-rule-web/src/main/resources/_vfs/nop/rule/pages/NopRuleOutput/main.page.yaml
deleted file mode 100644
index eaead0400..000000000
--- a/nop-rule/nop-rule-web/src/main/resources/_vfs/nop/rule/pages/NopRuleOutput/main.page.yaml
+++ /dev/null
@@ -1,3 +0,0 @@
-
-x:gen-extends: |
-    <web:GenPage view="NopRuleOutput.view.xml" page="main" xpl:lib="/nop/web/xlib/web.xlib" />
diff --git a/nop-rule/nop-rule-web/src/main/resources/_vfs/nop/rule/pages/NopRuleOutput/picker.page.yaml b/nop-rule/nop-rule-web/src/main/resources/_vfs/nop/rule/pages/NopRuleOutput/picker.page.yaml
deleted file mode 100644
index f7ec6bd36..000000000
--- a/nop-rule/nop-rule-web/src/main/resources/_vfs/nop/rule/pages/NopRuleOutput/picker.page.yaml
+++ /dev/null
@@ -1,3 +0,0 @@
-
-x:gen-extends: |
-    <web:GenPage view="NopRuleOutput.view.xml" page="picker" xpl:lib="/nop/web/xlib/web.xlib" />
diff --git a/nop-rule/nop-rule-web/src/main/resources/_vfs/nop/rule/pages/NopRuleRole/_gen/_NopRuleRole.view.xml b/nop-rule/nop-rule-web/src/main/resources/_vfs/nop/rule/pages/NopRuleRole/_gen/_NopRuleRole.view.xml
index fd097e486..92a4e4be5 100644
--- a/nop-rule/nop-rule-web/src/main/resources/_vfs/nop/rule/pages/NopRuleRole/_gen/_NopRuleRole.view.xml
+++ b/nop-rule/nop-rule-web/src/main/resources/_vfs/nop/rule/pages/NopRuleRole/_gen/_NopRuleRole.view.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <view x:schema="/nop/schema/xui/xview.xdef" bizObjName="NopRuleRole" xmlns:i18n-en="i18n-en"
-      xmlns:x="/nop/schema/xdsl.xdef" xmlns:j="j">
+      xmlns:x="/nop/schema/xdsl.xdef" xmlns:j="j" xmlns:gql="gql">
 
     <objMeta>/nop/rule/model/NopRuleRole/NopRuleRole.xmeta</objMeta>
 
@@ -74,7 +74,7 @@
     <pages>
         <crud name="main" grid="list" asideFilterForm="asideFilter" filterForm="query" x:abstract="true">
             <table autoFillHeight="true">
-                <api url="@query:NopRuleRole__findPage/{@pageSelection}"/>
+                <api url="@query:NopRuleRole__findPage" gql:selection="{@pageSelection}"/>
             </table>
             <listActions>
                 <action id="batch-delete-button" label="@i18n:common.batchDelete" batch="true">
@@ -109,17 +109,17 @@
         </crud>
         <picker name="picker" grid="pick-list" asideFilterForm="asideFilter" filterForm="query" x:abstract="true">
             <table>
-                <api url="@query:NopRuleRole__findPage/{@pageSelection}"/>
+                <api url="@query:NopRuleRole__findPage" gql:selection="{@pageSelection}"/>
             </table>
         </picker>
         <simple name="add" form="add">
             <api url="@mutation:NopRuleRole__save/id"/>
         </simple>
         <simple name="view" form="view">
-            <initApi url="@query:NopRuleRole__get/{@formSelection}?id=$id"/>
+            <initApi url="@query:NopRuleRole__get?id=$id" gql:selection="{@formSelection}"/>
         </simple>
         <simple name="update" form="edit">
-            <initApi url="@query:NopRuleRole__get/{@formSelection}?id=$id"/>
+            <initApi url="@query:NopRuleRole__get?id=$id" gql:selection="{@formSelection}"/>
             <api url="@mutation:NopRuleRole__update/id?id=$id" withFormData="true"/>
         </simple>
     </pages>
diff --git a/nop-sys/nop-sys-web/src/main/resources/_vfs/nop/sys/pages/NopSysClusterLeader/_gen/_NopSysClusterLeader.view.xml b/nop-sys/nop-sys-web/src/main/resources/_vfs/nop/sys/pages/NopSysClusterLeader/_gen/_NopSysClusterLeader.view.xml
index 19d22062c..d356f172f 100644
--- a/nop-sys/nop-sys-web/src/main/resources/_vfs/nop/sys/pages/NopSysClusterLeader/_gen/_NopSysClusterLeader.view.xml
+++ b/nop-sys/nop-sys-web/src/main/resources/_vfs/nop/sys/pages/NopSysClusterLeader/_gen/_NopSysClusterLeader.view.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <view x:schema="/nop/schema/xui/xview.xdef" bizObjName="NopSysClusterLeader" xmlns:i18n-en="i18n-en"
-      xmlns:x="/nop/schema/xdsl.xdef" xmlns:j="j">
+      xmlns:x="/nop/schema/xdsl.xdef" xmlns:j="j" xmlns:gql="gql">
 
     <objMeta>/nop/sys/model/NopSysClusterLeader/NopSysClusterLeader.xmeta</objMeta>
 
@@ -73,7 +73,7 @@
     <pages>
         <crud name="main" grid="list" asideFilterForm="asideFilter" filterForm="query" x:abstract="true">
             <table autoFillHeight="true">
-                <api url="@query:NopSysClusterLeader__findPage/{@pageSelection}"/>
+                <api url="@query:NopSysClusterLeader__findPage" gql:selection="{@pageSelection}"/>
             </table>
             <listActions>
                 <action id="batch-delete-button" label="@i18n:common.batchDelete" batch="true">
@@ -108,17 +108,17 @@
         </crud>
         <picker name="picker" grid="pick-list" asideFilterForm="asideFilter" filterForm="query" x:abstract="true">
             <table>
-                <api url="@query:NopSysClusterLeader__findPage/{@pageSelection}"/>
+                <api url="@query:NopSysClusterLeader__findPage" gql:selection="{@pageSelection}"/>
             </table>
         </picker>
         <simple name="add" form="add">
             <api url="@mutation:NopSysClusterLeader__save/id"/>
         </simple>
         <simple name="view" form="view">
-            <initApi url="@query:NopSysClusterLeader__get/{@formSelection}?id=$id"/>
+            <initApi url="@query:NopSysClusterLeader__get?id=$id" gql:selection="{@formSelection}"/>
         </simple>
         <simple name="update" form="edit">
-            <initApi url="@query:NopSysClusterLeader__get/{@formSelection}?id=$id"/>
+            <initApi url="@query:NopSysClusterLeader__get?id=$id" gql:selection="{@formSelection}"/>
             <api url="@mutation:NopSysClusterLeader__update/id?id=$id" withFormData="true"/>
         </simple>
     </pages>
diff --git a/nop-sys/nop-sys-web/src/main/resources/_vfs/nop/sys/pages/NopSysCodeRule/_gen/_NopSysCodeRule.view.xml b/nop-sys/nop-sys-web/src/main/resources/_vfs/nop/sys/pages/NopSysCodeRule/_gen/_NopSysCodeRule.view.xml
index 84da4c191..d3c49302b 100644
--- a/nop-sys/nop-sys-web/src/main/resources/_vfs/nop/sys/pages/NopSysCodeRule/_gen/_NopSysCodeRule.view.xml
+++ b/nop-sys/nop-sys-web/src/main/resources/_vfs/nop/sys/pages/NopSysCodeRule/_gen/_NopSysCodeRule.view.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <view x:schema="/nop/schema/xui/xview.xdef" bizObjName="NopSysCodeRule" xmlns:i18n-en="i18n-en"
-      xmlns:x="/nop/schema/xdsl.xdef" xmlns:j="j">
+      xmlns:x="/nop/schema/xdsl.xdef" xmlns:j="j" xmlns:gql="gql">
 
     <objMeta>/nop/sys/model/NopSysCodeRule/NopSysCodeRule.xmeta</objMeta>
 
@@ -80,7 +80,7 @@
     <pages>
         <crud name="main" grid="list" asideFilterForm="asideFilter" filterForm="query" x:abstract="true">
             <table autoFillHeight="true">
-                <api url="@query:NopSysCodeRule__findPage/{@pageSelection}"/>
+                <api url="@query:NopSysCodeRule__findPage" gql:selection="{@pageSelection}"/>
             </table>
             <listActions>
                 <action id="batch-delete-button" label="@i18n:common.batchDelete" batch="true">
@@ -115,17 +115,17 @@
         </crud>
         <picker name="picker" grid="pick-list" asideFilterForm="asideFilter" filterForm="query" x:abstract="true">
             <table>
-                <api url="@query:NopSysCodeRule__findPage/{@pageSelection}"/>
+                <api url="@query:NopSysCodeRule__findPage" gql:selection="{@pageSelection}"/>
             </table>
         </picker>
         <simple name="add" form="add">
             <api url="@mutation:NopSysCodeRule__save/id"/>
         </simple>
         <simple name="view" form="view">
-            <initApi url="@query:NopSysCodeRule__get/{@formSelection}?id=$id"/>
+            <initApi url="@query:NopSysCodeRule__get?id=$id" gql:selection="{@formSelection}"/>
         </simple>
         <simple name="update" form="edit">
-            <initApi url="@query:NopSysCodeRule__get/{@formSelection}?id=$id"/>
+            <initApi url="@query:NopSysCodeRule__get?id=$id" gql:selection="{@formSelection}"/>
             <api url="@mutation:NopSysCodeRule__update/id?id=$id" withFormData="true"/>
         </simple>
     </pages>
diff --git a/nop-sys/nop-sys-web/src/main/resources/_vfs/nop/sys/pages/NopSysDict/_gen/_NopSysDict.view.xml b/nop-sys/nop-sys-web/src/main/resources/_vfs/nop/sys/pages/NopSysDict/_gen/_NopSysDict.view.xml
index 7e741462c..2434874be 100644
--- a/nop-sys/nop-sys-web/src/main/resources/_vfs/nop/sys/pages/NopSysDict/_gen/_NopSysDict.view.xml
+++ b/nop-sys/nop-sys-web/src/main/resources/_vfs/nop/sys/pages/NopSysDict/_gen/_NopSysDict.view.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <view x:schema="/nop/schema/xui/xview.xdef" bizObjName="NopSysDict" xmlns:i18n-en="i18n-en"
-      xmlns:x="/nop/schema/xdsl.xdef" xmlns:j="j">
+      xmlns:x="/nop/schema/xdsl.xdef" xmlns:j="j" xmlns:gql="gql">
 
     <objMeta>/nop/sys/model/NopSysDict/NopSysDict.xmeta</objMeta>
 
@@ -69,7 +69,7 @@
     <pages>
         <crud name="main" grid="list" asideFilterForm="asideFilter" filterForm="query" x:abstract="true">
             <table autoFillHeight="true">
-                <api url="@query:NopSysDict__findPage/{@pageSelection}"/>
+                <api url="@query:NopSysDict__findPage" gql:selection="{@pageSelection}"/>
             </table>
             <listActions>
                 <action id="batch-delete-button" label="@i18n:common.batchDelete" batch="true">
@@ -104,17 +104,17 @@
         </crud>
         <picker name="picker" grid="pick-list" asideFilterForm="asideFilter" filterForm="query" x:abstract="true">
             <table>
-                <api url="@query:NopSysDict__findPage/{@pageSelection}"/>
+                <api url="@query:NopSysDict__findPage" gql:selection="{@pageSelection}"/>
             </table>
         </picker>
         <simple name="add" form="add">
             <api url="@mutation:NopSysDict__save/id"/>
         </simple>
         <simple name="view" form="view">
-            <initApi url="@query:NopSysDict__get/{@formSelection}?id=$id"/>
+            <initApi url="@query:NopSysDict__get?id=$id" gql:selection="{@formSelection}"/>
         </simple>
         <simple name="update" form="edit">
-            <initApi url="@query:NopSysDict__get/{@formSelection}?id=$id"/>
+            <initApi url="@query:NopSysDict__get?id=$id" gql:selection="{@formSelection}"/>
             <api url="@mutation:NopSysDict__update/id?id=$id" withFormData="true"/>
         </simple>
     </pages>
diff --git a/nop-sys/nop-sys-web/src/main/resources/_vfs/nop/sys/pages/NopSysDictOption/_gen/_NopSysDictOption.view.xml b/nop-sys/nop-sys-web/src/main/resources/_vfs/nop/sys/pages/NopSysDictOption/_gen/_NopSysDictOption.view.xml
index 0d38ac234..96ec7f8a0 100644
--- a/nop-sys/nop-sys-web/src/main/resources/_vfs/nop/sys/pages/NopSysDictOption/_gen/_NopSysDictOption.view.xml
+++ b/nop-sys/nop-sys-web/src/main/resources/_vfs/nop/sys/pages/NopSysDictOption/_gen/_NopSysDictOption.view.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <view x:schema="/nop/schema/xui/xview.xdef" bizObjName="NopSysDictOption" xmlns:i18n-en="i18n-en"
-      xmlns:x="/nop/schema/xdsl.xdef" xmlns:j="j">
+      xmlns:x="/nop/schema/xdsl.xdef" xmlns:j="j" xmlns:gql="gql">
 
     <objMeta>/nop/sys/model/NopSysDictOption/NopSysDictOption.xmeta</objMeta>
 
@@ -88,7 +88,7 @@
     <pages>
         <crud name="main" grid="list" asideFilterForm="asideFilter" filterForm="query" x:abstract="true">
             <table autoFillHeight="true">
-                <api url="@query:NopSysDictOption__findPage/{@pageSelection}"/>
+                <api url="@query:NopSysDictOption__findPage" gql:selection="{@pageSelection}"/>
             </table>
             <listActions>
                 <action id="batch-delete-button" label="@i18n:common.batchDelete" batch="true">
@@ -123,17 +123,17 @@
         </crud>
         <picker name="picker" grid="pick-list" asideFilterForm="asideFilter" filterForm="query" x:abstract="true">
             <table>
-                <api url="@query:NopSysDictOption__findPage/{@pageSelection}"/>
+                <api url="@query:NopSysDictOption__findPage" gql:selection="{@pageSelection}"/>
             </table>
         </picker>
         <simple name="add" form="add">
             <api url="@mutation:NopSysDictOption__save/id"/>
         </simple>
         <simple name="view" form="view">
-            <initApi url="@query:NopSysDictOption__get/{@formSelection}?id=$id"/>
+            <initApi url="@query:NopSysDictOption__get?id=$id" gql:selection="{@formSelection}"/>
         </simple>
         <simple name="update" form="edit">
-            <initApi url="@query:NopSysDictOption__get/{@formSelection}?id=$id"/>
+            <initApi url="@query:NopSysDictOption__get?id=$id" gql:selection="{@formSelection}"/>
             <api url="@mutation:NopSysDictOption__update/id?id=$id" withFormData="true"/>
         </simple>
     </pages>
diff --git a/nop-sys/nop-sys-web/src/main/resources/_vfs/nop/sys/pages/NopSysExtField/_gen/_NopSysExtField.view.xml b/nop-sys/nop-sys-web/src/main/resources/_vfs/nop/sys/pages/NopSysExtField/_gen/_NopSysExtField.view.xml
index 65ecd9cf2..f289a57cc 100644
--- a/nop-sys/nop-sys-web/src/main/resources/_vfs/nop/sys/pages/NopSysExtField/_gen/_NopSysExtField.view.xml
+++ b/nop-sys/nop-sys-web/src/main/resources/_vfs/nop/sys/pages/NopSysExtField/_gen/_NopSysExtField.view.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <view x:schema="/nop/schema/xui/xview.xdef" bizObjName="NopSysExtField" xmlns:i18n-en="i18n-en"
-      xmlns:x="/nop/schema/xdsl.xdef" xmlns:j="j">
+      xmlns:x="/nop/schema/xdsl.xdef" xmlns:j="j" xmlns:gql="gql">
 
     <objMeta>/nop/sys/model/NopSysExtField/NopSysExtField.xmeta</objMeta>
 
@@ -93,7 +93,7 @@
     <pages>
         <crud name="main" grid="list" asideFilterForm="asideFilter" filterForm="query" x:abstract="true">
             <table autoFillHeight="true">
-                <api url="@query:NopSysExtField__findPage/{@pageSelection}"/>
+                <api url="@query:NopSysExtField__findPage" gql:selection="{@pageSelection}"/>
             </table>
             <listActions>
                 <action id="batch-delete-button" label="@i18n:common.batchDelete" batch="true">
@@ -128,17 +128,17 @@
         </crud>
         <picker name="picker" grid="pick-list" asideFilterForm="asideFilter" filterForm="query" x:abstract="true">
             <table>
-                <api url="@query:NopSysExtField__findPage/{@pageSelection}"/>
+                <api url="@query:NopSysExtField__findPage" gql:selection="{@pageSelection}"/>
             </table>
         </picker>
         <simple name="add" form="add">
             <api url="@mutation:NopSysExtField__save/id"/>
         </simple>
         <simple name="view" form="view">
-            <initApi url="@query:NopSysExtField__get/{@formSelection}?id=$id"/>
+            <initApi url="@query:NopSysExtField__get?id=$id" gql:selection="{@formSelection}"/>
         </simple>
         <simple name="update" form="edit">
-            <initApi url="@query:NopSysExtField__get/{@formSelection}?id=$id"/>
+            <initApi url="@query:NopSysExtField__get?id=$id" gql:selection="{@formSelection}"/>
             <api url="@mutation:NopSysExtField__update/id?id=$id" withFormData="true"/>
         </simple>
     </pages>
diff --git a/nop-sys/nop-sys-web/src/main/resources/_vfs/nop/sys/pages/NopSysI18n/_gen/_NopSysI18n.view.xml b/nop-sys/nop-sys-web/src/main/resources/_vfs/nop/sys/pages/NopSysI18n/_gen/_NopSysI18n.view.xml
index b2c539bf0..3e91d80d7 100644
--- a/nop-sys/nop-sys-web/src/main/resources/_vfs/nop/sys/pages/NopSysI18n/_gen/_NopSysI18n.view.xml
+++ b/nop-sys/nop-sys-web/src/main/resources/_vfs/nop/sys/pages/NopSysI18n/_gen/_NopSysI18n.view.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <view x:schema="/nop/schema/xui/xview.xdef" bizObjName="NopSysI18n" xmlns:i18n-en="i18n-en"
-      xmlns:x="/nop/schema/xdsl.xdef" xmlns:j="j">
+      xmlns:x="/nop/schema/xdsl.xdef" xmlns:j="j" xmlns:gql="gql">
 
     <objMeta>/nop/sys/model/NopSysI18n/NopSysI18n.xmeta</objMeta>
 
@@ -74,7 +74,7 @@
     <pages>
         <crud name="main" grid="list" asideFilterForm="asideFilter" filterForm="query" x:abstract="true">
             <table autoFillHeight="true">
-                <api url="@query:NopSysI18n__findPage/{@pageSelection}"/>
+                <api url="@query:NopSysI18n__findPage" gql:selection="{@pageSelection}"/>
             </table>
             <listActions>
                 <action id="batch-delete-button" label="@i18n:common.batchDelete" batch="true">
@@ -109,17 +109,17 @@
         </crud>
         <picker name="picker" grid="pick-list" asideFilterForm="asideFilter" filterForm="query" x:abstract="true">
             <table>
-                <api url="@query:NopSysI18n__findPage/{@pageSelection}"/>
+                <api url="@query:NopSysI18n__findPage" gql:selection="{@pageSelection}"/>
             </table>
         </picker>
         <simple name="add" form="add">
             <api url="@mutation:NopSysI18n__save/id"/>
         </simple>
         <simple name="view" form="view">
-            <initApi url="@query:NopSysI18n__get/{@formSelection}?id=$id"/>
+            <initApi url="@query:NopSysI18n__get?id=$id" gql:selection="{@formSelection}"/>
         </simple>
         <simple name="update" form="edit">
-            <initApi url="@query:NopSysI18n__get/{@formSelection}?id=$id"/>
+            <initApi url="@query:NopSysI18n__get?id=$id" gql:selection="{@formSelection}"/>
             <api url="@mutation:NopSysI18n__update/id?id=$id" withFormData="true"/>
         </simple>
     </pages>
diff --git a/nop-sys/nop-sys-web/src/main/resources/_vfs/nop/sys/pages/NopSysLock/_gen/_NopSysLock.view.xml b/nop-sys/nop-sys-web/src/main/resources/_vfs/nop/sys/pages/NopSysLock/_gen/_NopSysLock.view.xml
index d4cea4c85..06ea71fba 100644
--- a/nop-sys/nop-sys-web/src/main/resources/_vfs/nop/sys/pages/NopSysLock/_gen/_NopSysLock.view.xml
+++ b/nop-sys/nop-sys-web/src/main/resources/_vfs/nop/sys/pages/NopSysLock/_gen/_NopSysLock.view.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <view x:schema="/nop/schema/xui/xview.xdef" bizObjName="NopSysLock" xmlns:i18n-en="i18n-en"
-      xmlns:x="/nop/schema/xdsl.xdef" xmlns:j="j">
+      xmlns:x="/nop/schema/xdsl.xdef" xmlns:j="j" xmlns:gql="gql">
 
     <objMeta>/nop/sys/model/NopSysLock/NopSysLock.xmeta</objMeta>
 
@@ -78,7 +78,7 @@
     <pages>
         <crud name="main" grid="list" asideFilterForm="asideFilter" filterForm="query" x:abstract="true">
             <table autoFillHeight="true">
-                <api url="@query:NopSysLock__findPage/{@pageSelection}"/>
+                <api url="@query:NopSysLock__findPage" gql:selection="{@pageSelection}"/>
             </table>
             <listActions>
                 <action id="batch-delete-button" label="@i18n:common.batchDelete" batch="true">
@@ -113,17 +113,17 @@
         </crud>
         <picker name="picker" grid="pick-list" asideFilterForm="asideFilter" filterForm="query" x:abstract="true">
             <table>
-                <api url="@query:NopSysLock__findPage/{@pageSelection}"/>
+                <api url="@query:NopSysLock__findPage" gql:selection="{@pageSelection}"/>
             </table>
         </picker>
         <simple name="add" form="add">
             <api url="@mutation:NopSysLock__save/id"/>
         </simple>
         <simple name="view" form="view">
-            <initApi url="@query:NopSysLock__get/{@formSelection}?id=$id"/>
+            <initApi url="@query:NopSysLock__get?id=$id" gql:selection="{@formSelection}"/>
         </simple>
         <simple name="update" form="edit">
-            <initApi url="@query:NopSysLock__get/{@formSelection}?id=$id"/>
+            <initApi url="@query:NopSysLock__get?id=$id" gql:selection="{@formSelection}"/>
             <api url="@mutation:NopSysLock__update/id?id=$id" withFormData="true"/>
         </simple>
     </pages>
diff --git a/nop-sys/nop-sys-web/src/main/resources/_vfs/nop/sys/pages/NopSysMakerCheckerRecord/_gen/_NopSysMakerCheckerRecord.view.xml b/nop-sys/nop-sys-web/src/main/resources/_vfs/nop/sys/pages/NopSysMakerCheckerRecord/_gen/_NopSysMakerCheckerRecord.view.xml
index e8abbbac4..171a45710 100644
--- a/nop-sys/nop-sys-web/src/main/resources/_vfs/nop/sys/pages/NopSysMakerCheckerRecord/_gen/_NopSysMakerCheckerRecord.view.xml
+++ b/nop-sys/nop-sys-web/src/main/resources/_vfs/nop/sys/pages/NopSysMakerCheckerRecord/_gen/_NopSysMakerCheckerRecord.view.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <view x:schema="/nop/schema/xui/xview.xdef" bizObjName="NopSysMakerCheckerRecord" xmlns:i18n-en="i18n-en"
-      xmlns:x="/nop/schema/xdsl.xdef" xmlns:j="j">
+      xmlns:x="/nop/schema/xdsl.xdef" xmlns:j="j" xmlns:gql="gql">
 
     <objMeta>/nop/sys/model/NopSysMakerCheckerRecord/NopSysMakerCheckerRecord.xmeta</objMeta>
 
@@ -126,7 +126,7 @@
     <pages>
         <crud name="main" grid="list" asideFilterForm="asideFilter" filterForm="query" x:abstract="true">
             <table autoFillHeight="true">
-                <api url="@query:NopSysMakerCheckerRecord__findPage/{@pageSelection}"/>
+                <api url="@query:NopSysMakerCheckerRecord__findPage" gql:selection="{@pageSelection}"/>
             </table>
             <listActions>
                 <action id="batch-delete-button" label="@i18n:common.batchDelete" batch="true">
@@ -161,17 +161,17 @@
         </crud>
         <picker name="picker" grid="pick-list" asideFilterForm="asideFilter" filterForm="query" x:abstract="true">
             <table>
-                <api url="@query:NopSysMakerCheckerRecord__findPage/{@pageSelection}"/>
+                <api url="@query:NopSysMakerCheckerRecord__findPage" gql:selection="{@pageSelection}"/>
             </table>
         </picker>
         <simple name="add" form="add">
             <api url="@mutation:NopSysMakerCheckerRecord__save/id"/>
         </simple>
         <simple name="view" form="view">
-            <initApi url="@query:NopSysMakerCheckerRecord__get/{@formSelection}?id=$id"/>
+            <initApi url="@query:NopSysMakerCheckerRecord__get?id=$id" gql:selection="{@formSelection}"/>
         </simple>
         <simple name="update" form="edit">
-            <initApi url="@query:NopSysMakerCheckerRecord__get/{@formSelection}?id=$id"/>
+            <initApi url="@query:NopSysMakerCheckerRecord__get?id=$id" gql:selection="{@formSelection}"/>
             <api url="@mutation:NopSysMakerCheckerRecord__update/id?id=$id" withFormData="true"/>
         </simple>
     </pages>
diff --git a/nop-sys/nop-sys-web/src/main/resources/_vfs/nop/sys/pages/NopSysNoticeTemplate/_gen/_NopSysNoticeTemplate.view.xml b/nop-sys/nop-sys-web/src/main/resources/_vfs/nop/sys/pages/NopSysNoticeTemplate/_gen/_NopSysNoticeTemplate.view.xml
index ba98921e9..5b7c15c30 100644
--- a/nop-sys/nop-sys-web/src/main/resources/_vfs/nop/sys/pages/NopSysNoticeTemplate/_gen/_NopSysNoticeTemplate.view.xml
+++ b/nop-sys/nop-sys-web/src/main/resources/_vfs/nop/sys/pages/NopSysNoticeTemplate/_gen/_NopSysNoticeTemplate.view.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <view x:schema="/nop/schema/xui/xview.xdef" bizObjName="NopSysNoticeTemplate" xmlns:i18n-en="i18n-en"
-      xmlns:x="/nop/schema/xdsl.xdef" xmlns:j="j">
+      xmlns:x="/nop/schema/xdsl.xdef" xmlns:j="j" xmlns:gql="gql">
 
     <objMeta>/nop/sys/model/NopSysNoticeTemplate/NopSysNoticeTemplate.xmeta</objMeta>
 
@@ -80,7 +80,7 @@
     <pages>
         <crud name="main" grid="list" asideFilterForm="asideFilter" filterForm="query" x:abstract="true">
             <table autoFillHeight="true">
-                <api url="@query:NopSysNoticeTemplate__findPage/{@pageSelection}"/>
+                <api url="@query:NopSysNoticeTemplate__findPage" gql:selection="{@pageSelection}"/>
             </table>
             <listActions>
                 <action id="batch-delete-button" label="@i18n:common.batchDelete" batch="true">
@@ -115,17 +115,17 @@
         </crud>
         <picker name="picker" grid="pick-list" asideFilterForm="asideFilter" filterForm="query" x:abstract="true">
             <table>
-                <api url="@query:NopSysNoticeTemplate__findPage/{@pageSelection}"/>
+                <api url="@query:NopSysNoticeTemplate__findPage" gql:selection="{@pageSelection}"/>
             </table>
         </picker>
         <simple name="add" form="add">
             <api url="@mutation:NopSysNoticeTemplate__save/id"/>
         </simple>
         <simple name="view" form="view">
-            <initApi url="@query:NopSysNoticeTemplate__get/{@formSelection}?id=$id"/>
+            <initApi url="@query:NopSysNoticeTemplate__get?id=$id" gql:selection="{@formSelection}"/>
         </simple>
         <simple name="update" form="edit">
-            <initApi url="@query:NopSysNoticeTemplate__get/{@formSelection}?id=$id"/>
+            <initApi url="@query:NopSysNoticeTemplate__get?id=$id" gql:selection="{@formSelection}"/>
             <api url="@mutation:NopSysNoticeTemplate__update/id?id=$id" withFormData="true"/>
         </simple>
     </pages>
diff --git a/nop-sys/nop-sys-web/src/main/resources/_vfs/nop/sys/pages/NopSysSequence/_gen/_NopSysSequence.view.xml b/nop-sys/nop-sys-web/src/main/resources/_vfs/nop/sys/pages/NopSysSequence/_gen/_NopSysSequence.view.xml
index 359ec4579..fe7f80337 100644
--- a/nop-sys/nop-sys-web/src/main/resources/_vfs/nop/sys/pages/NopSysSequence/_gen/_NopSysSequence.view.xml
+++ b/nop-sys/nop-sys-web/src/main/resources/_vfs/nop/sys/pages/NopSysSequence/_gen/_NopSysSequence.view.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <view x:schema="/nop/schema/xui/xview.xdef" bizObjName="NopSysSequence" xmlns:i18n-en="i18n-en"
-      xmlns:x="/nop/schema/xdsl.xdef" xmlns:j="j">
+      xmlns:x="/nop/schema/xdsl.xdef" xmlns:j="j" xmlns:gql="gql">
 
     <objMeta>/nop/sys/model/NopSysSequence/NopSysSequence.xmeta</objMeta>
 
@@ -93,7 +93,7 @@
     <pages>
         <crud name="main" grid="list" asideFilterForm="asideFilter" filterForm="query" x:abstract="true">
             <table autoFillHeight="true">
-                <api url="@query:NopSysSequence__findPage/{@pageSelection}"/>
+                <api url="@query:NopSysSequence__findPage" gql:selection="{@pageSelection}"/>
             </table>
             <listActions>
                 <action id="batch-delete-button" label="@i18n:common.batchDelete" batch="true">
@@ -128,17 +128,17 @@
         </crud>
         <picker name="picker" grid="pick-list" asideFilterForm="asideFilter" filterForm="query" x:abstract="true">
             <table>
-                <api url="@query:NopSysSequence__findPage/{@pageSelection}"/>
+                <api url="@query:NopSysSequence__findPage" gql:selection="{@pageSelection}"/>
             </table>
         </picker>
         <simple name="add" form="add">
             <api url="@mutation:NopSysSequence__save/id"/>
         </simple>
         <simple name="view" form="view">
-            <initApi url="@query:NopSysSequence__get/{@formSelection}?id=$id"/>
+            <initApi url="@query:NopSysSequence__get?id=$id" gql:selection="{@formSelection}"/>
         </simple>
         <simple name="update" form="edit">
-            <initApi url="@query:NopSysSequence__get/{@formSelection}?id=$id"/>
+            <initApi url="@query:NopSysSequence__get?id=$id" gql:selection="{@formSelection}"/>
             <api url="@mutation:NopSysSequence__update/id?id=$id" withFormData="true"/>
         </simple>
     </pages>
diff --git a/nop-sys/nop-sys-web/src/main/resources/_vfs/nop/sys/pages/NopSysUserVariable/_gen/_NopSysUserVariable.view.xml b/nop-sys/nop-sys-web/src/main/resources/_vfs/nop/sys/pages/NopSysUserVariable/_gen/_NopSysUserVariable.view.xml
index 128d1a611..ce21e6df4 100644
--- a/nop-sys/nop-sys-web/src/main/resources/_vfs/nop/sys/pages/NopSysUserVariable/_gen/_NopSysUserVariable.view.xml
+++ b/nop-sys/nop-sys-web/src/main/resources/_vfs/nop/sys/pages/NopSysUserVariable/_gen/_NopSysUserVariable.view.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <view x:schema="/nop/schema/xui/xview.xdef" bizObjName="NopSysUserVariable" xmlns:i18n-en="i18n-en"
-      xmlns:x="/nop/schema/xdsl.xdef" xmlns:j="j">
+      xmlns:x="/nop/schema/xdsl.xdef" xmlns:j="j" xmlns:gql="gql">
 
     <objMeta>/nop/sys/model/NopSysUserVariable/NopSysUserVariable.xmeta</objMeta>
 
@@ -71,7 +71,7 @@
     <pages>
         <crud name="main" grid="list" asideFilterForm="asideFilter" filterForm="query" x:abstract="true">
             <table autoFillHeight="true">
-                <api url="@query:NopSysUserVariable__findPage/{@pageSelection}"/>
+                <api url="@query:NopSysUserVariable__findPage" gql:selection="{@pageSelection}"/>
             </table>
             <listActions>
                 <action id="batch-delete-button" label="@i18n:common.batchDelete" batch="true">
@@ -106,17 +106,17 @@
         </crud>
         <picker name="picker" grid="pick-list" asideFilterForm="asideFilter" filterForm="query" x:abstract="true">
             <table>
-                <api url="@query:NopSysUserVariable__findPage/{@pageSelection}"/>
+                <api url="@query:NopSysUserVariable__findPage" gql:selection="{@pageSelection}"/>
             </table>
         </picker>
         <simple name="add" form="add">
             <api url="@mutation:NopSysUserVariable__save/id"/>
         </simple>
         <simple name="view" form="view">
-            <initApi url="@query:NopSysUserVariable__get/{@formSelection}?id=$id"/>
+            <initApi url="@query:NopSysUserVariable__get?id=$id" gql:selection="{@formSelection}"/>
         </simple>
         <simple name="update" form="edit">
-            <initApi url="@query:NopSysUserVariable__get/{@formSelection}?id=$id"/>
+            <initApi url="@query:NopSysUserVariable__get?id=$id" gql:selection="{@formSelection}"/>
             <api url="@mutation:NopSysUserVariable__update/id?id=$id" withFormData="true"/>
         </simple>
     </pages>
diff --git a/nop-sys/nop-sys-web/src/main/resources/_vfs/nop/sys/pages/NopSysVariable/_gen/_NopSysVariable.view.xml b/nop-sys/nop-sys-web/src/main/resources/_vfs/nop/sys/pages/NopSysVariable/_gen/_NopSysVariable.view.xml
index 66e326fb1..46b817f12 100644
--- a/nop-sys/nop-sys-web/src/main/resources/_vfs/nop/sys/pages/NopSysVariable/_gen/_NopSysVariable.view.xml
+++ b/nop-sys/nop-sys-web/src/main/resources/_vfs/nop/sys/pages/NopSysVariable/_gen/_NopSysVariable.view.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <view x:schema="/nop/schema/xui/xview.xdef" bizObjName="NopSysVariable" xmlns:i18n-en="i18n-en"
-      xmlns:x="/nop/schema/xdsl.xdef" xmlns:j="j">
+      xmlns:x="/nop/schema/xdsl.xdef" xmlns:j="j" xmlns:gql="gql">
 
     <objMeta>/nop/sys/model/NopSysVariable/NopSysVariable.xmeta</objMeta>
 
@@ -80,7 +80,7 @@
     <pages>
         <crud name="main" grid="list" asideFilterForm="asideFilter" filterForm="query" x:abstract="true">
             <table autoFillHeight="true">
-                <api url="@query:NopSysVariable__findPage/{@pageSelection}"/>
+                <api url="@query:NopSysVariable__findPage" gql:selection="{@pageSelection}"/>
             </table>
             <listActions>
                 <action id="batch-delete-button" label="@i18n:common.batchDelete" batch="true">
@@ -115,17 +115,17 @@
         </crud>
         <picker name="picker" grid="pick-list" asideFilterForm="asideFilter" filterForm="query" x:abstract="true">
             <table>
-                <api url="@query:NopSysVariable__findPage/{@pageSelection}"/>
+                <api url="@query:NopSysVariable__findPage" gql:selection="{@pageSelection}"/>
             </table>
         </picker>
         <simple name="add" form="add">
             <api url="@mutation:NopSysVariable__save/id"/>
         </simple>
         <simple name="view" form="view">
-            <initApi url="@query:NopSysVariable__get/{@formSelection}?id=$id"/>
+            <initApi url="@query:NopSysVariable__get?id=$id" gql:selection="{@formSelection}"/>
         </simple>
         <simple name="update" form="edit">
-            <initApi url="@query:NopSysVariable__get/{@formSelection}?id=$id"/>
+            <initApi url="@query:NopSysVariable__get?id=$id" gql:selection="{@formSelection}"/>
             <api url="@mutation:NopSysVariable__update/id?id=$id" withFormData="true"/>
         </simple>
     </pages>
diff --git a/nop-ui/src/main/java/io/nop/xui/utils/XuiHelper.java b/nop-ui/src/main/java/io/nop/xui/utils/XuiHelper.java
index 073af1974..ec296bca4 100644
--- a/nop-ui/src/main/java/io/nop/xui/utils/XuiHelper.java
+++ b/nop-ui/src/main/java/io/nop/xui/utils/XuiHelper.java
@@ -8,6 +8,7 @@
 package io.nop.xui.utils;
 
 import io.nop.api.core.beans.FieldSelectionBean;
+import io.nop.api.core.convert.ConvertHelper;
 import io.nop.api.core.exceptions.NopException;
 import io.nop.api.core.util.ProcessResult;
 import io.nop.commons.util.StringHelper;
@@ -26,7 +27,9 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.util.LinkedHashMap;
 import java.util.LinkedHashSet;
+import java.util.Map;
 import java.util.Set;
 
 import static io.nop.xui.XuiConstants.DATA_TYPE_ANY;
@@ -92,10 +95,10 @@ public static IXplTag getControlTag(IXplTagLib lib, IUiDisplayMeta dispMeta, IOb
         }
 
         String prop = propMeta != null ? propMeta.getName() : (dispMeta == null ? null : dispMeta.getId());
-        if(editMode != null && !editMode.endsWith(MODE_VIEW) && tag != null && tag.getTagName().equals("view-any")){
+        if (editMode != null && !editMode.endsWith(MODE_VIEW) && tag != null && tag.getTagName().equals("view-any")) {
             LOG.warn("nop.xui.no-control-defined-for-prop:controlTag={},prop={},domain={},stdDomain={},stdDataType={},mode={}",
                     tag == null ? null : tag.getTagName(), prop, domain, stdDomain, stdDataType, editMode);
-        }else {
+        } else {
             LOG.debug("nop.xui.resolve-control-tag:controlTag={},prop={},domain={},stdDomain={},stdDataType={},mode={}",
                     tag == null ? null : tag.getTagName(), prop, domain, stdDomain, stdDataType, editMode);
         }
@@ -276,4 +279,26 @@ public static String getRelationPickerUrl(IObjPropMeta propMeta, IObjMeta objMet
         String moduleId = ResourceHelper.getModuleId(objMeta.resourcePath());
         return '/' + moduleId + "/pages/" + bizObjName + "/picker.page.yaml";
     }
+
+    /**
+     * 弹出关联集合页面时在子表的查询链接中拼接关联过滤条件
+     */
+    public static String appendFilterProps(String url, Object fixedProps) {
+        Set<String> props = ConvertHelper.toCsvSet(fixedProps);
+        if (props == null || props.isEmpty())
+            return url;
+
+        int pos = url.indexOf('?');
+        Map<String, Object> query;
+        if (pos < 0) {
+            query = new LinkedHashMap<>();
+        } else {
+            query = StringHelper.parseQuery(url.substring(pos + 1), StringHelper.ENCODING_UTF8);
+            url = url.substring(0, pos);
+        }
+        for (String prop : props) {
+            query.put("filter_" + prop, '$'+prop);
+        }
+        return url + '?' + StringHelper.encodeQuery(query);
+    }
 }
\ No newline at end of file
diff --git a/nop-web/src/main/resources/_vfs/nop/web/xlib/web.xlib b/nop-web/src/main/resources/_vfs/nop/web/xlib/web.xlib
index bc686005f..760d3d598 100644
--- a/nop-web/src/main/resources/_vfs/nop/web/xlib/web.xlib
+++ b/nop-web/src/main/resources/_vfs/nop/web/xlib/web.xlib
@@ -7,6 +7,8 @@
             <attr name="view" mandatory="true" type="String" stdDomain="v-path"/>
             <attr name="page" mandatory="true" type="String"/>
             <attr name="forPicker" type="Boolean" optional="true"/>
+            <attr name="fixedProps" optional="true" stdDomain="csv-set"/>
+
             <source>
                 <c:include src="web/impl_GenPage.xpl"/>
             </source>
@@ -16,6 +18,7 @@
             <attr name="view" mandatory="true" type="String" stdDomain="v-path"/>
             <attr name="form" mandatory="true" type="string"/>
             <attr name="skipForm" optional="true" type="boolean" />
+            <attr name="fixedProps" optional="true" stdDomain="csv-set" />
 
             <slot name="default" outputMode="xjson">
                 <arg name="objMeta"/>
@@ -36,6 +39,7 @@
             <attr name="i18nRoot" implicit="true" />
             <attr name="bizObjName" implicit="true" />
             <attr name="controlLib" implicit="true"/>
+            <attr name="fixedProps" optional="true" stdDomain="csv-set"/>
 
             <source>
                 <form name="${formModel.id}" xpl:attrs="xpl('thisLib:FormDefaultAttrs',formModel)"  xpl:skipIf="skipForm">
@@ -48,6 +52,7 @@
         <GenGrid outputMode="xjson">
             <attr name="view" mandatory="true" type="String" stdDomain="v-path"/>
             <attr name="grid" mandatory="true" type="string"/>
+            <attr name="fixedProps" optional="true" stdDomain="csv-set"/>
 
             <source>
                 <c:include src="web/impl_GenGrid.xpl"/>
@@ -61,6 +66,7 @@
             <attr name="bizObjName" implicit="true" />
             <attr name="i18nRoot" implicit="true" />
             <attr name="controlLib" implicit="true" />
+            <attr name="fixedProps" implicit="true" optional="true" />
 
             <source>
                 <crud xpl:attrs="xpl('thisLib:GridDefaultAttrs', gridModel)"
@@ -74,7 +80,7 @@
 
 
                     <columns j:list="true">
-                        <thisLib:GenGridCols gridModel="${gridModel}" objMeta="${objMeta}"/>
+                        <thisLib:GenGridCols gridModel="${gridModel}" objMeta="${objMeta}" fixedProps="${fixedProps}"/>
                     </columns>
                 </crud>
             </source>
@@ -110,6 +116,8 @@
             <attr name="bizObjName" implicit="true"/>
             <attr name="i18nRoot" implicit="true"/>
             <attr name="controlLib" implicit="true"/>
+            <attr name="fixedProps" implicit="true" optional="true" />
+
             <source>
                 <body j:list="true">
                     <c:choose>
@@ -133,7 +141,7 @@
             <attr name="bizObjName" implicit="true"/>
             <attr name="i18nRoot" implicit="true"/>
             <attr name="controlLib" implicit="true"/>
-
+            <attr name="fixedProps" implicit="true" optional="true" />
             <source>
                 <collapse-group activeKey="${['1']}" id="${formModel.id}">
                     <thisLib:GenAccordionBody layoutGroups="${formModel.layout.groups}"/>
@@ -148,6 +156,7 @@
             <attr name="bizObjName" implicit="true"/>
             <attr name="i18nRoot" implicit="true"/>
             <attr name="controlLib" implicit="true"/>
+            <attr name="fixedProps" implicit="true" optional="true" />
 
             <source>
                 <body>
@@ -171,6 +180,7 @@
             <attr name="bizObjName" implicit="true"/>
             <attr name="i18nRoot" implicit="true"/>
             <attr name="controlLib" implicit="true"/>
+            <attr name="fixedProps" implicit="true" optional="true" />
 
             <source>
                 <c:for var="group" items="${layoutGroups}">
@@ -187,6 +197,7 @@
             <attr name="bizObjName" implicit="true"/>
             <attr name="i18nRoot" implicit="true"/>
             <attr name="controlLib" implicit="true"/>
+            <attr name="fixedProps" implicit="true" optional="true" />
 
             <source>
                 <tabs>
@@ -218,6 +229,7 @@
             <attr name="bizObjName" implicit="true"/>
             <attr name="i18nRoot" implicit="true"/>
             <attr name="controlLib" implicit="true"/>
+            <attr name="fixedProps" implicit="true" optional="true" />
 
             <source>
                 <c:choose>
@@ -266,6 +278,7 @@
             <attr name="bizObjName" implicit="true"/>
             <attr name="i18nRoot" implicit="true"/>
             <attr name="controlLib" implicit="true"/>
+            <attr name="fixedProps" implicit="true" optional="true" />
 
             <source>
                 <c:choose>
@@ -295,6 +308,7 @@
             <attr name="bizObjName" implicit="true"/>
             <attr name="i18nRoot" implicit="true"/>
             <attr name="controlLib" implicit="true"/>
+            <attr name="fixedProps" implicit="true" optional="true" />
 
             <source>
                 <c:choose>
@@ -315,14 +329,21 @@
             <attr name="bizObjName" implicit="true"/>
             <attr name="i18nRoot" implicit="true"/>
             <attr name="controlLib" implicit="true"/>
+            <attr name="fixedProps" implicit="true" optional="true"/>
 
             <source>
                 <c:script><![CDATA[
                     let cellModel = formModel.getCell(formCell.id);
                     let propMeta = objMeta?.getProp(cellModel?.prop || formCell.id);
-                    const rd = formCell.readonly || cellModel?.readonly
+                    let rd = formCell.readonly || cellModel?.readonly
                                  || (formModel.editMode == 'update' && !propMeta?.updatable)
-                                 || (formModel.editMode == 'add' && !propMeta?.insertable)
+                                 || (formModel.editMode == 'add' && !propMeta?.insertable);
+
+                    // 在编辑关联表时会明确指定字段的值固定，此时自动输出hidden字段
+                    if(!rd and fixedProps?.contains(formCell.id)){
+                       rd = true;
+                       $out.appendChild(location(),"hidden",{name:formCell.id})
+                    }
 
                     let mode = cellModel?.editMode || (rd? 'view' : formModel.editMode) || 'view'
                     const labelKey = '@i18n:cell.'+i18nRoot+"."+formCell.id+(cellModel?.label ? '' : ',prop.label.'
@@ -380,6 +401,7 @@
         <GenGridCols outputMode="xjson">
             <attr name="gridModel" mandatory="true"/>
             <attr name="objMeta" mandatory="true"/>
+            <attr name="ignoreCols" optional="true" />
             <attr name="bizObjName" implicit="true"/>
             <attr name="i18nRoot" implicit="true"/>
             <attr name="controlLib" implicit="true"/>
@@ -388,6 +410,7 @@
                 <c:for var="col" items="${gridModel.cols}" index="colIndex">
                     <c:script>
                         if(col.hidden) continue;
+                        if(ignoreCols and ignoreCols.contains(col.id)) continue;
                     </c:script>
                     <thisLib:GenGridCol colModel="${col}" objMeta="${objMeta}" colIndex="${colIndex}"/>
                 </c:for>
@@ -672,15 +695,18 @@
                 const iconOnly = action.iconOnly && action.icon;
 
                 if(action.api){
-                   api = {...action.api, url: action.api.url.$renderTemplateForScope('{@','}',genScope)}
+                   api = _.filterNull({...action.api, url: action.api.url.$renderTemplateForScope('{@','}',genScope),
+                      "gql:selection": action.api['gql:selection']?.$renderTemplateForScope('{@','}',genScope)
+                   })
                 }
 
 
                 if(actionType == 'dialog'){
-                    dialog = xpl('thisLib:LoadPage',action.dialog.page, action.dialog)
+                    dialog = xpl('thisLib:LoadPage',action.dialog.page, action.dialog,genScope?.fixedProps)
                 }else if(actionType == 'drawer'){
                     dialog = null;
-                    drawer = xpl('thisLib:LoadPage',(action.drawer || action.dialog).page, action.drawer||action.dialog)
+                    drawer = xpl('thisLib:LoadPage',(action.drawer || action.dialog).page,
+                                action.drawer||action.dialog,genScope?.fixedProps)
                 }
 
                 if(action.feedback?.page){
@@ -705,6 +731,7 @@
         <LoadPage>
             <attr name="page" mandatory="true"/>
             <attr name="dialog" optional="true"/>
+            <attr name="fixedProps" optional="true" />
             <attr name="viewModel" implicit="true"/>
 
             <source><![CDATA[
@@ -734,7 +761,9 @@
                   return  { 'x:extends': path, ...dlgProps}
                }
 
-               const gen = xpl `<c:collect outputMode="xjson"><thisLib:GenPage view="${viewModel.resourcePath()}" page="${page}" /></c:collect>`
+               const gen = xpl `<c:collect outputMode="xjson">
+                                  <thisLib:GenPage view="${viewModel.resourcePath()}" page="${page}" fixedProps="${fixedProps}" />
+                               </c:collect>`
                if(dlgProps != null)
                    gen.putAll(dlgProps);
                if(dialog?.data){
@@ -747,11 +776,13 @@
         <NormalizeApi>
             <attr name="api"/>
             <attr name="genScope"/>
+
             <source><![CDATA[
                 if(!api) return null;
 
                 return _.filterNull({...api,
                     url:api.url.$renderTemplateForScope("{@","}",genScope),
+                    "gql:selection": api['gql:selection']?.$renderTemplateForScope('{@','}',genScope),
                     data: api.withFormData ? genScope.formData : api.data
                 })
             ]]></source>
diff --git a/nop-web/src/main/resources/_vfs/nop/web/xlib/web/grid_crud.xpl b/nop-web/src/main/resources/_vfs/nop/web/xlib/web/grid_crud.xpl
index 5758450fb..a934cbfa1 100644
--- a/nop-web/src/main/resources/_vfs/nop/web/xlib/web/grid_crud.xpl
+++ b/nop-web/src/main/resources/_vfs/nop/web/xlib/web/grid_crud.xpl
@@ -9,9 +9,13 @@
         let listSelection = XuiHelper.getListSelection(gridModel,objMeta);
         let pageSelection = 'total,page,items{ ' + listSelection +' }';
 
-        const genScope = {listSelection,pageSelection}
-        $.notNull(pageModel.table.api.url,"pageModel.table.api.url is null, page:"+pageModel.name+',view='+viewModel.resourcePath());
+        const genScope = {listSelection,pageSelection,fixedProps: fixedProps.$toCsvSet()}
+        let gridApi = pageModel.table.api || gridModel.api
 
+        $.notNull(gridApi.url,"pageModel.table.api.url is null, page:"+pageModel.name+',view='+viewModel.resourcePath());
+        gridApi.url = XuiHelper.appendFilterProps(gridApi.url,fixedProps)
+
+        let filter = gridModel.filter;
     ]]></c:script>
 
     <c:if test="${pageModel.type == 'picker'}">
@@ -19,7 +23,7 @@
         <!--
         amis的picker控件要求source同时提供获取初始值和查询列表的功能，而没有使用pickerSchema中定义的api
         -->
-        <source xpl:attrs="xpl('thisLib:NormalizeApi',pageModel.table.api,genScope)" valueField="id" labelField="${objMeta?.displayProp}" filter="${gridModel.filter?.toJsonObject()}"/>
+        <source xpl:attrs="xpl('thisLib:NormalizeApi',gridApi,genScope)" valueField="id" labelField="${objMeta?.displayProp}" filter="${filter?.toJsonObject()}"/>
     </c:if>
 
     <!--
@@ -52,7 +56,7 @@
             <pagination id="pagination"/>
         </footerToolbar>
 
-        <api xpl:attrs="xpl('thisLib:NormalizeApi',pageModel.table.api || gridModel.api,genScope)" filter="${gridModel.filter?.toJsonObject()}"/>
+        <api xpl:attrs="xpl('thisLib:NormalizeApi',gridApi,genScope)" filter="${filter?.toJsonObject()}"/>
 
         <saveOrderApi xpl:attrs="xpl('thisLib:NormalizeApi',pageModel.table?.saveOrderApi || gridModel.saveOrderApi,genScope)"
                       xpl:if="pageModel.table?.saveOrderApi || gridModel.saveOrderApi"/>
@@ -70,7 +74,7 @@
         </filter>
 
         <columns j:list="true">
-            <thisLib:GenGridCols gridModel="${gridModel}" objMeta="${objMeta}"/>
+            <thisLib:GenGridCols gridModel="${gridModel}" objMeta="${objMeta}" ignoreCols="${genScope.fixedProps}"/>
             <operation label="@i18n:common.operation" id="operation" width="${pageModel.table?.operationSize || '110px'}"
                        toggled="@:true" fixed="right" labelClassName="text-center"
                        xpl:if="!pageModel.table?.noOperations">
diff --git a/nop-xdefs/src/main/resources/_vfs/nop/schema/excel/imp.xdef b/nop-xdefs/src/main/resources/_vfs/nop/schema/excel/imp.xdef
index a4345f64b..bc8fdcf00 100644
--- a/nop-xdefs/src/main/resources/_vfs/nop/schema/excel/imp.xdef
+++ b/nop-xdefs/src/main/resources/_vfs/nop/schema/excel/imp.xdef
@@ -51,6 +51,7 @@
             <fields xdef:body-type="list" xdef:key-attr="name">
                 <!--
                 @list 是否列表定义，解析得到List类型，内部fields定义的是列表条目对象的属性。
+                @keyProp 当list=true时，keyProp表示集合中每个对象采用这个属性作为唯一键。解析的得到的列表会使用KeyedList对象
                 @computed 是否计算字段。计算字段不需要从文件读取，而是通过valueExpr计算
                 @virtual 虚拟字段不会设置到实体上。只是会运行valueExpr表达式
                 @prop 实际设置到record上的属性名，如果为空，则prop与name相同
diff --git a/nop-xdefs/src/main/resources/_vfs/nop/schema/xui/action.xdef b/nop-xdefs/src/main/resources/_vfs/nop/schema/xui/action.xdef
index 681a8a96b..48e351be6 100644
--- a/nop-xdefs/src/main/resources/_vfs/nop/schema/xui/action.xdef
+++ b/nop-xdefs/src/main/resources/_vfs/nop/schema/xui/action.xdef
@@ -16,7 +16,7 @@
         level="string" size="string" required="csv-list"
         target="string" redirect="string" reload="string" countDown="int" countDownTpl="string"
         link="string" url="string" blank="boolean" copyFormat="string" content="string"
-        xdef:name="UiActionModel" xdef:bean-tag-prop="type">
+        xdef:name="UiActionModel" xdef:bean-tag-prop="type" xdef:check-ns="xui,gql">
 
     <confirmText xdef:value="string"/>
     <disabledOn xdef:value="string"/>
diff --git a/nop-xdefs/src/main/resources/_vfs/nop/schema/xui/api.xdef b/nop-xdefs/src/main/resources/_vfs/nop/schema/xui/api.xdef
index 89836eec3..b00da58f5 100644
--- a/nop-xdefs/src/main/resources/_vfs/nop/schema/xui/api.xdef
+++ b/nop-xdefs/src/main/resources/_vfs/nop/schema/xui/api.xdef
@@ -13,9 +13,9 @@
 @withFormData 明确在data部分中包含form表单中的字段
 -->
 <api xmlns:x="/nop/schema/xdsl.xdef" x:schema="/nop/schema/xdef.xdef"
-     xmlns:xdef="/nop/schema/xdef.xdef" xdef:bean-class="java.util.Map"
+     xmlns:xdef="/nop/schema/xdef.xdef" xdef:bean-class="java.util.Map" xdef:check-ns="gql" xmlns:gql="gql"
      url="#!string" method="string" convertKeyToPath="boolean"
-     dataType="string" cache="int" responseType="string"
+     dataType="string" cache="int" responseType="string" gql:selection="string"
      replaceData="boolean" autoRefresh="boolean" trackExpression="string" withFormData="boolean">
 
     <headers xdef:value="xjson"/>