@lambo-design/shared 1.0.0-beta.382 → 1.0.0-beta.384

package/directives/module/draggable-menu.js

@@ -1,5 +1,5 @@
 import {on} from '@lambo-design/shared/utils/dom'
-import {buildMenuUri} from '@lambo-design/shared/utils/platform'
+import {addOttCode, buildMenuUri} from '@lambo-design/shared/utils/platform'
 import config from '@lambo-design/shared/config/config'
 
 export default {
@@ -29,15 +29,15 @@ export default {
         canMove = false
       }
     }
-    const handleMousemove = e => {
+    const handleMousemove = async e => {
       let xOffset = e.pageX - pageX + transformX
       let yOffset = e.pageY - pageY + transformY
       if (canMove) {
         bodyDom.style.transform = `translate(${xOffset}px, ${yOffset}px)`
         //bodyDom.style.position = `absolute`
         //bodyDom.style.zIndex = `99999`
-        if ( Math.abs(xOffset) > parseInt(config.draggableMenuConfig.xOffset)
-            || Math.abs(yOffset) > parseInt(config.draggableMenuConfig.yOffset) ) {
+        if (Math.abs(xOffset) > parseInt(config.draggableMenuConfig.xOffset)
+            || Math.abs(yOffset) > parseInt(config.draggableMenuConfig.yOffset)) {
           hasMove = true;
         }
       }
@@ -57,12 +57,13 @@ export default {
               let bodyDom = document.querySelector(binding.value.body)
               bodyDom.style.transform = ''
             }
+            item = await addOttCode(item)
             window.open(buildMenuUri(item))
           }
         }
       }
     }
-    const handleMouseup = e => {
+    const handleMouseup = async e => {
       if (binding.value.item && hasMove) {
         let item = binding.value.item;
         if (item.uri) {
@@ -72,6 +73,7 @@ export default {
             let bodyDom = document.querySelector(binding.value.body)
             bodyDom.style.transform = ''
           }
+          item = await addOttCode(item)
           window.open(buildMenuUri(item))
         }
       }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lambo-design/shared",
-  "version": "1.0.0-beta.382",
+  "version": "1.0.0-beta.384",
   "description": "",
   "main": "index.js",
   "author": "lambo",

package/utils/platform.js

@@ -779,7 +779,22 @@ export const isOpenBlank = (menu) => {
   }
   return false;
 }
-
+export const isYqqh = (menu) => {
+  let extendProps = {}
+  if (menu && menu.meta && menu.meta.data && menu.meta.data.extension) {
+    extendProps = JSON.parse(menu.meta.data.extension)
+  }
+  if (menu && menu.extension) {
+    extendProps = JSON.parse(menu.extension)
+  }
+  if (extendProps && extendProps.is_yqqh && extendProps.is_yqqh == '1') {
+    return true;
+  }
+  if (extendProps && extendProps.isYqqh && extendProps.isYqqh == '1') {
+    return true;
+  }
+  return false;
+}
 /**
  * 判断应用是否为移动应用
  * @param app
@@ -1319,8 +1334,8 @@ export const getOttCode = async () => {
   return ott;
 }
 export const addOttCode = async (item) => {
-  if (item && item.uri && item.is_yqqh == 1) {
-    let ott = getOttCode();
+  if (item && item.uri && isYqqh(item)) {
+    let ott = await getOttCode();
     if (ott) {
       item.ott = ott;
     }