no message

cmd

@@ -419,11 +419,10 @@ if [ $# -gt 0 ]; then
         fi
         # 目录权限
         volumes=(
-            "docker/log/supervisor"
+            "bootstrap/cache"
-            "docker/mysql/data"
+            "docker"
-            "docker/office/logs"
+            "public"
-            "docker/office/data"
+            "storage"
-            "docker/es/data"
         )
         cmda=""
         cmdb=""

resources/assets/js/directives/longpress.js

@@ -3,14 +3,16 @@ const isSupportTouch = "ontouchend" in document;
 // 长按或右键指令
 const longpress = {
     bind: function (el, binding) {
-        let delay = 500,
+        let mode = 'default',
-            mode = 'default',
             isCall = false,
             pressTimer = null,
+            delay = 500,        // 延迟时间，长按多久触发（毫秒）
+            touchend = null,        // 触摸结束回调
             callback = binding.value;   // 回调函数：第一个参数是事件对象（点到的对象），第二个参数是元素对象（注册绑定的对象）
         if ($A.isJson(binding.value)) {
             delay = binding.value.delay || 500;
-            callback = binding.value.callback;
+            touchend = typeof binding.value.touchend === 'function' ? binding.value.touchend : touchend;
+            callback = typeof binding.value.callback === 'function' ? binding.value.callback : callback;
         }
         if (typeof callback !== 'function') {
             throw 'callback must be a function'
@@ -57,6 +59,14 @@ const longpress = {
             mode = 'default'
         }
 
+        // 触摸结束
+        el.__longpressEnd__ = (e) => {
+            if (typeof touchend === 'function') {
+                touchend(e, el)
+            }
+            el.__longpressCancel__(e)
+        }
+
         // 点击拦截
         el.__longpressClick__ = (e) => {
             if (isCall) {
@@ -70,8 +80,8 @@ const longpress = {
         el.addEventListener('touchstart', el.__longpressStart__)
         el.addEventListener('click', el.__longpressClick__)
         el.addEventListener('touchmove', el.__longpressCancel__)
-        el.addEventListener('touchend', el.__longpressCancel__)
         el.addEventListener('touchcancel', el.__longpressCancel__)
+        el.addEventListener('touchend', el.__longpressEnd__)
     },
     // 指令与元素解绑的时候，移除事件绑定
     unbind(el) {
@@ -83,11 +93,12 @@ const longpress = {
         el.removeEventListener('touchstart', el.__longpressStart__)
         el.removeEventListener('click', el.__longpressClick__)
         el.removeEventListener('touchmove', el.__longpressCancel__)
-        el.removeEventListener('touchend', el.__longpressCancel__)
         el.removeEventListener('touchcancel', el.__longpressCancel__)
+        el.removeEventListener('touchend', el.__longpressEnd__)
         delete el.__longpressStart__
         delete el.__longpressClick__
         delete el.__longpressCancel__
+        delete el.__longpressEnd__
     }
 }
 

resources/assets/js/functions/eeui.js

@@ -165,7 +165,7 @@
             return this.eeuiModule()?.getCachesString(key, defaultVal);
         },
 
-        // 长按内容震动（仅支持android、iOS无效）
+        // 是否长按内容震动（仅支持android、iOS无效）
         eeuiAppSetHapticBackEnabled(val) {
             this.eeuiModule("webview").setHapticBackEnabled(val);
         },
@@ -304,20 +304,6 @@
             })
         },
 
-        // 添加导航栏遮罩
-        eeuiAppAddNavMask(color) {
-            return this.eeuiModule()?.addNavMask(color)
-        },
-
-        // 移除导航栏遮罩
-        eeuiAppRemoveNavMask(name = null) {
-            if (name === true) {
-                this.eeuiModule()?.removeAllNavMasks()  // 移除所有遮罩
-            } else if (name) {
-                this.eeuiModule()?.removeNavMask(name)  // 移除指定遮罩
-            }
-        },
-
         // 获取导航栏和状态栏高度
         eeuiAppGetSafeAreaInsets() {
             return new Promise(async (resolve, reject) => {

resources/assets/js/pages/manage/components/DialogWrapper.vue

@@ -185,7 +185,7 @@
         <div
             ref="msgs"
             class="dialog-msgs"
-            v-longpress="{callback: handleLongpress, delay: 300}">
+            v-longpress="{callback: handleLongpress, touchend: handleTouchend, delay: 300}">
             <!--定位提示-->
             <div v-if="positionShow && positionMsg" class="dialog-position">
                 <div class="position-label" @click="onPositionMark(positionMsg.msg_id)">
@@ -3090,6 +3090,14 @@ export default {
             }
         },
 
+        handleTouchend() {
+            if (this.keyboardShow) {
+                // 防止键盘关闭时菜单又隐藏
+                this.operatePreventScroll++
+                setTimeout(() => this.operatePreventScroll--, 300)
+            }
+        },
+
         onMsgType(type) {
             switch (type) {
                 case 'project':

resources/mobile

@@ -1 +1 @@
-Subproject commit b9a74ac8527e314b7045dd81472749cc63b2a08f
+Subproject commit b4a4cccfe4d2b3bcbfbb35e42fb7975374fede78