@titaui/pc 1.16.77-beta.2 → 1.16.77-beta.3

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (6) hide show
  1. package/lib/components/dingding-btn/index.js +53 -64
  2. package/lib/components/guide-order/index.css +3 -5
  3. package/lib/components/guide-order/index.js +1 -2
  4. package/lib/components/try-version-modal/index.css +2 -0
  5. package/lib/components/try-version-modal/index.js +1 -1
  6. package/package.json +1 -1
package/lib/components/dingding-btn/index.js CHANGED
@@ -11,8 +11,6 @@ var _react = _interopRequireWildcard(require("react"));
11
11
 
12
12
  require("dingtalk-jsapi/entry/union");
13
13
 
14
- var _dingtalkJsapi = _interopRequireDefault(require("dingtalk-jsapi"));
15
-
16
14
  var _coolAppSdk = require("dingtalk-jsapi/plugin/coolAppSdk");
17
15
 
18
16
  var _classnames = _interopRequireDefault(require("classnames"));
@@ -153,67 +151,58 @@ var DingdingBtn = function DingdingBtn(props) {
153
151
  var handleClickWechatBtn = function handleClickWechatBtn() {
154
152
  if (isDingDing) {
155
153
  //有群了，判断没在群就先进群再打开群
156
- if (chatId !== null && chatId !== 'chatId') {
157
- _dingtalkJsapi["default"].biz.chat.toConversation({
158
- //根据chatId跳转到对应会话
159
- corpId: corpId,
160
- //企业id
161
- chatId: chatId,
162
- //会话id
163
- onSuccess: function onSuccess(res) {
164
- console.log('打开群成功', res);
165
- },
166
- onFail: function onFail(err) {
167
- // 调用失败时回调
168
- console.log(err);
169
-
170
- if (isMac) {
171
- setMacWarnModalVisible(true);
172
- } else {
173
- (0, _coolAppSdk.addMembers)({
174
- context: {
175
- coolAppCode: coolAppCode,
176
- //酷应用的编码
177
- clientId: suiteKey,
178
- // 应用标识
179
- corpId: corpId // 根据对应场景获取 corpId
180
-
181
- },
182
- openConversationList: [chatId],
183
- //要添加成员的的群ID
184
- userIds: [loginUserOpenId + ''] //需要入群的成员userId。
185
-
186
- }).then(function (res) {
187
- console.log(res, 'addMembers');
188
-
189
- if (res.errorCode === '0') {
190
- console.log('添加成功' + JSON.stringify(res));
191
-
192
- _dingtalkJsapi["default"].biz.chat.toConversation({
193
- corpId: corpId,
194
- chatId: chatId,
195
- onSuccess: function onSuccess(res) {
196
- // 调用成功时回调
197
- console.log('打开群成功', res);
198
- },
199
- onFail: function onFail(err) {
200
- // 调用失败时回调
201
- console.log(err);
202
- }
203
- });
204
- } else {
205
- if (userId === principalUser.userId) {
206
- setPrincipalUserModalVisible(true);
207
- } else {
208
- setMemberVisible(true);
209
- }
210
- }
211
- })["catch"](function (e) {
212
- console.log('添加失败' + JSON.stringify(e));
213
- });
214
- }
215
- }
216
- });
154
+ if (chatId !== null && chatId !== 'chatId') {// dd.biz.chat.toConversation({
155
+ // //根据chatId跳转到对应会话
156
+ // corpId: corpId, //企业id
157
+ // chatId: chatId, //会话id
158
+ // onSuccess: function (res) {
159
+ // console.log('打开群成功', res)
160
+ // },
161
+ // onFail: function (err) {
162
+ // // 调用失败时回调
163
+ // console.log(err)
164
+ // if (isMac) {
165
+ // setMacWarnModalVisible(true)
166
+ // } else {
167
+ // addMembers({
168
+ // context: {
169
+ // coolAppCode: coolAppCode, //酷应用的编码
170
+ // clientId: suiteKey, // 应用标识
171
+ // corpId: corpId, // 根据对应场景获取 corpId
172
+ // },
173
+ // openConversationList: [chatId], //要添加成员的的群ID
174
+ // userIds: [loginUserOpenId+''], //需要入群的成员userId。
175
+ // })
176
+ // .then((res) => {
177
+ // console.log(res,'addMembers');
178
+ // if (res.errorCode === '0') {
179
+ // console.log('添加成功' + JSON.stringify(res))
180
+ // dd.biz.chat.toConversation({
181
+ // corpId: corpId,
182
+ // chatId: chatId,
183
+ // onSuccess: function (res) {
184
+ // // 调用成功时回调
185
+ // console.log('打开群成功', res)
186
+ // },
187
+ // onFail: function (err) {
188
+ // // 调用失败时回调
189
+ // console.log(err)
190
+ // },
191
+ // })
192
+ // } else {
193
+ // if (userId === principalUser.userId) {
194
+ // setPrincipalUserModalVisible(true)
195
+ // } else {
196
+ // setMemberVisible(true)
197
+ // }
198
+ // }
199
+ // })
200
+ // .catch((e) => {
201
+ // console.log('添加失败' + JSON.stringify(e))
202
+ // })
203
+ // }
204
+ // },
205
+ // })
217
206
  } else {
218
207
  setCreateDingchatVisible(true);
219
208
  }
@@ -334,7 +323,7 @@ var DingdingBtn = function DingdingBtn(props) {
334
323
  if (isShowDingChat && chatId === null) {
335
324
  setTooltip('点击一键发起钉钉群聊');
336
325
  } else if (isShowDingChat && chatId !== null && chatId !== 'chatId') {
337
- setTooltip('进入群聊');
326
+ setTooltip("\u9489\u9489\u7FA4\u804A\u540D\u79F0:\u300C".concat(apply, "\u7FA4\u300D").concat(name));
338
327
  } else if (isShowDingChat && chatId === 'chatId') {
339
328
  setTooltip('浏览器不支持此功能，请到钉钉工作台中使用');
340
329
  }
package/lib/components/guide-order/index.css CHANGED
@@ -30,7 +30,7 @@
30
30
  background: #5c8eff;
31
31
  box-shadow: 0px 8px 24px 0px rgba(127, 145, 180, 0.3);
32
32
  border: 1px solid #ffffff;
33
- padding: 16px 20px 20px;
33
+ padding: 16px 20px;
34
34
  box-sizing: border-box;
35
35
  border-radius: 12px;
36
36
  z-index: 10;
@@ -63,18 +63,16 @@
63
63
  color: #FFFFFF;
64
64
  line-height: 22px;
65
65
  margin-top: 0;
66
+ margin-bottom: 10px;
66
67
  }
67
68
 
68
69
  .titaui-pc__guide-order__popup__content__bottom {
69
70
  width: 100%;
71
+ height: fit-content;
70
72
  display: flex;
71
73
  flex-direction: row;
72
74
  justify-content: space-between;
73
75
  align-items: center;
74
- position: absolute;
75
- bottom: 20px;
76
- left: 0;
77
- padding: 0 20px;
78
76
  box-sizing: border-box;
79
77
  }
80
78
 
package/lib/components/guide-order/index.js CHANGED
@@ -55,8 +55,7 @@ var GuideOrder = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
55
55
  type = _props$type === void 0 ? 'button' : _props$type,
56
56
  _props$width = props.width,
57
57
  width = _props$width === void 0 ? 280 : _props$width,
58
- _props$height = props.height,
59
- height = _props$height === void 0 ? 124 : _props$height,
58
+ height = props.height,
60
59
  _props$time = props.time,
61
60
  time = _props$time === void 0 ? 3000 : _props$time,
62
61
  children = props.children,
package/lib/components/try-version-modal/index.css CHANGED
@@ -16,6 +16,7 @@
16
16
  color: #ffffff;
17
17
  line-height: 26px;
18
18
  margin: 24px auto 8px;
19
+ font-weight: 600;
19
20
  }
20
21
 
21
22
  .titaui-try-version-modal__desc {
@@ -46,6 +47,7 @@
46
47
  box-shadow: 0px 7px 15px 0px rgba(127, 145, 180, 0.2), inset 0px 1px 7px 0px rgba(127, 145, 180, 0.1);
47
48
  border-radius: 20px;
48
49
  border: 7px solid #FFFFFF;
50
+ box-sizing: border-box;
49
51
  }
50
52
 
51
53
  .titaui-try-version-modal__actions {
package/lib/components/try-version-modal/index.js CHANGED
@@ -83,7 +83,7 @@ var TryVersionModal = function TryVersionModal(props, ref) {
83
83
  onClick: function onClick() {
84
84
  return setVisible(false);
85
85
  }
86
- }, "\u7EE7\u7EED\u4F7F\u7528\u4F7F\u7528\u7248"), /*#__PURE__*/_react["default"].createElement(_button["default"].Rect, {
86
+ }, "\u7EE7\u7EED\u4F7F\u7528\u8BD5\u7528\u7248"), /*#__PURE__*/_react["default"].createElement(_button["default"].Rect, {
87
87
  className: "".concat(preCls, "__actions-btn"),
88
88
  onClick: handleOpenBookDemo,
89
89
  type: 'primary',
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@titaui/pc",
3
- "version": "1.16.77-beta.2",
3
+ "version": "1.16.77-beta.3",
4
4
  "nameCN": "",
5
5
  "description": "",
6
6
  "main": "lib/index.js",