From 78b2723b04243ed3159e283cda6c10dbf203073e Mon Sep 17 00:00:00 2001
From: aixianling <aixianling@sinoecare.com>
Date: Wed, 14 Sep 2022 11:32:53 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BE=A4=E4=BD=93=E4=BC=98=E5=8C=96=E4=BC=81?=
 =?UTF-8?q?=E5=BE=AEjssdk=20api=E8=B0=83=E7=94=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/common/modules.js | 34 ++++++++++++++--------------------
 1 file changed, 14 insertions(+), 20 deletions(-)

diff --git a/src/common/modules.js b/src/common/modules.js
index 864b4872..ec975fbc 100644
--- a/src/common/modules.js
+++ b/src/common/modules.js
@@ -262,15 +262,18 @@ export const wxwork = {
       })
       return inject([apis].flat().filter(Boolean))
     },
-    previewFile({dispatch, state}, op) {
+    injectSDK({dispatch, state}, apis) {
+      const {corpId, suiteId} = state.config
+      return dispatch('agentSign', {corpId, suiteId}).then(() => dispatch("injectJWeixin", [apis].flat()))
+    },
+    previewFile({dispatch}, op) {
       if (window.navigator.userAgent.indexOf("Windows NT") > -1) {
         uni.showToast({
           title: "企业微信暂不支持PC端的预览文件!",
           icon: 'none'
         })
       } else {
-        const {corpId, suiteId} = state.config
-        dispatch('agentSign', {corpId, suiteId}).then(() => dispatch("injectJWeixin", "previewFile")).then(() => {
+        dispatch("injectSDK", "previewFile").then(() => {
           setTimeout(() => {
             let sdk = typeof wx?.invoke == 'function' ? wx : jWeixin
             sdk?.invoke('previewFile', {...op}, res => {
@@ -280,19 +283,17 @@ export const wxwork = {
         })
       }
     },
-    closeAgent({dispatch, state}) {
-      const {corpId, suiteId} = state.config
-      dispatch('agentSign', {corpId, suiteId}).then(() => dispatch("injectJWeixin", "closeWindow")).then(() => {
+    closeAgent({dispatch}) {
+      dispatch("injectSDK", "closeWindow").then(() => {
         setTimeout(() => {
           let sdk = typeof wx?.closeWindow == 'function' ? wx : jWeixin
           sdk?.closeWindow()
         }, 500)
       })
     },
-    selectEnterpriseContact({dispatch, state}, params) {
-      const {corpId, suiteId} = state.config
+    selectEnterpriseContact({dispatch}, params) {
       return new Promise((resolve, reject) => {
-        dispatch('agentSign', {corpId, suiteId}).then(() => dispatch("injectJWeixin", "selectEnterpriseContact")).then(() => {
+        dispatch("injectSDK", "selectEnterpriseContact").then(() => {
           setTimeout(() => {
             let sdk = typeof wx?.invoke == 'function' ? wx : jWeixin
             sdk?.invoke("selectEnterpriseContact", {
@@ -314,10 +315,9 @@ export const wxwork = {
         })
       })
     },
-    selectPrivilegedContact({dispatch, state}, params) {
-      const {corpId, suiteId} = state.config
+    selectPrivilegedContact({dispatch}, params) {
       return new Promise((resolve, reject) => {
-        dispatch('agentSign', {corpId, suiteId}).then(() => dispatch("injectJWeixin", "selectPrivilegedContact")).then(() => {
+        dispatch("injectSDK", "selectPrivilegedContact").then(() => {
           setTimeout(() => {
             let sdk = typeof wx?.invoke == 'function' ? wx : jWeixin
             sdk?.invoke("selectPrivilegedContact", {
@@ -341,8 +341,6 @@ export const wxwork = {
       })
     },
     initOpenData({dispatch, commit, state}, params = {}) {
-      const {corpId, suiteId} = state.config
-      params = {corpId, suiteId, ...params}
       const loadSdk = (count = 0) => {
         if (!!window?.WWOpenData) {
           const canvas = params?.canvas
@@ -355,7 +353,7 @@ export const wxwork = {
             window?.WWOpenData?.checkSession({
               success: () => init(),
               fail: () => {
-                dispatch('agentSign', params).then(() => dispatch("injectJWeixin", "initWwOpenData")).then(() => init())
+                dispatch("injectSDK", "initWwOpenData").then(() => init())
               }
             })
           }, 500)
@@ -367,7 +365,7 @@ export const wxwork = {
           }, 200)
         }
       }
-      dispatch('agentSign', params).then(() => dispatch("injectJWeixin", "initWwOpenData")).then(() => loadSdk())
+      dispatch("injectSDK", "initWwOpenData").then(() => loadSdk())
     },
     bindElements() {
       const nodes = document.querySelectorAll('.AiOpenData')
@@ -383,10 +381,6 @@ export const wxwork = {
         })
       })
     },
-    injectSDK({dispatch, state}, apis) {
-      const {corpId, suiteId} = state.config
-      return dispatch('agentSign', {corpId, suiteId}).then(() => dispatch("injectJWeixin", [apis].flat()))
-    },
     shareToExternalChat({dispatch}, params) {
       return new Promise(resolve => {
         dispatch("injectSDK", "shareToExternalChat").then(() => window?.wx?.invoke("shareToExternalChat", {...params}, resolve) || console.error("jssdk未成功加载!"))