更新部分代码

pom.xml

@@ -213,6 +213,8 @@
 		<module>ruoyi-quartz</module>
 		<module>ruoyi-generator</module>
         <module>ruoyi-common</module>
+		<module>ruoyi-imark</module>
+		<module>ruoyi-cloud</module>
 	</modules>
     <packaging>pom</packaging>
 

ruoyi-admin/src/main/resources/application-druid.yml

@@ -8,7 +8,7 @@ spring:
             master:
                 url: jdbc:mysql://localhost:3306/ry?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
                 username: root
-                password: password
+                password: control
             # 从库数据源
             slave:
                 # 从数据源开关/默认关闭

ruoyi-admin/src/main/resources/static/ajax/libs/bootstrap-table/extensions/columns/bootstrap-table-fixed-columns.js

@@ -57,7 +57,7 @@
             this.$rightfixedBodyColumns = this.$rightfixedBody.find('tbody');
             this.$tableBody.before(this.$rightfixedBody);
             if (this.options.fixedColumns) {
-                $('.right-fixed-table-columns').attr('style','right:0px');
+                $('.right-fixed-table-columns').attr('style','right:0px;');
             }
         }
     };
@@ -183,21 +183,16 @@
             this.$fixedHeader.width(headerWidth + 2).show();
         }
         if (that.options.rightFixedColumns) {
+            headerWidth = 0;
+            var totalLength = $("#" + table.options.id).find('th').length;
             this.$body.find('tr:first-child:not(.no-records-found) > *').each(function (i) {
                 var $this = $(this),
-                    index = i;
+                    index = totalLength - i - 1;
 
-                if (i >= visibleFields.length - that.options.rightFixedNumber) {
+                if (i >= that.options.rightFixedNumber) {
                     return false;
-
-
-                    if (that.options.detailView && !that.options.cardView) {
-                       index = i - 1;
-                    }
-                    that.$rightfixedBody.find('thead th[data-field="' + visibleFields[index] + '"]')
-                        .find('.fht-cell').width($this.innerWidth() - 1);
-                    headerWidth += $this.outerWidth();
                 }
+                headerWidth += $("#"  + table.options.id).find("tr:first-child>th").eq(index).width();
             });
             this.$rightfixedBody.width(headerWidth - 1).show();
         }
@@ -221,7 +216,7 @@
 
             this.$fixedBody.css({
                 width: this.$fixedHeader.width(),
-                height: height,
+                height: height - 12,
                 top: top + 1
             }).show();
 
@@ -230,6 +225,7 @@
             var resizeHeight = bsHeight > fixedHeight ? bsHeight: fixedHeight;
             this.$body.find('> tr').each(function (i) {
                 that.$fixedBody.find('tr:eq(' + i + ')').height(i == 0 ? resizeHeight - 1 : resizeHeight);
+                $("#" + table.options.id).find('tbody>tr:eq(' + i + ')').height(resizeHeight);
                 var thattds = this;
                 that.$fixedBody.find('tr:eq(' + i + ')').find('td').each(function (j) {
                     $(this).width($($(thattds).find('td')[j]).width() + 1);

ruoyi-admin/src/main/resources/templates/demo/table/fixedColumns.html

@@ -36,6 +36,8 @@
 		        showColumns: false,
 		        fixedColumns: true,
     		    fixedNumber: 3,
+				rightFixedColumns: true,
+				rightFixedNumber: 3,
                 columns: [{
 		            checkbox: true
 		        },

ruoyi-cloud/pom.xml

@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <artifactId>ruoyi</artifactId>
+        <groupId>com.ruoyi</groupId>
+        <version>4.3.1</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>ruoyi-cloud</artifactId>
+
+</project>

ruoyi-generator/src/main/resources/generator.yml

@@ -2,10 +2,10 @@
 # 代码生成
 gen: 
   # 作者
-  author: ruoyi
+  author: GideonYeung
   # 默认生成包路径 system 需改成自己的模块名称 如 system monitor tool
-  packageName: com.ruoyi.system
+  packageName: com.ruoyi.dataentry
   # 自动去除表前缀，默认是false
-  autoRemovePre: false
+  autoRemovePre: true
   # 表前缀（生成类名不会包含表前缀，多个用逗号分隔）
-  tablePrefix: sys_
+  tablePrefix: db_

ruoyi-imark/pom.xml

@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <artifactId>ruoyi</artifactId>
+        <groupId>com.ruoyi</groupId>
+        <version>4.3.1</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>ruoyi-imark</artifactId>
+
+    <dependencies>
+
+        <!--通用模块-->
+        <dependency>
+            <groupId>com.ruoyi</groupId>
+            <artifactId>ruoyi-common</artifactId>
+        </dependency>
+
+        <!-- Mysql驱动包 -->
+        <dependency>
+            <groupId>mysql</groupId>
+            <artifactId>mysql-connector-java</artifactId>
+        </dependency>
+
+        <!-- 核心模块-->
+        <dependency>
+            <groupId>com.ruoyi</groupId>
+            <artifactId>ruoyi-framework</artifactId>
+        </dependency>
+
+    </dependencies>
+
+</project>