@aochuang/client-sdk 1.0.377 → 1.0.378-wework

package/services/socket/socket.js

@@ -373,11 +373,13 @@ export default class Socket {
         if (this.messageCallbackMap[messageData.seq]) {
             if (messageData.code === -1) {
                 this.messageCallbackMap[messageData.seq].reject({
-                    errMsg: messageData.extra
+                    errMsg: messageData.extra,
+                    response: messageData
                 })
             } else {
                 this.messageCallbackMap[messageData.seq].resolve({
-                    data: messageData.extra
+                    data: messageData.extra,
+                    response: messageData
                 })
             }
         }
@@ -552,10 +554,18 @@ export default class Socket {
                 messageId,
                 message: nextMessage,
                 resolve: (data) => {
-                    messagePromise.resolve(data)
+                    const resolveData = {
+                        data: data.data,
+                        response: data.response
+                    }
+                    messagePromise.resolve(resolveData)
                     messageObject.destroy()
                     callback && callback({
-                        data
+                        data: resolveData
+                    })
+                    this.event.emit('onSendMessageSuccess', {
+                        data: data.response,
+                        message: nextMessage
                     })
                 },
                 reject: (err) => {

package/components/wework-chat-panel/chat-panel-controls/company-card/company-card.vue

@@ -1,35 +0,0 @@
-<script>
-import SdkChatPanelBox from '../../../chat-panel/chat-panel-box'
-import { companyCard } from '../../../wework-chat-control'
-
-export default {
-  name: 'SdkWeworkChatPanelControlsCompanyCard',
-  functional: true,
-  props: {
-    dir: {
-      type: String
-    },
-    data: {
-      type: Object,
-      required: true
-    },
-    fetchUserMethod: {
-      type: Function
-    }
-  },
-  render (h, c) {
-    const { props } = c
-    return h(SdkChatPanelBox, {
-      props: {
-        dir: props.dir,
-        data: props.data,
-        fetchUserMethod: props.fetchUserMethod
-      }
-    }, [h(companyCard, {
-      props: {
-        data: props.data
-      }
-    })])
-  }
-}
-</script>

package/components/wework-chat-panel/chat-panel-controls/expression/expression.vue

@@ -1,36 +0,0 @@
-<script>
-import { expression } from '../../../wework-chat-control'
-import SdkChatPanelBox from '../../../chat-panel/chat-panel-box'
-
-export default {
-  name: 'SdkWeworkChatPanelControlsExpression',
-  functional: true,
-  props: {
-    dir: {
-      type: String
-    },
-    data: {
-      type: Object,
-      default: () => ({})
-    },
-    fetchUserMethod: {
-      type: Function
-    }
-  },
-  render (h, c) {
-    const { props } = c
-    return h(SdkChatPanelBox, {
-      props: {
-        dir: props.dir,
-        data: props.data,
-        fetchUserMethod: props.fetchUserMethod
-      }
-    }, [h(expression, {
-      props: {
-        data: props.data
-      },
-      key: c.data.key
-    })])
-  }
-}
-</script>

package/components/wework-chat-panel/chat-panel-controls/file-url/file-url.vue

@@ -1,35 +0,0 @@
-<script>
-import SdkChatPanelBox from '../../../chat-panel/chat-panel-box'
-import { fileUrl } from '../../../wework-chat-control'
-
-export default {
-  name: 'SdkWeworkChatPanelControlsFileUrl',
-  functional: true,
-  props: {
-    dir: {
-      type: String
-    },
-    data: {
-      type: Object,
-      required: true
-    },
-    fetchUserMethod: {
-      type: Function
-    }
-  },
-  render (h, c) {
-    const { props } = c
-    return h(SdkChatPanelBox, {
-      props: {
-        dir: props.dir,
-        data: props.data,
-        fetchUserMethod: props.fetchUserMethod
-      }
-    }, [h(fileUrl, {
-      props: {
-        content: props.data.content
-      }
-    })])
-  }
-}
-</script>

package/components/wework-chat-panel/chat-panel-controls/image/image.vue

@@ -1,36 +0,0 @@
-<script>
-import { image } from '../../../wework-chat-control'
-import SdkChatPanelBox from '../../../chat-panel/chat-panel-box'
-
-export default {
-  name: 'SdkWeworkChatPanelControlsImage',
-  functional: true,
-  props: {
-    dir: {
-      type: String
-    },
-    data: {
-      type: Object,
-      default: () => ({})
-    },
-    fetchUserMethod: {
-      type: Function
-    }
-  },
-  render (h, c) {
-    const { props } = c
-    return h(SdkChatPanelBox, {
-      props: {
-        dir: props.dir,
-        data: props.data,
-        fetchUserMethod: props.fetchUserMethod
-      }
-    }, [h(image, {
-      props: {
-        data: props.data
-      },
-      key: c.data.key
-    })])
-  }
-}
-</script>

package/components/wework-chat-panel/chat-panel-controls/index.js

@@ -1,35 +0,0 @@
-import text from './text/text.vue'
-import link from './link/link.vue'
-import companyCard from './company-card/company-card.vue'
-import video from './video/video.vue'
-import image from './image/image.vue'
-import unkonw from './unkonw/unkonw.vue'
-import expression from './expression/expression.vue'
-import voice from './voice/voice.vue'
-import jxSysText from './jx-sys-text/jx-sys-text.vue'
-import fileUrl from './file-url/file-url.vue'
-import location from './location/location.vue'
-
-export default {
-  0: text,
-  2: text,
-  14: image,
-  101: image,
-  // '49': link,
-  22: video,
-  23: video,
-  103: video,
-  29: expression,
-  104: expression,
-  16: voice,
-  40: voice,
-  1011: jxSysText,
-  1022: jxSysText,
-  41: companyCard,
-  13: fileUrl,
-  15: fileUrl,
-  20: fileUrl,
-  102: fileUrl,
-  6: location,
-  unkonw
-}

package/components/wework-chat-panel/chat-panel-controls/jx-sys-text/jx-sys-text.vue

@@ -1,28 +0,0 @@
-<script>
-import { jxSysText } from '../../../wework-chat-control'
-
-export default {
-  name: 'SdkWeworkChatPanelControlsJxSysText',
-  functional: true,
-  props: {
-    dir: {
-      type: String
-    },
-    data: {
-      type: Object,
-      required: true
-    },
-    fetchUserMethod: {
-      type: Function
-    }
-  },
-  render (h, c) {
-    const { props } = c
-    return h(jxSysText, {
-      props: {
-        content: props.data.content
-      }
-    })
-  }
-}
-</script>

package/components/wework-chat-panel/chat-panel-controls/link/link.vue

@@ -1,35 +0,0 @@
-<script>
-import SdkChatPanelBox from '../../../chat-panel/chat-panel-box'
-import { link } from '../../../wework-chat-control'
-
-export default {
-  name: 'SdkWeworkChatPanelControlsLink',
-  functional: true,
-  props: {
-    dir: {
-      type: String
-    },
-    data: {
-      type: Object,
-      required: true
-    },
-    fetchUserMethod: {
-      type: Function
-    }
-  },
-  render (h, c) {
-    const { props } = c
-    return h(SdkChatPanelBox, {
-      props: {
-        dir: props.dir,
-        data: props.data,
-        fetchUserMethod: props.fetchUserMethod
-      }
-    }, [h(link, {
-      props: {
-        data: props.data
-      }
-    })])
-  }
-}
-</script>

package/components/wework-chat-panel/chat-panel-controls/location/location.vue

@@ -1,35 +0,0 @@
-<script>
-import SdkChatPanelBox from '../../../chat-panel/chat-panel-box'
-import { location } from '../../../wework-chat-control'
-
-export default {
-  name: 'SdkWeworkChatPanelControlsLocation',
-  functional: true,
-  props: {
-    dir: {
-      type: String
-    },
-    data: {
-      type: Object,
-      required: true
-    },
-    fetchUserMethod: {
-      type: Function
-    }
-  },
-  render (h, c) {
-    const { props } = c
-    return h(SdkChatPanelBox, {
-      props: {
-        dir: props.dir,
-        data: props.data,
-        fetchUserMethod: props.fetchUserMethod
-      }
-    }, [h(location, {
-      props: {
-        content: props.data.content
-      }
-    })])
-  }
-}
-</script>

package/components/wework-chat-panel/chat-panel-controls/text/text.vue

@@ -1,43 +0,0 @@
-<script>
-import SdkChatPanelBox from '../../../chat-panel/chat-panel-box'
-import { text } from '../../../wework-chat-control'
-
-export default {
-  name: 'SdkWeworkChatPanelControlsText',
-  functional: true,
-  props: {
-    dir: {
-      type: String
-    },
-    data: {
-      type: Object,
-      required: true
-    },
-    fetchUserMethod: {
-      type: Function
-    }
-  },
-  render (h, c) {
-    const { props } = c
-    return h(SdkChatPanelBox, {
-      class: 'sdk-chat-panel-controls-text',
-      props: {
-        dir: props.dir,
-        data: props.data,
-        fetchUserMethod: props.fetchUserMethod
-      }
-    }, [h('div', {
-      class: 'sdk-chat-panel-controls-text__main'
-    }, [h(text, {
-      props: {
-        data: props.data
-      }
-    })])])
-  }
-}
-</script>
-<style>
-.sdk-chat-panel-controls-text__main{
-  padding: 10px;
-}
-</style>

package/components/wework-chat-panel/chat-panel-controls/unkonw/unkonw.vue

@@ -1,39 +0,0 @@
-<template>
-  <sdk-chat-panel-box
-    :data="data"
-    :dir="dir"
-    :fetch-user-method="fetchUserMethod"
-  >
-    <div class="sdk-wework-chat-panel-controls-unkonw__main">
-      未知消息
-    </div>
-  </sdk-chat-panel-box>
-</template>
-<script>
-import SdkChatPanelBox from '../../../chat-panel/chat-panel-box'
-
-export default {
-  name: 'SdkWeworkChatPanelControlsUnkonw',
-  components: {
-    SdkChatPanelBox
-  },
-  props: {
-    dir: {
-      type: String
-    },
-    data: {
-      type: Object,
-      required: true
-    },
-    fetchUserMethod: {
-      type: Function
-    }
-  }
-}
-</script>
-<style lang="less">
-.sdk-wework-chat-panel-controls-unkonw__main{
-  padding: 12px;
-  color: #999;
-}
-</style>

package/components/wework-chat-panel/chat-panel-controls/video/video.vue

@@ -1,37 +0,0 @@
-<template>
-  <sdk-chat-panel-box
-    :data="data"
-    :dir="dir"
-    :fetch-user-method="fetchUserMethod"
-  >
-    <sdk-chat-control-video
-      :data="data"
-      width="240px"
-      height="180px"
-    ></sdk-chat-control-video>
-  </sdk-chat-panel-box>
-</template>
-<script>
-import SdkChatPanelBox from '../../../chat-panel/chat-panel-box'
-import { video } from '../../../wework-chat-control'
-
-export default {
-  name: 'SdkWeworkChatPanelControlsVideo',
-  components: {
-    SdkChatPanelBox,
-    SdkChatControlVideo: video
-  },
-  props: {
-    dir: {
-      type: String
-    },
-    data: {
-      type: Object,
-      required: true
-    },
-    fetchUserMethod: {
-      type: Function
-    }
-  }
-}
-</script>

package/components/wework-chat-panel/chat-panel-controls/voice/voice.vue

@@ -1,35 +0,0 @@
-<script>
-import SdkChatPanelBox from '../../../chat-panel/chat-panel-box'
-import { voice } from '../../../wework-chat-control'
-
-export default {
-  name: 'SdkWeworkChatPanelControlsVoice',
-  functional: true,
-  props: {
-    dir: {
-      type: String
-    },
-    data: {
-      type: Object,
-      required: true
-    },
-    fetchUserMethod: {
-      type: Function
-    }
-  },
-  render (h, c) {
-    const { props } = c
-    return h(SdkChatPanelBox, {
-      props: {
-        dir: props.dir,
-        data: props.data,
-        fetchUserMethod: props.fetchUserMethod
-      }
-    }, [h(voice, {
-      props: {
-        content: props.data.content
-      }
-    })])
-  }
-}
-</script>

package/uni-common/account-portray/account-portray.vue

@@ -1,51 +0,0 @@
-<template>
-	<bi-portray 
-		:avatar="accountData && accountData.avatar" 
-		:name="accountData && (accountData.memo || accountData.nickname)"
-		:loading="loading"
-	></bi-portray>
-</template>
-
-<script>
-import BiPortray from '@aochuang/common/uni-common/portray/portray.vue'
-
-export default {
-	name: 'BiAccountPortray',
-	components: {
-		BiPortray
-	},
-	props: {
-		id: {
-			type: String,
-			required: true
-		}
-	},
-	data () {
-		return {
-			loading: false,
-			accountData: null
-		}
-	},
-	watch: {
-		id () {
-			this.loadData()
-		}
-	},
-	created () {
-		this.loadData()
-	},
-	methods: {
-		loadData () {
-			this.loading = true
-			this.$clientChat.account.getAccount(this.id).then(rs => {
-				this.accountData = rs.data
-			}).finally(() => {
-				this.loading = false
-			})
-		}
-	}
-}
-</script>
-
-<style>
-</style>

package/uni-common/account-select/account-select-item.vue

@@ -1,172 +0,0 @@
-<template>
-	<view
-		class="bi-account-select-item"
-		:class="['bi-account-select-item--' + type, {'is-active': selected, 'is-online': isAll ? false : data && data.online, 'is-offline': isAll ? false : data && !data.online}]"
-	>
-		<view class="bi-account-select-item__icon">
-			<template v-if="isAll">
-				<bi-all-friend-avatar :size="avatarSize" :round="type === 'simple'"></bi-all-friend-avatar>
-			</template>
-			<template v-else>
-				<bi-avatar :src="data.avatar" :size="avatarSize" :round="type === 'simple'"></bi-avatar>
-			</template>
-		</view>
-		<view class="bi-account-select-item__text">
-			<template v-if="isAll">全部好友</template>
-			<template v-else>
-				{{ data.memo || data.nickname }}
-			</template>
-		</view>
-		<bi-badge class="bi-account-select-item__count" :value="unreadCount" :max="99" v-if="unreadCount"></bi-badge>
-	</view>
-</template>
-
-<script>
-import BiAvatar from '@aochuang/common/uni-components/avatar/avatar.vue' 
-import BiBadge from '@aochuang/common/uni-components/badge/badge.vue' 
-import BiAllFriendAvatar from '../all-friend-avatar/all-friend-avatar.vue'
-
-export default {
-	name: 'BiAccountSelectItem',
-	components: {
-		BiAvatar,
-		BiBadge,
-		BiAllFriendAvatar
-	},
-	props: {
-		isAll: {
-			type: Boolean
-		},
-		type: {
-			type: String,
-			validator (value) {
-				return ['default', 'simple'].includes(value)
-			}
-		},
-		selected: {
-			type: Boolean
-		},
-		data: {
-			type: Object
-		}
-	},
-	computed: {
-		avatarSize () {
-			return this.type === 'default' ? 'small' : 'mini'
-		},
-		accountUnreadMessageNumData () {
-			return this.$clientChat.account.accountUnreadMessageNumData || []
-		},
-		unreadCount () {
-			if (this.isAll) {
-				return this.accountUnreadMessageNumData.reduce((rs, account) => {
-					if (account.num) {
-						rs += account.num
-					}
-					return rs
-				}, 0)
-			} else {
-				const unreadMessageNumItem = this.accountUnreadMessageNumData.find(v => v.id === this.data.id)
-				return unreadMessageNumItem ? unreadMessageNumItem.num : 0
-			}
-		}
-	},
-	created () {
-		if (!this.isAll && !this.data) {
-			throw new Error('缺少data数据')
-		}
-	}
-}
-</script>
-
-<style lang="less">
-.bi-account-select-item{
-	display: flex;
-	flex-direction: row;
-	align-items: center;
-	position: relative;
-	transition: all .25s;
-	max-width: 100%;
-	&.is-active {
-		background: #3c9cff;
-		color: #fff;
-		&:after {
-			border-right-color: #fff;
-			border-bottom-color: #fff;
-		}
-	}
-	&.is-online {
-		.bi-account-select-item__icon{
-			&:after {
-				opacity: 1;
-				background-color: #40bf48;
-				border-color: #fff;
-			}
-		}
-	}
-	&.is-offline {
-		.bi-account-select-item__icon{
-			&:after {
-				opacity: 1;
-				background-color: #ccc;
-				border-color: #fff;
-			}
-		}
-	}
-}
-.bi-account-select-item__icon{
-	background-color: #eee;
-	margin-right: 6px;
-	position: relative;
-	line-height: 1em;
-	&:after {
-		content: '';
-		width: 8px;
-		height: 8px;
-		background-color: transparent;
-		border-radius: 50%;
-		border: 2px solid transparent;
-		position: absolute;
-		bottom: -2px;
-		right: -2px;
-		opacity: 0;
-	}
-}
-.bi-account-select-item__text{
-	flex: 1;
-	min-width: 0;
-	overflow: hidden;
-	text-overflow: ellipsis;
-	white-space: nowrap;
-}
-.bi-account-select-item--default {
-	padding: 6px 24px 6px 12px;
-	&:after {
-		content: '';
-		width: 6px;
-		height: 6px;
-		border: 1px solid #ccc;
-		border-left: 0;
-		border-top: 0;
-		transform: rotate(-45deg) translateY(-50%);
-		position: absolute;
-		right: 12px;
-		top: 50%;
-	}
-	.bi-account-select-item__icon {
-		width: 32px;
-		height: 32px;
-		border-radius: 3px;
-	}
-}
-.bi-account-select-item--simple {
-	.bi-account-select-item__icon {
-		width: 24px;
-		height: 24px;
-		border-radius: 50%;
-	}
-	.bi-account-select-item__count{
-		transform: scale(.8);
-	}
-}
-</style>