@pisell/private-materials 3.0.63 → 3.0.65
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/build/lowcode/assets-daily.json +11 -11
- package/build/lowcode/assets-dev.json +2 -2
- package/build/lowcode/assets-prod.json +11 -11
- package/build/lowcode/meta.js +1 -1
- package/build/lowcode/render/default/view.js +2 -2
- package/build/lowcode/view.js +2 -2
- package/es/components/booking/info/service/addService/index.js +2 -2
- package/es/components/booking/info/service/addService/utils.js +4 -0
- package/lib/components/booking/info/service/addService/index.js +2 -2
- package/lib/components/booking/info/service/addService/utils.js +3 -0
- package/package.json +2 -2
|
@@ -32,7 +32,7 @@ import { getProductExtend } from "./utils";
|
|
|
32
32
|
import { formatProductListByCategory, getProductTotalPrice, request } from "../../../utils";
|
|
33
33
|
import { locales, getUniqueId } from "@pisell/utils";
|
|
34
34
|
import { useUpdateEffect } from "ahooks";
|
|
35
|
-
var shopList = [2886, 4422, 5538, 6930, 6814, 6813, 6812, 6087, 6303];
|
|
35
|
+
var shopList = [2886, 4422, 5538, 6930, 6814, 6813, 6812, 6087, 6303, 6080];
|
|
36
36
|
var Info = function Info() {
|
|
37
37
|
var _state$service3, _state$service4, _state$service4$cache;
|
|
38
38
|
var _useState = useState(""),
|
|
@@ -248,7 +248,7 @@ var Info = function Info() {
|
|
|
248
248
|
cacheItem: cacheItem,
|
|
249
249
|
state: state
|
|
250
250
|
});
|
|
251
|
-
cacheItem.autoClose = cacheItem._extend.resource || cacheItem._extend.resource === 0 || (((_state$service = state.service) === null || _state$service === void 0 ? void 0 : _state$service.resourcesOrigin) || []).length === 1;
|
|
251
|
+
cacheItem.autoClose = !_isEdit && (cacheItem._extend.resource || cacheItem._extend.resource === 0 || (((_state$service = state.service) === null || _state$service === void 0 ? void 0 : _state$service.resourcesOrigin) || []).length === 1);
|
|
252
252
|
dispatch({
|
|
253
253
|
type: "setService",
|
|
254
254
|
payload: {
|
|
@@ -208,6 +208,10 @@ export var checkCacheItemResource = function checkCacheItemResource(_ref5) {
|
|
|
208
208
|
export var getProductExtend = function getProductExtend(_ref6) {
|
|
209
209
|
var cacheItem = _ref6.cacheItem,
|
|
210
210
|
state = _ref6.state;
|
|
211
|
+
if (!cacheItem.new && cacheItem._extend.endDate) {
|
|
212
|
+
return cacheItem._extend;
|
|
213
|
+
}
|
|
214
|
+
|
|
211
215
|
// 获取资源源列表
|
|
212
216
|
var resourcesOrigin = state.service.resourcesOrigin || [];
|
|
213
217
|
var currentResource = null;
|
|
@@ -47,7 +47,7 @@ var import_utils2 = require("./utils");
|
|
|
47
47
|
var import_utils3 = require("../../../utils");
|
|
48
48
|
var import_utils4 = require("@pisell/utils");
|
|
49
49
|
var import_ahooks = require("ahooks");
|
|
50
|
-
var shopList = [2886, 4422, 5538, 6930, 6814, 6813, 6812, 6087, 6303];
|
|
50
|
+
var shopList = [2886, 4422, 5538, 6930, 6814, 6813, 6812, 6087, 6303, 6080];
|
|
51
51
|
var Info = () => {
|
|
52
52
|
var _a, _b, _c;
|
|
53
53
|
const [search, setSearch] = (0, import_react.useState)("");
|
|
@@ -186,7 +186,7 @@ var Info = () => {
|
|
|
186
186
|
cacheItem.new = 0;
|
|
187
187
|
}
|
|
188
188
|
cacheItem._extend = (0, import_utils2.getProductExtend)({ cacheItem, state });
|
|
189
|
-
cacheItem.autoClose = cacheItem._extend.resource || cacheItem._extend.resource === 0 || (((_b2 = state.service) == null ? void 0 : _b2.resourcesOrigin) || []).length === 1;
|
|
189
|
+
cacheItem.autoClose = !_isEdit && (cacheItem._extend.resource || cacheItem._extend.resource === 0 || (((_b2 = state.service) == null ? void 0 : _b2.resourcesOrigin) || []).length === 1);
|
|
190
190
|
dispatch({
|
|
191
191
|
type: "setService",
|
|
192
192
|
payload: {
|
|
@@ -179,6 +179,9 @@ var checkCacheItemResource = ({ cacheItem, resources }) => {
|
|
|
179
179
|
return resourceId;
|
|
180
180
|
};
|
|
181
181
|
var getProductExtend = ({ cacheItem, state }) => {
|
|
182
|
+
if (!cacheItem.new && cacheItem._extend.endDate) {
|
|
183
|
+
return cacheItem._extend;
|
|
184
|
+
}
|
|
182
185
|
const resourcesOrigin = state.service.resourcesOrigin || [];
|
|
183
186
|
let currentResource = null;
|
|
184
187
|
if (!cacheItem.new) {
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@pisell/private-materials",
|
|
3
|
-
"version": "3.0.
|
|
3
|
+
"version": "3.0.65",
|
|
4
4
|
"main": "./lib/index.js",
|
|
5
5
|
"module": "./es/index.js",
|
|
6
6
|
"types": "./lib/index.d.ts",
|
|
@@ -58,8 +58,8 @@
|
|
|
58
58
|
"ahooks": "^3.7.6",
|
|
59
59
|
"react-infinite-scroll-component": "^6.1.0",
|
|
60
60
|
"rc-virtual-list": "^3.11.3",
|
|
61
|
-
"@pisell/utils": "1.0.24",
|
|
62
61
|
"@pisell/icon": "0.0.8",
|
|
62
|
+
"@pisell/utils": "1.0.24",
|
|
63
63
|
"@pisell/date-picker": "1.0.69"
|
|
64
64
|
},
|
|
65
65
|
"peerDependencies": {
|