@kmkf-fe-packages/kmkf-work-order-service-component 1.15.0 → 1.16.1
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.
|
@@ -25,7 +25,7 @@ import React, { useState, useRef, useEffect, useMemo, forwardRef, useImperativeH
|
|
|
25
25
|
import { ConfigProvider, Form, Space, Tag } from 'antd';
|
|
26
26
|
import { useWhyDidYouUpdate } from 'ahooks';
|
|
27
27
|
import zhCN from 'antd/es/locale/zh_CN';
|
|
28
|
-
import { get, some, set, every, cloneDeep, isEmpty, intersection, throttle, groupBy } from 'lodash';
|
|
28
|
+
import { get, some, set, every, cloneDeep, isEmpty, intersection, throttle, groupBy, find } from 'lodash';
|
|
29
29
|
import 'moment/locale/zh-cn';
|
|
30
30
|
import { calcWorkOrderList, orderBack, getReplaceWarnValues, COMPONENT_MAP_NAME, EXCLUDE_REPLACE_TOP_COMPONENT,
|
|
31
31
|
// 重复检验不需要展示在顶部的
|
|
@@ -813,6 +813,10 @@ var FormRender = function FormRender(props, ref) {
|
|
|
813
813
|
//现支持子组件控制显隐，格式为${uniqueKey}_${type}与普通组件做区分
|
|
814
814
|
var isChildField = item.leftValue.includes('_');
|
|
815
815
|
var prefixId = isChildField ? (_item$leftValue$split = item.leftValue.split('_')) === null || _item$leftValue$split === void 0 ? void 0 : _item$leftValue$split[0] : item.leftValue;
|
|
816
|
+
// 将prefixId为userId转成shopId
|
|
817
|
+
if (prefixId === 'userId') {
|
|
818
|
+
prefixId = 'shopId';
|
|
819
|
+
}
|
|
816
820
|
var childFieldType = isChildField ? (_item$leftValue$split2 = item.leftValue.split('_')) === null || _item$leftValue$split2 === void 0 ? void 0 : _item$leftValue$split2[1] : '';
|
|
817
821
|
var dependenceDetail = getComponentDetailByFieldId(prefixId);
|
|
818
822
|
if (isChildField && CHILD_FIELD_TYPE[childFieldType]) {
|
|
@@ -821,6 +825,12 @@ var FormRender = function FormRender(props, ref) {
|
|
|
821
825
|
dependenceDetail = ((_dependenceDetail = dependenceDetail) === null || _dependenceDetail === void 0 ? void 0 : _dependenceDetail[childType]) || dependenceDetail;
|
|
822
826
|
}
|
|
823
827
|
var leftValue = getFieldValue(prefixId);
|
|
828
|
+
// 显隐条件中rightValue为shopUniqueKey form获取shopId需要转化后匹配
|
|
829
|
+
if (prefixId === 'shopId') {
|
|
830
|
+
leftValue = get(find(shopList, function (s) {
|
|
831
|
+
return s.shopId === leftValue;
|
|
832
|
+
}), 'accessToken', '');
|
|
833
|
+
}
|
|
824
834
|
if (isChildField) {
|
|
825
835
|
var _leftValue;
|
|
826
836
|
leftValue = CHILD_FIELD_VALUE !== null && CHILD_FIELD_VALUE !== void 0 && CHILD_FIELD_VALUE[childFieldType] ? (_leftValue = leftValue) === null || _leftValue === void 0 ? void 0 : _leftValue[CHILD_FIELD_VALUE[childFieldType]] : '';
|
|
@@ -650,6 +650,10 @@ var FormRender = function FormRender(props, ref) {
|
|
|
650
650
|
//现支持子组件控制显隐，格式为${uniqueKey}_${type}与普通组件做区分
|
|
651
651
|
var isChildField = item.leftValue.includes('_');
|
|
652
652
|
var prefixId = isChildField ? (_item$leftValue$split = item.leftValue.split('_')) === null || _item$leftValue$split === void 0 ? void 0 : _item$leftValue$split[0] : item.leftValue;
|
|
653
|
+
// 将prefixId为userId转成shopId
|
|
654
|
+
if (prefixId === 'userId') {
|
|
655
|
+
prefixId = 'shopId';
|
|
656
|
+
}
|
|
653
657
|
var childFieldType = isChildField ? (_item$leftValue$split2 = item.leftValue.split('_')) === null || _item$leftValue$split2 === void 0 ? void 0 : _item$leftValue$split2[1] : '';
|
|
654
658
|
var dependenceDetail = getComponentDetailByFieldId(prefixId);
|
|
655
659
|
if (isChildField && CHILD_FIELD_TYPE[childFieldType]) {
|
|
@@ -658,6 +662,12 @@ var FormRender = function FormRender(props, ref) {
|
|
|
658
662
|
dependenceDetail = ((_dependenceDetail = dependenceDetail) === null || _dependenceDetail === void 0 ? void 0 : _dependenceDetail[childType]) || dependenceDetail;
|
|
659
663
|
}
|
|
660
664
|
var leftValue = getFieldValue(prefixId);
|
|
665
|
+
// 显隐条件中rightValue为shopUniqueKey form获取shopId需要转化后匹配
|
|
666
|
+
if (prefixId === 'shopId') {
|
|
667
|
+
leftValue = get(find(shopList, function (s) {
|
|
668
|
+
return s.shopId === leftValue;
|
|
669
|
+
}), 'accessToken', '');
|
|
670
|
+
}
|
|
661
671
|
if (isChildField) {
|
|
662
672
|
var _leftValue;
|
|
663
673
|
leftValue = CHILD_FIELD_VALUE !== null && CHILD_FIELD_VALUE !== void 0 && CHILD_FIELD_VALUE[childFieldType] ? (_leftValue = leftValue) === null || _leftValue === void 0 ? void 0 : _leftValue[CHILD_FIELD_VALUE[childFieldType]] : '';
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@kmkf-fe-packages/kmkf-work-order-service-component",
|
|
3
|
-
"version": "1.
|
|
3
|
+
"version": "1.16.1",
|
|
4
4
|
"module": "dist/esm/index.js",
|
|
5
5
|
"typings": "dist/esm/index.d.ts",
|
|
6
6
|
"files": [
|
|
@@ -32,9 +32,9 @@
|
|
|
32
32
|
},
|
|
33
33
|
"dependencies": {
|
|
34
34
|
"@ant-design/icons": "^4.7.0",
|
|
35
|
-
"@kmkf-fe-packages/basic-components": "1.
|
|
36
|
-
"@kmkf-fe-packages/kmkf-utils": "1.
|
|
37
|
-
"@kmkf-fe-packages/services-components": "1.
|
|
35
|
+
"@kmkf-fe-packages/basic-components": "1.16.1",
|
|
36
|
+
"@kmkf-fe-packages/kmkf-utils": "1.16.1",
|
|
37
|
+
"@kmkf-fe-packages/services-components": "1.16.1",
|
|
38
38
|
"@reduxjs/toolkit": "^1.8.5",
|
|
39
39
|
"ahooks": "^3.7.4",
|
|
40
40
|
"copy-to-clipboard": "^3.3.3",
|
|
@@ -73,7 +73,7 @@
|
|
|
73
73
|
"publishConfig": {
|
|
74
74
|
"access": "public"
|
|
75
75
|
},
|
|
76
|
-
"gitHead": "
|
|
76
|
+
"gitHead": "610d28839f2e987644a71b1a53bc66262f0ff305",
|
|
77
77
|
"gitHooks": {
|
|
78
78
|
"pre-commit": "lint-staged"
|
|
79
79
|
}
|