zhujiamin 发布系统代码 [TrainSys，网页端]

app_Web/packages/ibiz-vue/src/utils/app-drawer/app-drawer.vue

@@ -5,6 +5,7 @@
         :closable="false"
         v-model="isShow"
         :width="width"
+        :before-close="beforeClose"
         @on-visible-change="onVisibleChange($event)"
         @on-close="close(tempResult)"
     >
@@ -42,7 +43,7 @@ export default class AppDrawerCompponent extends Vue {
      * 视图动态参数
      *
      * @type {any}
-     * @memberof AppModal
+     * @memberof AppDrawerCompponent
      */ 
     @Prop({default:{}}) public dynamicProps?:any;
 
@@ -50,7 +51,7 @@ export default class AppDrawerCompponent extends Vue {
      * 视图静态参数
      *
      * @type {any}
-     * @memberof AppModal
+     * @memberof AppDrawerCompponent
      */ 
     @Prop({default:{}}) public staticProps?:any;
 
@@ -110,10 +111,18 @@ export default class AppDrawerCompponent extends Vue {
      */ 
     public zIndex:any = null;
 
+    /**
+     * 是否在抽屉区按下鼠标
+     *
+     * @type {any}
+     * @memberof AppDrawerCompponent
+     */ 
+    public isMouseDown: boolean = false;
+
     /**
      * 获取数据传递对象
      *
-     * @memberof AppModal
+     * @memberof AppDrawerCompponent
      */ 
     public getSubject(){
         return this.subject;
@@ -144,7 +153,7 @@ export default class AppDrawerCompponent extends Vue {
         } else {
             this.width = 800;
         }
-        document.onkeydown = (e) => {
+        document.onkeydown = (e: any) => {
             var keyCode = e.keyCode || e.which || e.charCode;
             if (keyCode == 27) {
                 const zIndex = this.$store.getters.getZIndex();
@@ -154,6 +163,18 @@ export default class AppDrawerCompponent extends Vue {
                 this.isShow = false;
             }
         }
+        // 监听鼠标是否在抽屉内容区按下
+        document.onmousedown = (e: any) => {
+            const documentPaths = e.path;
+            this.isMouseDown = false;
+            if (documentPaths?.length > 0) {
+                documentPaths.forEach((path: any) => {
+                    if (path.className == 'ivu-drawer-content') {
+                        this.isMouseDown = true;
+                    }
+                })
+            }
+        }
     }
 
     /**
@@ -196,6 +217,21 @@ export default class AppDrawerCompponent extends Vue {
         warpTag.style.zIndex = this.zIndex;
     }
 
+    /**
+     * 关闭之前
+     * 在内容区按下鼠标，在其他地方松开鼠标时不关闭抽屉
+     * @memberof AppDrawerCompponent
+     */ 
+    public beforeClose() {
+        return new Promise((resolve: any, reject: any) => {
+            if (this.isMouseDown) {
+                this.isMouseDown = false;
+                return
+            }
+            resolve(true)
+        })
+    }
+
     /**
      * 关闭回调
      *
@@ -285,9 +321,6 @@ export default class AppDrawerCompponent extends Vue {
         }, 500)
     }
 
-
-
-
 }
 </script>
 <style lang="less">

trainsys-core/src/main/resources/liquibase/h2_table.xml

@@ -194,7 +194,7 @@
     </changeSet>
 
     <!--输出实体[REGINFO]数据结构 -->
-    <changeSet author="root" id="tab-reginfo-60-8">
+    <changeSet author="root" id="tab-reginfo-62-8">
         <createTable tableName="T_REGINFO">
                 <column name="UPDATEDATE" remarks="" type="DATETIME">
                 </column>

trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSMODULES/common/PSDATAENTITIES/Reginfo.json

@@ -1121,10 +1121,12 @@
           "dEFName" : "STUNO",
           "name" : "[常规条件] 等于(=) 数据对象属性(testaaa)",
           "paramType" : "ENTITYFIELD",
-          "paramValue" : "testaaa"
-        } ]
+          "paramValue" : "testaaa",
+          "ruleInfo" : "文本值为testaaa"
+        } ],
+        "ruleInfo" : "文本值为testaaa"
       },
-      "ruleInfo" : "测试实体值规则",
+      "ruleInfo" : "文本值为testaaa",
       "checkDefault" : false,
       "defaultMode" : false,
       "enableBackend" : true,

trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDATAENTITIES/Reginfo/PSGRIDS/Main.json

@@ -256,10 +256,12 @@
           "dEFName" : "STUNO",
           "name" : "[常规条件] 等于(=) 数据对象属性(testaaa)",
           "paramType" : "ENTITYFIELD",
-          "paramValue" : "testaaa"
-        } ]
+          "paramValue" : "testaaa",
+          "ruleInfo" : "文本值为testaaa"
+        } ],
+        "ruleInfo" : "文本值为testaaa"
       },
-      "ruleInfo" : "测试实体值规则",
+      "ruleInfo" : "文本值为testaaa",
       "checkDefault" : false,
       "defaultMode" : false,
       "enableBackend" : true,

trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSAPPDEVIEWS/ReginfoStuInfoList.json

@@ -685,10 +685,12 @@
             "dEFName" : "STUNO",
             "name" : "[常规条件] 等于(=) 数据对象属性(testaaa)",
             "paramType" : "ENTITYFIELD",
-            "paramValue" : "testaaa"
-          } ]
+            "paramValue" : "testaaa",
+            "ruleInfo" : "文本值为testaaa"
+          } ],
+          "ruleInfo" : "文本值为testaaa"
         },
-        "ruleInfo" : "测试实体值规则",
+        "ruleInfo" : "文本值为testaaa",
         "checkDefault" : false,
         "defaultMode" : false,
         "enableBackend" : true,

trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSSYSAPP.json

@@ -2143,10 +2143,12 @@
                 "dEFName" : "STUNO",
                 "name" : "[常规条件] 等于(=) 数据对象属性(testaaa)",
                 "paramType" : "ENTITYFIELD",
-                "paramValue" : "testaaa"
-              } ]
+                "paramValue" : "testaaa",
+                "ruleInfo" : "文本值为testaaa"
+              } ],
+              "ruleInfo" : "文本值为testaaa"
             },
-            "ruleInfo" : "测试实体值规则",
+            "ruleInfo" : "文本值为testaaa",
             "checkDefault" : false,
             "defaultMode" : false,
             "enableBackend" : true,