简化nop-rule的数据库结构

entropy-cloud · Jul 15, 2023 · a1d46cc · a1d46cc
1 parent 22867e6
commit a1d46cc
Show file tree

Hide file tree

Showing 22 changed files with 2,554 additions and 451 deletions.
diff --git a/docs/dev-guide/xui/xview.md b/docs/dev-guide/xui/xview.md
@@ -296,7 +296,7 @@ url: "@query:NopAuthDept__findList/value:id,label:deptName,children @TreeChildre
 ## 10. 表单数据过多，希望采用tab页的形式显示
 
 ```xml
-<form id="view" layoutComponent="tabs" >...</form>
+<form id="view" layoutControl="tabs" >...</form>
 ```
 
 配置layoutComponent=tabs。
diff --git a/nop-bom/pom.xml b/nop-bom/pom.xml
@@ -272,29 +272,47 @@
                 <version>${nop-entropy.version}</version>
             </dependency>
 
+
             <dependency>
                 <groupId>io.github.entropy-cloud</groupId>
-                <artifactId>nop-rule-api</artifactId>
+                <artifactId>nop-job</artifactId>
                 <version>${nop-entropy.version}</version>
             </dependency>
 
+
             <dependency>
                 <groupId>io.github.entropy-cloud</groupId>
-                <artifactId>nop-rule-core</artifactId>
+                <artifactId>nop-report-core</artifactId>
                 <version>${nop-entropy.version}</version>
             </dependency>
 
+            <dependency>
+                <groupId>io.github.entropy-cloud</groupId>
+                <artifactId>nop-report-dao</artifactId>
+                <version>${nop-entropy.version}</version>
+            </dependency>
 
             <dependency>
                 <groupId>io.github.entropy-cloud</groupId>
-                <artifactId>nop-job</artifactId>
+                <artifactId>nop-report-service</artifactId>
+                <version>${nop-entropy.version}</version>
+            </dependency>
+
+            <dependency>
+                <groupId>io.github.entropy-cloud</groupId>
+                <artifactId>nop-report-web</artifactId>
                 <version>${nop-entropy.version}</version>
             </dependency>
 
+            <dependency>
+                <groupId>io.github.entropy-cloud</groupId>
+                <artifactId>nop-report-demo</artifactId>
+                <version>${nop-entropy.version}</version>
+            </dependency>
 
             <dependency>
                 <groupId>io.github.entropy-cloud</groupId>
-                <artifactId>nop-report-core</artifactId>
+                <artifactId>nop-report-spl</artifactId>
                 <version>${nop-entropy.version}</version>
             </dependency>
 
@@ -593,6 +611,36 @@
                 <version>${nop-entropy.version}</version>
             </dependency>
 
+            <dependency>
+                <groupId>io.github.entropy-cloud</groupId>
+                <artifactId>nop-rule-api</artifactId>
+                <version>${nop-entropy.version}</version>
+            </dependency>
+
+            <dependency>
+                <groupId>io.github.entropy-cloud</groupId>
+                <artifactId>nop-rule-core</artifactId>
+                <version>${nop-entropy.version}</version>
+            </dependency>
+
+            <dependency>
+                <groupId>io.github.entropy-cloud</groupId>
+                <artifactId>nop-rule-dao</artifactId>
+                <version>${nop-entropy.version}</version>
+            </dependency>
+
+            <dependency>
+                <groupId>io.github.entropy-cloud</groupId>
+                <artifactId>nop-rule-service</artifactId>
+                <version>${nop-entropy.version}</version>
+            </dependency>
+
+            <dependency>
+                <groupId>io.github.entropy-cloud</groupId>
+                <artifactId>nop-rule-web</artifactId>
+                <version>${nop-entropy.version}</version>
+            </dependency>
+
             <dependency>
                 <groupId>io.github.entropy-cloud</groupId>
                 <artifactId>nop-web-site</artifactId>

diff --git a/nop-demo/nop-quarkus-demo/pom.xml b/nop-demo/nop-quarkus-demo/pom.xml
@@ -68,46 +68,44 @@
         <dependency>
             <groupId>io.github.entropy-cloud</groupId>
             <artifactId>nop-auth-service</artifactId>
-            <version>2.0.0-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>io.github.entropy-cloud</groupId>
             <artifactId>nop-auth-web</artifactId>
-            <version>2.0.0-SNAPSHOT</version>
+        </dependency>
+
+        <dependency>
+            <groupId>io.github.entropy-cloud</groupId>
+            <artifactId>nop-rule-web</artifactId>
         </dependency>
 
         <dependency>
             <groupId>io.github.entropy-cloud</groupId>
             <artifactId>nop-sys-service</artifactId>
-            <version>2.0.0-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>io.github.entropy-cloud</groupId>
             <artifactId>nop-sys-web</artifactId>
-            <version>2.0.0-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>io.github.entropy-cloud</groupId>
             <artifactId>nop-graphql-gateway</artifactId>
-            <version>2.0.0-SNAPSHOT</version>
         </dependency>
 
 
         <!-- 引入报表测试文件和测试服务 -->
         <dependency>
             <groupId>io.github.entropy-cloud</groupId>
             <artifactId>nop-report-demo</artifactId>
-            <version>2.0.0-SNAPSHOT</version>
         </dependency>
 
         <!-- 引入集算器支持。如果不需要可以删除 -->
         <dependency>
             <groupId>io.github.entropy-cloud</groupId>
             <artifactId>nop-report-spl</artifactId>
-            <version>2.0.0-SNAPSHOT</version>
         </dependency>
 
         <dependency>