@uxda/appkit 1.2.76 → 1.2.78

package/dist/index.js

@@ -4445,7 +4445,7 @@ var script$a = /* @__PURE__ */ defineComponent({
       emits("jump");
     }
     function toUser1() {
-      props?.mobile && toUser();
+      props.mobile && toUser();
     }
     function toLogin() {
       emits("login");
@@ -6695,11 +6695,11 @@ function useDragBox() {
     dragData.left = data.left * scale || 0;
     dragData.top = data.top * scale || 0;
     dragData.oldLeft = data.left * scale || 0;
-    if (data?.limitHorizontal?.length) {
-      dragData.limitHorizontal = data?.limitHorizontal;
+    if (data.limitHorizontal && data.limitHorizontal.length) {
+      dragData.limitHorizontal = data.limitHorizontal;
     }
-    if (data?.limitVertical?.length) {
-      dragData.limitVertical = data?.limitVertical;
+    if (data.limitVertical && data.limitVertical.length) {
+      dragData.limitVertical = data.limitVertical;
     }
   }
   function onDragStart(event) {
@@ -6783,7 +6783,7 @@ var script$2 = /* @__PURE__ */ defineComponent({
     withTabbar: { type: Boolean, required: false, default: false },
     withNavbar: { type: Boolean, required: false, default: false }
   },
-  emits: ["close", "jump"],
+  emits: ["close", "jump", "drag"],
   setup(__props, { emit: __emit }) {
     const props = __props;
     function onClose() {
@@ -6797,6 +6797,14 @@ var script$2 = /* @__PURE__ */ defineComponent({
     const dragStyle = computed(() => {
       return `left:${dragData.left}px; top:${dragData.top}px; width:${dragData.width}px; height:${dragData.height}px;`;
     });
+    function onDragMoveHandler(e) {
+      emits("drag", true);
+      onDragMove(e);
+    }
+    function onDragEndHandler() {
+      emits("drag", false);
+      onDragEnd();
+    }
     const {
       dragData: dragData1,
       initDragData: initDragData1,
@@ -6807,13 +6815,24 @@ var script$2 = /* @__PURE__ */ defineComponent({
     const dragStyle1 = computed(() => {
       return `left:${dragData1.left}px; top:${dragData1.top}px; width:${dragData1.width}px; height:${dragData1.height}px;`;
     });
+    function onDragMoveHandler1(e) {
+      emits("drag", true);
+      onDragMove1(e);
+    }
+    function onDragEndHandler1() {
+      emits("drag", false);
+      onDragEnd1();
+    }
     onMounted(async () => {
+      const systemInfo = Taro.getSystemInfoSync();
+      const safeHeight = (systemInfo.safeArea || {}).height || systemInfo.screenHeight;
+      const height = safeHeight > 620 ? 620 : safeHeight - 80;
       const navbarHeight = safeArea.nav + safeArea.status;
       initDragData({
         width: 40,
         height: 40,
         left: 324,
-        top: props.withNavbar ? 620 - navbarHeight : 620,
+        top: props.withNavbar ? height - navbarHeight : height,
         limitVertical: [
           !props.withNavbar ? navbarHeight : 0,
           props.withTabbar ? safeArea.menuRect.bottom : 0
@@ -6823,7 +6842,7 @@ var script$2 = /* @__PURE__ */ defineComponent({
         width: 92,
         height: 43,
         left: 272,
-        top: props.withNavbar ? 620 - navbarHeight : 620,
+        top: props.withNavbar ? height - navbarHeight : height,
         limitVertical: [
           !props.withNavbar ? navbarHeight : 0,
           props.withTabbar ? safeArea.menuRect.bottom : 0
@@ -6839,10 +6858,8 @@ var script$2 = /* @__PURE__ */ defineComponent({
           style: normalizeStyle(dragStyle.value),
           onTouchstart: _cache[0] || (_cache[0] = //@ts-ignore
           (...args) => unref(onDragStart) && unref(onDragStart)(...args)),
-          onTouchmove: _cache[1] || (_cache[1] = //@ts-ignore
-          (...args) => unref(onDragMove) && unref(onDragMove)(...args)),
-          onTouchend: _cache[2] || (_cache[2] = //@ts-ignore
-          (...args) => unref(onDragEnd) && unref(onDragEnd)(...args)),
+          onTouchmove: onDragMoveHandler,
+          onTouchend: onDragEndHandler,
           class: "user-feedback-entry",
           onClick: onJump
         },
@@ -6854,12 +6871,10 @@ var script$2 = /* @__PURE__ */ defineComponent({
         {
           key: 1,
           style: normalizeStyle(dragStyle1.value),
-          onTouchstart: _cache[3] || (_cache[3] = //@ts-ignore
+          onTouchstart: _cache[1] || (_cache[1] = //@ts-ignore
           (...args) => unref(onDragStart1) && unref(onDragStart1)(...args)),
-          onTouchmove: _cache[4] || (_cache[4] = //@ts-ignore
-          (...args) => unref(onDragMove1) && unref(onDragMove1)(...args)),
-          onTouchend: _cache[5] || (_cache[5] = //@ts-ignore
-          (...args) => unref(onDragEnd1) && unref(onDragEnd1)(...args)),
+          onTouchmove: onDragMoveHandler1,
+          onTouchend: onDragEndHandler1,
           class: "user-feedback-entry hasStorage"
         },
         [

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@uxda/appkit",
-  "version": "1.2.76",
+  "version": "1.2.78",
   "description": "小程序应用开发包",
   "main": "dist/index.js",
   "module": "dist/index.ts",

package/src/shared/composables/useDragBox.ts

@@ -35,11 +35,11 @@ export function useDragBox() {
     dragData.top = data.top * scale || 0
     dragData.oldLeft = data.left * scale || 0
 
-    if (data?.limitHorizontal?.length) {
-      dragData.limitHorizontal = data?.limitHorizontal
+    if (data.limitHorizontal && data.limitHorizontal.length) {
+      dragData.limitHorizontal = data.limitHorizontal
     }
-    if (data?.limitVertical?.length) {
-      dragData.limitVertical = data?.limitVertical
+    if (data.limitVertical && data.limitVertical.length) {
+      dragData.limitVertical = data.limitVertical
     }
   }
 

package/src/user/components/UserEntry.vue

@@ -67,7 +67,7 @@ function toUser() {
 }
 
 function toUser1() {
-  props?.mobile && toUser()
+  props.mobile && toUser()
 }
 
 // 未登录时，点击前往登录

package/src/user/components/UserFeedbackEntry.vue

@@ -2,8 +2,8 @@
   <div
     :style="dragStyle"
     @touchstart="onDragStart"
-    @touchmove="onDragMove"
-    @touchend="onDragEnd"
+    @touchmove="onDragMoveHandler"
+    @touchend="onDragEndHandler"
     class="user-feedback-entry"
     @click="onJump"
     v-if="!hasStorage"
@@ -18,8 +18,8 @@
   <div
     :style="dragStyle1"
     @touchstart="onDragStart1"
-    @touchmove="onDragMove1"
-    @touchend="onDragEnd1"
+    @touchmove="onDragMoveHandler1"
+    @touchend="onDragEndHandler1"
     class="user-feedback-entry hasStorage"
     v-else
   >
@@ -42,6 +42,7 @@
 import { computed, onMounted } from 'vue'
 import { useDragBox } from '../../shared/composables/useDragBox'
 import { useSafeArea } from '../../shared/composables'
+import Taro from '@tarojs/taro'
 
 const props = withDefaults(
   defineProps<{
@@ -72,6 +73,14 @@ const { dragData, initDragData, onDragStart, onDragMove, onDragEnd } = useDragBo
 const dragStyle = computed(() => {
   return `left:${dragData.left}px; top:${dragData.top}px; width:${dragData.width}px; height:${dragData.height}px;`
 })
+function onDragMoveHandler(e: TouchEvent) {
+  emits('drag', true)
+  onDragMove(e)
+}
+function onDragEndHandler() {
+  emits('drag', false)
+  onDragEnd()
+}
 
 const {
   dragData: dragData1,
@@ -83,15 +92,27 @@ const {
 const dragStyle1 = computed(() => {
   return `left:${dragData1.left}px; top:${dragData1.top}px; width:${dragData1.width}px; height:${dragData1.height}px;`
 })
+function onDragMoveHandler1(e: TouchEvent) {
+  emits('drag', true)
+  onDragMove1(e)
+}
+function onDragEndHandler1() {
+  emits('drag', false)
+  onDragEnd1()
+}
 
 onMounted(async () => {
+  const systemInfo = Taro.getSystemInfoSync()
+  const safeHeight = (systemInfo.safeArea || {}).height || systemInfo.screenHeight
+  const height = safeHeight > 620 ? 620 : safeHeight - 80
+
   const navbarHeight = safeArea.nav + safeArea.status
   // 初始化拖拽元素
   initDragData({
     width: 40,
     height: 40,
     left: 324,
-    top: props.withNavbar ? 620 - navbarHeight : 620,
+    top: props.withNavbar ? height - navbarHeight : height,
     limitVertical: [
       !props.withNavbar ? navbarHeight : 0,
       props.withTabbar ? safeArea.menuRect.bottom : 0,
@@ -101,7 +122,7 @@ onMounted(async () => {
     width: 92,
     height: 43,
     left: 272,
-    top: props.withNavbar ? 620 - navbarHeight : 620,
+    top: props.withNavbar ? height - navbarHeight : height,
     limitVertical: [
       !props.withNavbar ? navbarHeight : 0,
       props.withTabbar ? safeArea.menuRect.bottom : 0,
@@ -110,7 +131,7 @@ onMounted(async () => {
 })
 
 // 父组件事件
-const emits = defineEmits(['close', 'jump'])
+const emits = defineEmits(['close', 'jump', 'drag'])
 </script>
 
 <style lang="scss">