@things-factory/operato-mms 4.1.3 → 4.1.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/client/pages/order/logistics/batch-init-popup.js +15 -3
- package/client/pages/order/logistics/lazada-order-init-batch-popup.js +32 -27
- package/client/pages/order/logistics/order-init-popup.js +13 -10
- package/client/pages/order/logistics/order-shipping-items.js +23 -26
- package/client/pages/order/logistics/request-ro-popup.js +18 -16
- package/client/pages/order/logistics/shopee-order-init-batch-popup.js +32 -27
- package/client/pages/order/order-by-store.js +34 -29
- package/client/pages/order/select-datetime-popup.js +2 -2
- package/config.development.js +160 -0
- package/dist-server/graphql/resolvers/interface-with-hub/add-release-order.js +25 -24
- package/dist-server/graphql/resolvers/interface-with-hub/add-release-order.js.map +1 -1
- package/dist-server/graphql/resolvers/interface-with-hub/auto-add-release-order.js +26 -24
- package/dist-server/graphql/resolvers/interface-with-hub/auto-add-release-order.js.map +1 -1
- package/dist-server/routers/etrax-router.js +26 -6
- package/dist-server/routers/etrax-router.js.map +1 -1
- package/package.json +61 -61
- package/server/graphql/resolvers/interface-with-hub/add-release-order.ts +41 -33
- package/server/graphql/resolvers/interface-with-hub/auto-add-release-order.ts +42 -33
- package/server/routers/etrax-router.ts +33 -7
- package/translations/en.json +1 -0
- package/translations/ko.json +1 -0
- package/translations/ms.json +1 -0
- package/translations/zh.json +1 -0
|
@@ -21,22 +21,29 @@ exports.addReleaseOrderResolver = {
|
|
|
21
21
|
relations: [
|
|
22
22
|
'marketplaceOrderItems',
|
|
23
23
|
'marketplaceOrderItems.marketplaceProductVariation',
|
|
24
|
-
'marketplaceOrderItems.
|
|
24
|
+
'marketplaceOrderItems.marketplaceOrderShippingItems',
|
|
25
|
+
'marketplaceOrderItems.marketplaceOrderShippingItems.marketplaceOrderShipping',
|
|
25
26
|
'marketplaceStore'
|
|
26
27
|
]
|
|
27
28
|
});
|
|
28
29
|
let marketplaceOrderShippings = await (0, typeorm_1.getRepository)(marketplace_base_1.MarketplaceOrderShipping).find({
|
|
29
30
|
where: { orderNoRef: marketplaceOrder.orderNo, domain },
|
|
30
31
|
order: { subOrderNoRef: 'ASC' },
|
|
31
|
-
relations: [
|
|
32
|
+
relations: [
|
|
33
|
+
'marketplaceOrderShippingItems',
|
|
34
|
+
'marketplaceOrderShippingItems.marketplaceOrderItem',
|
|
35
|
+
'marketplaceOrderShippingItems.product'
|
|
36
|
+
]
|
|
32
37
|
});
|
|
33
|
-
for (
|
|
38
|
+
for (let j = 0; j < marketplaceOrderShippings.length; j++) {
|
|
34
39
|
let marketplaceOrderShipping = marketplaceOrderShippings[j];
|
|
40
|
+
let marketplaceOrderShippingItems = marketplaceOrderShipping.marketplaceOrderShippingItems;
|
|
35
41
|
if (!(marketplaceOrderShipping === null || marketplaceOrderShipping === void 0 ? void 0 : marketplaceOrderShipping.releaseOrderId)) {
|
|
36
42
|
const date = new Date();
|
|
37
|
-
const releaseDate = `${date.getFullYear()}-${(date.getMonth() + 1)
|
|
43
|
+
const releaseDate = `${date.getFullYear()}-${(date.getMonth() + 1).toString().padStart(2, '0')}-${date
|
|
44
|
+
.getDate()
|
|
38
45
|
.toString()
|
|
39
|
-
.padStart(2, '0')}
|
|
46
|
+
.padStart(2, '0')}`;
|
|
40
47
|
const newReleaseOrder = {
|
|
41
48
|
releaseDate,
|
|
42
49
|
type: 'b2c',
|
|
@@ -68,19 +75,12 @@ exports.addReleaseOrderResolver = {
|
|
|
68
75
|
marketplaceOrderStatus: marketplaceOrder.status,
|
|
69
76
|
airwayBill: (marketplaceOrderShipping === null || marketplaceOrderShipping === void 0 ? void 0 : marketplaceOrderShipping.airwayBill) ? marketplaceOrderShipping.airwayBill : null,
|
|
70
77
|
invoice: (marketplaceOrderShipping === null || marketplaceOrderShipping === void 0 ? void 0 : marketplaceOrderShipping.invoice) ? marketplaceOrderShipping.invoice : null,
|
|
71
|
-
orderInventories:
|
|
72
|
-
.filter(item => {
|
|
73
|
-
if (item.marketplaceOrderShipping.id === marketplaceOrderShipping.id) {
|
|
74
|
-
return item;
|
|
75
|
-
}
|
|
76
|
-
})
|
|
77
|
-
.map((orderItem) => {
|
|
78
|
-
const { marketplaceProductVariation: productVariation } = orderItem;
|
|
78
|
+
orderInventories: marketplaceOrderShippingItems.map(marketplaceOrderShippingItem => {
|
|
79
79
|
return {
|
|
80
80
|
product: {
|
|
81
|
-
sku:
|
|
81
|
+
sku: marketplaceOrderShippingItem.product.sku
|
|
82
82
|
},
|
|
83
|
-
releaseQty:
|
|
83
|
+
releaseQty: marketplaceOrderShippingItem.qty
|
|
84
84
|
};
|
|
85
85
|
})
|
|
86
86
|
};
|
|
@@ -89,6 +89,14 @@ exports.addReleaseOrderResolver = {
|
|
|
89
89
|
customerBizplaceId,
|
|
90
90
|
releaseOrder: newReleaseOrder
|
|
91
91
|
});
|
|
92
|
+
marketplaceOrderShipping.releaseOrderId = releaseOrder.id;
|
|
93
|
+
marketplaceOrderShipping.fulfillmentCenter = fulfilmentCenter;
|
|
94
|
+
await (0, typeorm_1.getRepository)(marketplace_base_1.MarketplaceOrderShipping).save(marketplaceOrderShipping);
|
|
95
|
+
if (releaseOrder && (releaseOrder === null || releaseOrder === void 0 ? void 0 : releaseOrder.id)) {
|
|
96
|
+
marketplaceOrder.releaseOrderId = releaseOrder.id;
|
|
97
|
+
marketplaceOrder.fulfillmentCenter = fulfilmentCenter;
|
|
98
|
+
await (0, typeorm_1.getRepository)(marketplace_base_1.MarketplaceOrder).save(marketplaceOrder);
|
|
99
|
+
}
|
|
92
100
|
}
|
|
93
101
|
catch (e) { }
|
|
94
102
|
var invoiceProducts = await Promise.all(newReleaseOrder.orderInventories.map(async (oi) => {
|
|
@@ -100,7 +108,8 @@ exports.addReleaseOrderResolver = {
|
|
|
100
108
|
where: { domain, sku: oi.product.sku }
|
|
101
109
|
});
|
|
102
110
|
}
|
|
103
|
-
let
|
|
111
|
+
let mosis = marketplaceOrderShippingItems.filter(mosi => mosi.product.sku === product.sku);
|
|
112
|
+
let moi = mosis[0].marketplaceOrderItem;
|
|
104
113
|
return {
|
|
105
114
|
sku: product.sku,
|
|
106
115
|
name: product.name,
|
|
@@ -111,9 +120,6 @@ exports.addReleaseOrderResolver = {
|
|
|
111
120
|
paidPrice: ((moi === null || moi === void 0 ? void 0 : moi.paidPrice) || 0) / moi.qty
|
|
112
121
|
};
|
|
113
122
|
}));
|
|
114
|
-
marketplaceOrderShipping.releaseOrderId = releaseOrder.id;
|
|
115
|
-
marketplaceOrderShipping.fulfillmentCenter = fulfilmentCenter;
|
|
116
|
-
await (0, typeorm_1.getRepository)(marketplace_base_1.MarketplaceOrderShipping).save(marketplaceOrderShipping);
|
|
117
123
|
let newInvoice = {
|
|
118
124
|
invoiceProducts,
|
|
119
125
|
releaseGood: { id: releaseOrder.id, name: releaseOrder.name },
|
|
@@ -163,11 +169,6 @@ exports.addReleaseOrderResolver = {
|
|
|
163
169
|
catch (e) { }
|
|
164
170
|
}
|
|
165
171
|
}
|
|
166
|
-
if (releaseOrder && (releaseOrder === null || releaseOrder === void 0 ? void 0 : releaseOrder.id)) {
|
|
167
|
-
marketplaceOrder.releaseOrderId = releaseOrder.id;
|
|
168
|
-
marketplaceOrder.fulfillmentCenter = fulfilmentCenter;
|
|
169
|
-
await (0, typeorm_1.getRepository)(marketplace_base_1.MarketplaceOrder).save(marketplaceOrder);
|
|
170
|
-
}
|
|
171
172
|
}
|
|
172
173
|
}
|
|
173
174
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"add-release-order.js","sourceRoot":"","sources":["../../../../server/graphql/resolvers/interface-with-hub/add-release-order.ts"],"names":[],"mappings":";;;AAAA,qCAAuC;AAEvC,uDAAyE;AACzE,qFAA2F;AAC3F,
|
|
1
|
+
{"version":3,"file":"add-release-order.js","sourceRoot":"","sources":["../../../../server/graphql/resolvers/interface-with-hub/add-release-order.ts"],"names":[],"mappings":"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"}
|
|
@@ -13,7 +13,8 @@ exports.autoAddReleaseOrderResolver = {
|
|
|
13
13
|
const qb = (0, typeorm_1.createQueryBuilder)(marketplace_base_1.MarketplaceOrder, 'MO');
|
|
14
14
|
const marketplaceOrders = await qb
|
|
15
15
|
.leftJoinAndSelect('MO.marketplaceOrderItems', 'MOI')
|
|
16
|
-
.leftJoinAndSelect('MOI.
|
|
16
|
+
.leftJoinAndSelect('MOI.marketplaceOrderShippingItems', 'MOSI')
|
|
17
|
+
.leftJoinAndSelect('MOSI.marketplaceOrderShipping', 'MOS')
|
|
17
18
|
.leftJoinAndSelect('MOI.marketplaceProductVariation', 'MPV')
|
|
18
19
|
.leftJoinAndSelect('MO.marketplaceStore', 'MPS')
|
|
19
20
|
.where('MO.domain = :domainId', { domainId: domain.id })
|
|
@@ -32,15 +33,22 @@ exports.autoAddReleaseOrderResolver = {
|
|
|
32
33
|
const marketplaceOrder = marketplaceOrders[i];
|
|
33
34
|
const marketplaceOrderShippings = await (0, typeorm_1.getRepository)(marketplace_base_1.MarketplaceOrderShipping).find({
|
|
34
35
|
where: { orderNoRef: marketplaceOrder.orderNo, domain },
|
|
35
|
-
order: { subOrderNoRef: 'ASC' }
|
|
36
|
+
order: { subOrderNoRef: 'ASC' },
|
|
37
|
+
relations: [
|
|
38
|
+
'marketplaceOrderShippingItems',
|
|
39
|
+
'marketplaceOrderShippingItems.marketplaceOrderItem',
|
|
40
|
+
'marketplaceOrderShippingItems.product'
|
|
41
|
+
]
|
|
36
42
|
});
|
|
37
|
-
for (
|
|
43
|
+
for (let j = 0; j < marketplaceOrderShippings.length; j++) {
|
|
38
44
|
let marketplaceOrderShipping = marketplaceOrderShippings[j];
|
|
45
|
+
let marketplaceOrderShippingItems = marketplaceOrderShipping.marketplaceOrderShippingItems;
|
|
39
46
|
if (!(marketplaceOrderShipping === null || marketplaceOrderShipping === void 0 ? void 0 : marketplaceOrderShipping.releaseOrderId)) {
|
|
40
47
|
const date = new Date();
|
|
41
|
-
const releaseDate = `${date.getFullYear()}-${(date.getMonth() + 1)
|
|
48
|
+
const releaseDate = `${date.getFullYear()}-${(date.getMonth() + 1).toString().padStart(2, '0')}-${date
|
|
49
|
+
.getDate()
|
|
42
50
|
.toString()
|
|
43
|
-
.padStart(2, '0')}
|
|
51
|
+
.padStart(2, '0')}`;
|
|
44
52
|
const newReleaseOrder = {
|
|
45
53
|
releaseDate,
|
|
46
54
|
type: 'b2c',
|
|
@@ -72,19 +80,12 @@ exports.autoAddReleaseOrderResolver = {
|
|
|
72
80
|
marketplaceOrderStatus: marketplaceOrder.status,
|
|
73
81
|
airwayBill: (marketplaceOrderShipping === null || marketplaceOrderShipping === void 0 ? void 0 : marketplaceOrderShipping.airwayBill) ? marketplaceOrderShipping.airwayBill : null,
|
|
74
82
|
invoice: (marketplaceOrderShipping === null || marketplaceOrderShipping === void 0 ? void 0 : marketplaceOrderShipping.invoice) ? marketplaceOrderShipping.invoice : null,
|
|
75
|
-
orderInventories:
|
|
76
|
-
.filter(item => {
|
|
77
|
-
if (item.marketplaceOrderShipping.id === marketplaceOrderShipping.id) {
|
|
78
|
-
return item;
|
|
79
|
-
}
|
|
80
|
-
})
|
|
81
|
-
.map((orderItem) => {
|
|
82
|
-
const { marketplaceProductVariation: productVariation } = orderItem;
|
|
83
|
+
orderInventories: marketplaceOrderShippingItems.map(marketplaceOrderShippingItem => {
|
|
83
84
|
return {
|
|
84
85
|
product: {
|
|
85
|
-
sku:
|
|
86
|
+
sku: marketplaceOrderShippingItem.product.sku
|
|
86
87
|
},
|
|
87
|
-
releaseQty:
|
|
88
|
+
releaseQty: marketplaceOrderShippingItem.qty
|
|
88
89
|
};
|
|
89
90
|
})
|
|
90
91
|
};
|
|
@@ -93,6 +94,14 @@ exports.autoAddReleaseOrderResolver = {
|
|
|
93
94
|
customerBizplaceId,
|
|
94
95
|
releaseOrder: newReleaseOrder
|
|
95
96
|
});
|
|
97
|
+
marketplaceOrderShipping.releaseOrderId = releaseOrder.id;
|
|
98
|
+
marketplaceOrderShipping.fulfillmentCenter = fulfilmentCenter;
|
|
99
|
+
await (0, typeorm_1.getRepository)(marketplace_base_1.MarketplaceOrderShipping).save(marketplaceOrderShipping);
|
|
100
|
+
if (releaseOrder && (releaseOrder === null || releaseOrder === void 0 ? void 0 : releaseOrder.id)) {
|
|
101
|
+
marketplaceOrder.releaseOrderId = releaseOrder.id;
|
|
102
|
+
marketplaceOrder.fulfillmentCenter = fulfilmentCenter;
|
|
103
|
+
await (0, typeorm_1.getRepository)(marketplace_base_1.MarketplaceOrder).save(marketplaceOrder);
|
|
104
|
+
}
|
|
96
105
|
}
|
|
97
106
|
catch (e) { }
|
|
98
107
|
var invoiceProducts = await Promise.all(newReleaseOrder.orderInventories.map(async (oi) => {
|
|
@@ -104,7 +113,8 @@ exports.autoAddReleaseOrderResolver = {
|
|
|
104
113
|
where: { domain, sku: oi.product.sku }
|
|
105
114
|
});
|
|
106
115
|
}
|
|
107
|
-
let
|
|
116
|
+
let mosis = marketplaceOrderShippingItems.filter(mosi => mosi.product.sku === product.sku);
|
|
117
|
+
let moi = mosis[0].marketplaceOrderItem;
|
|
108
118
|
return {
|
|
109
119
|
sku: product.sku,
|
|
110
120
|
name: product.name,
|
|
@@ -115,9 +125,6 @@ exports.autoAddReleaseOrderResolver = {
|
|
|
115
125
|
paidPrice: ((moi === null || moi === void 0 ? void 0 : moi.paidPrice) || 0) / moi.qty
|
|
116
126
|
};
|
|
117
127
|
}));
|
|
118
|
-
marketplaceOrderShipping.releaseOrderId = releaseOrder.id;
|
|
119
|
-
marketplaceOrderShipping.fulfillmentCenter = fulfilmentCenter;
|
|
120
|
-
await (0, typeorm_1.getRepository)(marketplace_base_1.MarketplaceOrderShipping).save(marketplaceOrderShipping);
|
|
121
128
|
let newInvoice = {
|
|
122
129
|
invoiceProducts,
|
|
123
130
|
releaseGood: { id: releaseOrder.id, name: releaseOrder.name },
|
|
@@ -167,11 +174,6 @@ exports.autoAddReleaseOrderResolver = {
|
|
|
167
174
|
catch (e) { }
|
|
168
175
|
}
|
|
169
176
|
}
|
|
170
|
-
if (releaseOrder && (releaseOrder === null || releaseOrder === void 0 ? void 0 : releaseOrder.id)) {
|
|
171
|
-
marketplaceOrder.releaseOrderId = releaseOrder.id;
|
|
172
|
-
marketplaceOrder.fulfillmentCenter = fulfilmentCenter;
|
|
173
|
-
await (0, typeorm_1.getRepository)(marketplace_base_1.MarketplaceOrder).save(marketplaceOrder);
|
|
174
|
-
}
|
|
175
177
|
}
|
|
176
178
|
}
|
|
177
179
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"auto-add-release-order.js","sourceRoot":"","sources":["../../../../server/graphql/resolvers/interface-with-hub/auto-add-release-order.ts"],"names":[],"mappings":";;;AAAA,qCAA+E;AAE/E,uDAAyE;AACzE,qFAAwE;AACxE,
|
|
1
|
+
{"version":3,"file":"auto-add-release-order.js","sourceRoot":"","sources":["../../../../server/graphql/resolvers/interface-with-hub/auto-add-release-order.ts"],"names":[],"mappings":"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"}
|
|
@@ -65,14 +65,16 @@ exports.etraxRouter.post(`/lmd/etrax/status_update`, async (context, next) => {
|
|
|
65
65
|
'domain',
|
|
66
66
|
'marketplaceStore',
|
|
67
67
|
'marketplaceOrderItems',
|
|
68
|
-
'marketplaceOrderItems.
|
|
69
|
-
'marketplaceOrderItems.marketplaceOrderShipping
|
|
68
|
+
'marketplaceOrderItems.marketplaceOrderShippingItems',
|
|
69
|
+
'marketplaceOrderItems.marketplaceOrderShippingItems.marketplaceOrderShipping',
|
|
70
|
+
'marketplaceOrderItems.marketplaceOrderShippingItems.marketplaceOrderShipping.fulfillmentCenter'
|
|
70
71
|
]
|
|
71
72
|
});
|
|
72
73
|
let orderItems = order.marketplaceOrderItems;
|
|
73
74
|
for (const orderItem of orderItems) {
|
|
74
|
-
if (orderItem.marketplaceOrderShipping !== null) {
|
|
75
|
-
const
|
|
75
|
+
if (orderItem.marketplaceOrderShippingItems[0].marketplaceOrderShipping !== null) {
|
|
76
|
+
const orderShippingItems = orderItem.marketplaceOrderShippingItems;
|
|
77
|
+
const orderShipping = orderShippingItems[0].marketplaceOrderShipping;
|
|
76
78
|
const fulfillmentCenter = orderShipping === null || orderShipping === void 0 ? void 0 : orderShipping.fulfillmentCenter;
|
|
77
79
|
const marketplaceStore = order.marketplaceStore;
|
|
78
80
|
const currentDate = new Date();
|
|
@@ -100,9 +102,27 @@ exports.etraxRouter.post(`/lmd/etrax/status_update`, async (context, next) => {
|
|
|
100
102
|
const storeId = order.marketplaceStore.id;
|
|
101
103
|
const marketplaceStore = await integration_marketplace_1.StoreAPI.getMarketplaceStore(storeId);
|
|
102
104
|
// to-do update tracking no to every marketplaces
|
|
103
|
-
if (marketplaceStore.platform === 'woocommerce') {
|
|
105
|
+
if (marketplaceStore.platform === 'woocommerce' || marketplaceStore.platform === 'shopify') {
|
|
104
106
|
const note = 'http://ets.sntglobal.com/?mod=tracking&action=index&orders=' + trackingNo;
|
|
105
|
-
await
|
|
107
|
+
let orderInfo = await (0, typeorm_1.getRepository)(marketplace_base_1.MarketplaceOrder).findOne({
|
|
108
|
+
where: {
|
|
109
|
+
name: order.name
|
|
110
|
+
},
|
|
111
|
+
relations: ['marketplaceOrderItems', 'marketplaceOrderItems.marketplaceProductVariation']
|
|
112
|
+
});
|
|
113
|
+
const result = await integration_marketplace_1.StoreAPI.setStoreOrderStatusReadyToShip(marketplaceStore, {
|
|
114
|
+
orderId: order.name,
|
|
115
|
+
trackingUrl: note,
|
|
116
|
+
trackingNo,
|
|
117
|
+
order: orderInfo,
|
|
118
|
+
note
|
|
119
|
+
});
|
|
120
|
+
if (marketplaceStore.platform === 'woocommerce') {
|
|
121
|
+
await integration_marketplace_1.StoreAPI.updateOrderStatus(marketplaceStore, {
|
|
122
|
+
orderId: order.name,
|
|
123
|
+
status: 'READY_TO_SHIP'
|
|
124
|
+
});
|
|
125
|
+
}
|
|
106
126
|
}
|
|
107
127
|
const resp = {
|
|
108
128
|
Status: 'SUCCESS',
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"etrax-router.js","sourceRoot":"","sources":["../../server/routers/etrax-router.ts"],"names":[],"mappings":";;;;;;AAAA,4DAA+B;AAC/B,qCAAuC;AAEvC,uDAAyE;AACzE,qFAA2F;AAC3F,qEAAyE;AACzE,qFAA4G;AAC5G,
|
|
1
|
+
{"version":3,"file":"etrax-router.js","sourceRoot":"","sources":["../../server/routers/etrax-router.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@things-factory/operato-mms",
|
|
3
|
-
"version": "4.1.
|
|
3
|
+
"version": "4.1.10",
|
|
4
4
|
"main": "dist-server/index.js",
|
|
5
5
|
"browser": "client/index.js",
|
|
6
6
|
"things-factory": true,
|
|
@@ -42,68 +42,68 @@
|
|
|
42
42
|
"@material/mwc-linear-progress": "^0.25.3",
|
|
43
43
|
"@material/mwc-radio": "^0.25.3",
|
|
44
44
|
"@operato/ghost-print": "^0.3.28",
|
|
45
|
-
"@operato/scene-chartjs": "^0.1.
|
|
46
|
-
"@operato/scene-clock": "^0.1.
|
|
47
|
-
"@operato/scene-clone": "^0.1.
|
|
48
|
-
"@operato/scene-compass": "^0.1.
|
|
49
|
-
"@operato/scene-gauge": "^0.1.
|
|
50
|
-
"@operato/scene-grist": "^0.1.
|
|
51
|
-
"@operato/scene-half-roundrect": "^0.1.
|
|
52
|
-
"@operato/scene-indoor-map": "^0.1.
|
|
53
|
-
"@operato/scene-integration": "^0.1.
|
|
54
|
-
"@operato/scene-legend": "^0.1.
|
|
55
|
-
"@operato/scene-
|
|
56
|
-
"@operato/scene-
|
|
57
|
-
"@operato/scene-
|
|
58
|
-
"@operato/scene-
|
|
59
|
-
"@operato/scene-
|
|
60
|
-
"@operato/scene-
|
|
61
|
-
"@operato/scene-
|
|
62
|
-
"@
|
|
63
|
-
"@things-factory/
|
|
64
|
-
"@things-factory/
|
|
65
|
-
"@things-factory/
|
|
66
|
-
"@things-factory/
|
|
67
|
-
"@things-factory/board-
|
|
68
|
-
"@things-factory/
|
|
69
|
-
"@things-factory/
|
|
70
|
-
"@things-factory/
|
|
71
|
-
"@things-factory/
|
|
72
|
-
"@things-factory/export-ui
|
|
73
|
-
"@things-factory/export-ui-
|
|
74
|
-
"@things-factory/
|
|
75
|
-
"@things-factory/
|
|
76
|
-
"@things-factory/
|
|
77
|
-
"@things-factory/
|
|
78
|
-
"@things-factory/
|
|
79
|
-
"@things-factory/integration-
|
|
80
|
-
"@things-factory/
|
|
81
|
-
"@things-factory/
|
|
82
|
-
"@things-factory/
|
|
83
|
-
"@things-factory/
|
|
84
|
-
"@things-factory/
|
|
85
|
-
"@things-factory/
|
|
86
|
-
"@things-factory/
|
|
87
|
-
"@things-factory/
|
|
88
|
-
"@things-factory/
|
|
89
|
-
"@things-factory/scene-
|
|
90
|
-
"@things-factory/scene-
|
|
91
|
-
"@things-factory/scene-
|
|
92
|
-
"@things-factory/scene-
|
|
93
|
-
"@things-factory/scene-
|
|
94
|
-
"@things-factory/scene-
|
|
95
|
-
"@things-factory/scene-
|
|
96
|
-
"@things-factory/scene-
|
|
97
|
-
"@things-factory/scene-
|
|
98
|
-
"@things-factory/scene-restful": "^4.1.
|
|
99
|
-
"@things-factory/scene-visualizer": "^4.1.
|
|
100
|
-
"@things-factory/setting-ui": "^4.1.
|
|
101
|
-
"@things-factory/system-ui": "^4.1.
|
|
102
|
-
"@things-factory/warehouse-base": "^4.1.
|
|
45
|
+
"@operato/scene-chartjs": "^0.1.5",
|
|
46
|
+
"@operato/scene-clock": "^0.1.5",
|
|
47
|
+
"@operato/scene-clone": "^0.1.5",
|
|
48
|
+
"@operato/scene-compass": "^0.1.5",
|
|
49
|
+
"@operato/scene-gauge": "^0.1.5",
|
|
50
|
+
"@operato/scene-grist": "^0.1.5",
|
|
51
|
+
"@operato/scene-half-roundrect": "^0.1.5",
|
|
52
|
+
"@operato/scene-indoor-map": "^0.1.5",
|
|
53
|
+
"@operato/scene-integration": "^0.1.5",
|
|
54
|
+
"@operato/scene-legend": "^0.1.5",
|
|
55
|
+
"@operato/scene-news-ticker": "^0.1.5",
|
|
56
|
+
"@operato/scene-progressbar": "^0.1.5",
|
|
57
|
+
"@operato/scene-random": "^0.1.5",
|
|
58
|
+
"@operato/scene-switch": "^0.1.5",
|
|
59
|
+
"@operato/scene-tab": "^0.1.5",
|
|
60
|
+
"@operato/scene-table": "^0.1.5",
|
|
61
|
+
"@operato/scene-timer": "^0.1.5",
|
|
62
|
+
"@operato/scene-wheel-sorter": "^0.1.5",
|
|
63
|
+
"@things-factory/apptool-ui": "^4.1.10",
|
|
64
|
+
"@things-factory/attachment-base": "^4.1.10",
|
|
65
|
+
"@things-factory/auth-ui": "^4.1.10",
|
|
66
|
+
"@things-factory/biz-base": "^4.1.10",
|
|
67
|
+
"@things-factory/board-service": "^4.1.10",
|
|
68
|
+
"@things-factory/board-ui": "^4.1.10",
|
|
69
|
+
"@things-factory/code-ui": "^4.1.10",
|
|
70
|
+
"@things-factory/context-ui": "^4.1.10",
|
|
71
|
+
"@things-factory/dashboard": "^4.1.10",
|
|
72
|
+
"@things-factory/export-ui": "^4.1.10",
|
|
73
|
+
"@things-factory/export-ui-csv": "^4.1.10",
|
|
74
|
+
"@things-factory/export-ui-excel": "^4.1.10",
|
|
75
|
+
"@things-factory/geography": "^4.1.10",
|
|
76
|
+
"@things-factory/grist-ui": "^4.1.10",
|
|
77
|
+
"@things-factory/help": "^4.1.10",
|
|
78
|
+
"@things-factory/i18n-base": "^4.1.10",
|
|
79
|
+
"@things-factory/integration-fulfillment": "^4.1.10",
|
|
80
|
+
"@things-factory/integration-lmd": "^4.1.10",
|
|
81
|
+
"@things-factory/lite-menu": "^4.1.10",
|
|
82
|
+
"@things-factory/marketplace-base": "^4.1.10",
|
|
83
|
+
"@things-factory/more-ui": "^4.1.10",
|
|
84
|
+
"@things-factory/notification": "^4.1.10",
|
|
85
|
+
"@things-factory/oauth2-client": "^4.1.10",
|
|
86
|
+
"@things-factory/pdf": "^4.1.10",
|
|
87
|
+
"@things-factory/product-base": "^4.1.10",
|
|
88
|
+
"@things-factory/resource-ui": "^4.1.10",
|
|
89
|
+
"@things-factory/scene-data-transform": "^4.1.10",
|
|
90
|
+
"@things-factory/scene-excel": "^4.1.10",
|
|
91
|
+
"@things-factory/scene-firebase": "^4.1.10",
|
|
92
|
+
"@things-factory/scene-form": "^4.1.10",
|
|
93
|
+
"@things-factory/scene-google-map": "^4.1.10",
|
|
94
|
+
"@things-factory/scene-graphql": "^4.1.10",
|
|
95
|
+
"@things-factory/scene-label": "^4.1.10",
|
|
96
|
+
"@things-factory/scene-marker": "^4.1.10",
|
|
97
|
+
"@things-factory/scene-mqtt": "^4.1.10",
|
|
98
|
+
"@things-factory/scene-restful": "^4.1.10",
|
|
99
|
+
"@things-factory/scene-visualizer": "^4.1.10",
|
|
100
|
+
"@things-factory/setting-ui": "^4.1.10",
|
|
101
|
+
"@things-factory/system-ui": "^4.1.10",
|
|
102
|
+
"@things-factory/warehouse-base": "^4.1.10"
|
|
103
103
|
},
|
|
104
104
|
"devDependencies": {
|
|
105
|
-
"@things-factory/builder": "^4.1.
|
|
105
|
+
"@things-factory/builder": "^4.1.10",
|
|
106
106
|
"@types/node-fetch": "^2.5.7"
|
|
107
107
|
},
|
|
108
|
-
"gitHead": "
|
|
108
|
+
"gitHead": "8047bbb36aabdd33156b3fd91a4a5a874bed3754"
|
|
109
109
|
}
|