@titaui/pc 1.11.19 → 1.11.21-beta.10
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.
- package/lib/components/dynamic/dynamic-item/components/feed-operate/index.css +0 -2
- package/lib/components/okr-flow/export-modal/index.js +2 -2
- package/lib/components/okr-flow/okr-map/index.js +2 -2
- package/lib/components/scroll-container/index.js +2 -2
- package/lib/components/superset-charts/components/chart/index.js +1 -1
- package/lib/components/wechat-btn/index.js +15 -27
- package/package.json +1 -1
|
@@ -33,7 +33,7 @@ var _precls = _interopRequireDefault(require("../precls"));
|
|
|
33
33
|
|
|
34
34
|
var _getLocale = require("../../../utils/getLocale");
|
|
35
35
|
|
|
36
|
-
var
|
|
36
|
+
var _isEqual = _interopRequireDefault(require("lodash/isEqual"));
|
|
37
37
|
|
|
38
38
|
require("rc-color-picker/assets/index.css");
|
|
39
39
|
|
|
@@ -250,7 +250,7 @@ var ExportMapModal = function ExportMapModal(props) {
|
|
|
250
250
|
var NodeDebug = function NodeDebug() {
|
|
251
251
|
var elements = (0, _reactFlowRenderer.useStoreState)(function (state) {
|
|
252
252
|
return [].concat(_toConsumableArray(state.nodes), _toConsumableArray(state.edges));
|
|
253
|
-
},
|
|
253
|
+
}, _isEqual["default"]);
|
|
254
254
|
var setElements = (0, _reactFlowRenderer.useStoreActions)(function (actions) {
|
|
255
255
|
return actions.setElements;
|
|
256
256
|
});
|
|
@@ -11,7 +11,7 @@ var _react = _interopRequireWildcard(require("react"));
|
|
|
11
11
|
|
|
12
12
|
var _reactFlowRenderer = _interopRequireWildcard(require("@titaui/react-flow-renderer"));
|
|
13
13
|
|
|
14
|
-
var
|
|
14
|
+
var _isEqual = _interopRequireDefault(require("lodash/isEqual"));
|
|
15
15
|
|
|
16
16
|
var _classnames = _interopRequireDefault(require("classnames"));
|
|
17
17
|
|
|
@@ -117,7 +117,7 @@ var OkrMap = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
|
|
|
117
117
|
var NodeDebug = function NodeDebug() {
|
|
118
118
|
var elements = (0, _reactFlowRenderer.useStoreState)(function (state) {
|
|
119
119
|
return [].concat(_toConsumableArray(state.nodes), _toConsumableArray(state.edges));
|
|
120
|
-
},
|
|
120
|
+
}, _isEqual["default"]);
|
|
121
121
|
var setElements = (0, _reactFlowRenderer.useStoreActions)(function (actions) {
|
|
122
122
|
return actions.setElements;
|
|
123
123
|
});
|
|
@@ -11,7 +11,7 @@ var _react = _interopRequireWildcard(require("react"));
|
|
|
11
11
|
|
|
12
12
|
var _classnames = _interopRequireDefault(require("classnames"));
|
|
13
13
|
|
|
14
|
-
var _lodash = require("lodash");
|
|
14
|
+
var _lodash = _interopRequireDefault(require("lodash.debounce"));
|
|
15
15
|
|
|
16
16
|
var _easyBem = _interopRequireDefault(require("easy-bem"));
|
|
17
17
|
|
|
@@ -179,7 +179,7 @@ var ScrollContainer = /*#__PURE__*/function (_PureComponent) {
|
|
|
179
179
|
};
|
|
180
180
|
|
|
181
181
|
_this.container = /*#__PURE__*/_react["default"].createRef();
|
|
182
|
-
_this.onEndScroll = (0, _lodash
|
|
182
|
+
_this.onEndScroll = (0, _lodash["default"])(_this.onEndScroll, SCROLL_END_DEBOUNCE); // Is container scrolling now (for example by inertia)
|
|
183
183
|
|
|
184
184
|
_this.scrolling = false; // Is scrolling started
|
|
185
185
|
|
|
@@ -19,7 +19,7 @@ var Chart = function Chart(props) {
|
|
|
19
19
|
// });
|
|
20
20
|
// }, []);
|
|
21
21
|
var Chart = (_window = window) === null || _window === void 0 ? void 0 : (_window$SupersetChart = _window.SupersetChart) === null || _window$SupersetChart === void 0 ? void 0 : _window$SupersetChart.SupersetChart;
|
|
22
|
-
return Chart
|
|
22
|
+
return Chart ? /*#__PURE__*/_react["default"].createElement(Chart, props) : /*#__PURE__*/_react["default"].createElement("div", null);
|
|
23
23
|
};
|
|
24
24
|
|
|
25
25
|
var _default = Chart;
|
|
@@ -117,11 +117,9 @@ var WeChatBtn = function WeChatBtn(props) {
|
|
|
117
117
|
var isMac = navigator.userAgent.match(/Mac/);
|
|
118
118
|
/**
|
|
119
119
|
* 点击企业微信图标这块稍许复杂 注释说明一下
|
|
120
|
-
*
|
|
121
|
-
*
|
|
122
|
-
*
|
|
123
|
-
* 群解散的情况 则弹窗提示 联系负责人手动加群
|
|
124
|
-
* mac 不支持加人接口
|
|
120
|
+
* 加人接口,只能在客户群调用,企业内部成员群不支持调用,所以不能用加人接口了,完全走open打开群聊的接口
|
|
121
|
+
* 1.在群的情况,应该直接就能打开(不知道是否存在什么意外打不开,如果打不开看报错,就是企业微信的问题了)
|
|
122
|
+
* 2.不在群的情况,和群聊解散的情况,看open接口的报错信息。
|
|
125
123
|
*/
|
|
126
124
|
|
|
127
125
|
var handleClickWechatBtn = function handleClickWechatBtn() {
|
|
@@ -131,34 +129,19 @@ var WeChatBtn = function WeChatBtn(props) {
|
|
|
131
129
|
wx.invoke('openExistedChatWithMsg', {
|
|
132
130
|
chatId: chatId
|
|
133
131
|
}, function (res) {
|
|
132
|
+
console.log(res.err_msg);
|
|
133
|
+
|
|
134
134
|
if (res.err_msg === 'openExistedChatWithMsg:ok') {
|
|
135
135
|
console.log('打开群成功');
|
|
136
136
|
} else {
|
|
137
137
|
if (isMac) {
|
|
138
138
|
setMacWarnModalVisible(true);
|
|
139
139
|
} else {
|
|
140
|
-
|
|
141
|
-
|
|
142
|
-
|
|
143
|
-
|
|
144
|
-
|
|
145
|
-
|
|
146
|
-
if (res.err_msg == 'updateEnterpriseChat:ok') {
|
|
147
|
-
wx.invoke('openExistedChatWithMsg', {
|
|
148
|
-
chatId: chatId
|
|
149
|
-
}, function (res) {
|
|
150
|
-
if (res.err_msg == 'openExistedChatWithMsg:ok') {
|
|
151
|
-
console.log('打开群成功');
|
|
152
|
-
}
|
|
153
|
-
});
|
|
154
|
-
} else {
|
|
155
|
-
if (userId === principalUser.userId) {
|
|
156
|
-
setPrincipalUserModalVisible(true);
|
|
157
|
-
} else {
|
|
158
|
-
setMemberVisible(true);
|
|
159
|
-
}
|
|
160
|
-
}
|
|
161
|
-
});
|
|
140
|
+
if (userId === principalUser.userId) {
|
|
141
|
+
setPrincipalUserModalVisible(true);
|
|
142
|
+
} else {
|
|
143
|
+
setMemberVisible(true);
|
|
144
|
+
}
|
|
162
145
|
}
|
|
163
146
|
}
|
|
164
147
|
});
|
|
@@ -275,6 +258,11 @@ var WeChatBtn = function WeChatBtn(props) {
|
|
|
275
258
|
setApply('任务');
|
|
276
259
|
}
|
|
277
260
|
}, []);
|
|
261
|
+
|
|
262
|
+
if (!isShowWeChat) {
|
|
263
|
+
return null;
|
|
264
|
+
}
|
|
265
|
+
|
|
278
266
|
return /*#__PURE__*/_react["default"].createElement(_react["default"].Fragment, null, /*#__PURE__*/_react["default"].createElement(_tooltip["default"], {
|
|
279
267
|
overlay: tooltip,
|
|
280
268
|
placement: "bottom"
|