@bit-sun/business-component 4.0.12-alpha.24 → 4.0.12-alpha.26

package/dist/index.esm.js

@@ -4472,6 +4472,7 @@ var PropertySelector = function PropertySelector(_ref) {
     });
   }, [choosedClassify]);
   useEffect(function () {
+    var _classifyOptionList$2;
     if (visible) {
       var _classifyOptionList$;
       // 获取选中品类信息
@@ -4488,7 +4489,9 @@ var PropertySelector = function PropertySelector(_ref) {
     })) {
       setShowNotCommon(true);
     }
-    settingValue.current = _objectSpread2({}, value);
+    settingValue.current = _objectSpread2(_objectSpread2({}, value), {}, {
+      classifyCode: (value === null || value === void 0 ? void 0 : value.classifyCode) || ((_classifyOptionList$2 = classifyOptionList[0]) === null || _classifyOptionList$2 === void 0 ? void 0 : _classifyOptionList$2.value)
+    });
     setChoosedValues(choosedPropertyList);
   }, [value, visible]);
   // 关闭弹窗回传组件值
@@ -4626,6 +4629,8 @@ var SearchSelect = /*#__PURE__*/forwardRef(function (props, ref) {
     needModalTable = _props$needModalTable === void 0 ? true : _props$needModalTable,
     _props$getPopupContai = props.getPopupContainer,
     _getPopupContainer = _props$getPopupContai === void 0 ? undefined : _props$getPopupContai,
+    _props$highestPopCont = props.highestPopContainer,
+    highestPopContainer = _props$highestPopCont === void 0 ? undefined : _props$highestPopCont,
     fieldComponent = props.fieldComponent,
     onSaveCallback = props.onSaveCallback,
     selectBusinessType = props.selectBusinessType;
@@ -5834,7 +5839,9 @@ var SearchSelect = /*#__PURE__*/forwardRef(function (props, ref) {
             event.nativeEvent.stopImmediatePropagation();
             var oldSelect = (value === null || value === void 0 ? void 0 : value.map(function (s) {
               return {
-                value: (s === null || s === void 0 ? void 0 : s.value) || s
+                value: (s === null || s === void 0 ? void 0 : s.value) || s,
+                key: (s === null || s === void 0 ? void 0 : s.key) || s,
+                label: (s === null || s === void 0 ? void 0 : s.label) || ''
               };
             })) || [];
             var newSelect = [JSON.parse(JSON.stringify(record))];
@@ -6013,7 +6020,7 @@ var SearchSelect = /*#__PURE__*/forwardRef(function (props, ref) {
     }, /*#__PURE__*/React$1.createElement(SearchOutlined, null))
   } : {}), currentSelectProps), {}, {
     getPopupContainer: function getPopupContainer(triggerNode) {
-      return triggerNode.parentElement || _getPopupContainer && _getPopupContainer(triggerNode);
+      return highestPopContainer && highestPopContainer() || triggerNode.parentElement || _getPopupContainer && _getPopupContainer(triggerNode);
     }
   }), items.map(function (item) {
     return /*#__PURE__*/React$1.createElement(Option$1, {
@@ -34400,7 +34407,7 @@ var RuleField = /*#__PURE__*/function (_Component) {
                 }
                 callback(values, valueNames);
               },
-              getPopupContainer: function getPopupContainer() {
+              highestPopContainer: function highestPopContainer() {
                 return document.body;
               }
             }), /*#__PURE__*/React$1.createElement("span", null, "~"), /*#__PURE__*/React$1.createElement(BusinessSearchSelect$1, {
@@ -34432,27 +34439,29 @@ var RuleField = /*#__PURE__*/function (_Component) {
                 }
                 callback(values, valueNames);
               },
-              getPopupContainer: function getPopupContainer() {
+              highestPopContainer: function highestPopContainer() {
                 return document.body;
               }
             }));
           } else {
             var _values13;
-            var _currentValue12 = dataInputBusinessType === 12 ? ((_values13 = values) === null || _values13 === void 0 ? void 0 : _values13.map(function (s, vIndex) {
+            var _currentValue12 = dataInputBusinessType === 12 || SET_TYPE.indexOf(selectOperation) > -1 ? ((_values13 = values) === null || _values13 === void 0 ? void 0 : _values13.map(function (s, vIndex) {
               return {
                 key: s,
-                label: valueNames[vIndex]
+                label: valueNames[vIndex],
+                value: s
               };
             })) || [] : values[0] && {
               key: values[0],
-              label: valueNames[0]
+              label: valueNames[0],
+              value: values[0]
             } || {};
             return /*#__PURE__*/React$1.createElement(BusinessSearchSelect$1, {
               selectBusinessType: "brand",
               selectProps: _objectSpread2({
                 style: styleCommon,
                 placeholder: '请选择品牌'
-              }, dataInputBusinessType === 12 ? {
+              }, dataInputBusinessType === 12 || SET_TYPE.indexOf(selectOperation) > -1 ? {
                 mode: 'multiple',
                 maxTagCount: 1
               } : {}),
@@ -34463,7 +34472,7 @@ var RuleField = /*#__PURE__*/function (_Component) {
                 filterInit: 'qp-brandCode-in'
               },
               onChange: function onChange(value) {
-                if (dataInputBusinessType === 12) {
+                if (dataInputBusinessType === 12 || SET_TYPE.indexOf(selectOperation) > -1) {
                   values = value.map(function (i) {
                     return i.key;
                   }) || [];
@@ -34476,7 +34485,7 @@ var RuleField = /*#__PURE__*/function (_Component) {
                 }
                 callback(values, valueNames);
               },
-              getPopupContainer: function getPopupContainer() {
+              highestPopContainer: function highestPopContainer() {
                 return document.body;
               }
             });

package/dist/index.js

@@ -4495,6 +4495,7 @@ var PropertySelector = function PropertySelector(_ref) {
     });
   }, [choosedClassify]);
   React$1.useEffect(function () {
+    var _classifyOptionList$2;
     if (visible) {
       var _classifyOptionList$;
       // 获取选中品类信息
@@ -4511,7 +4512,9 @@ var PropertySelector = function PropertySelector(_ref) {
     })) {
       setShowNotCommon(true);
     }
-    settingValue.current = _objectSpread2({}, value);
+    settingValue.current = _objectSpread2(_objectSpread2({}, value), {}, {
+      classifyCode: (value === null || value === void 0 ? void 0 : value.classifyCode) || ((_classifyOptionList$2 = classifyOptionList[0]) === null || _classifyOptionList$2 === void 0 ? void 0 : _classifyOptionList$2.value)
+    });
     setChoosedValues(choosedPropertyList);
   }, [value, visible]);
   // 关闭弹窗回传组件值
@@ -4649,6 +4652,8 @@ var SearchSelect = /*#__PURE__*/React$1.forwardRef(function (props, ref) {
     needModalTable = _props$needModalTable === void 0 ? true : _props$needModalTable,
     _props$getPopupContai = props.getPopupContainer,
     _getPopupContainer = _props$getPopupContai === void 0 ? undefined : _props$getPopupContai,
+    _props$highestPopCont = props.highestPopContainer,
+    highestPopContainer = _props$highestPopCont === void 0 ? undefined : _props$highestPopCont,
     fieldComponent = props.fieldComponent,
     onSaveCallback = props.onSaveCallback,
     selectBusinessType = props.selectBusinessType;
@@ -5857,7 +5862,9 @@ var SearchSelect = /*#__PURE__*/React$1.forwardRef(function (props, ref) {
             event.nativeEvent.stopImmediatePropagation();
             var oldSelect = (value === null || value === void 0 ? void 0 : value.map(function (s) {
               return {
-                value: (s === null || s === void 0 ? void 0 : s.value) || s
+                value: (s === null || s === void 0 ? void 0 : s.value) || s,
+                key: (s === null || s === void 0 ? void 0 : s.key) || s,
+                label: (s === null || s === void 0 ? void 0 : s.label) || ''
               };
             })) || [];
             var newSelect = [JSON.parse(JSON.stringify(record))];
@@ -6036,7 +6043,7 @@ var SearchSelect = /*#__PURE__*/React$1.forwardRef(function (props, ref) {
     }, /*#__PURE__*/React__default['default'].createElement(icons.SearchOutlined, null))
   } : {}), currentSelectProps), {}, {
     getPopupContainer: function getPopupContainer(triggerNode) {
-      return triggerNode.parentElement || _getPopupContainer && _getPopupContainer(triggerNode);
+      return highestPopContainer && highestPopContainer() || triggerNode.parentElement || _getPopupContainer && _getPopupContainer(triggerNode);
     }
   }), items.map(function (item) {
     return /*#__PURE__*/React__default['default'].createElement(Option$1, {
@@ -34423,7 +34430,7 @@ var RuleField = /*#__PURE__*/function (_Component) {
                 }
                 callback(values, valueNames);
               },
-              getPopupContainer: function getPopupContainer() {
+              highestPopContainer: function highestPopContainer() {
                 return document.body;
               }
             }), /*#__PURE__*/React__default['default'].createElement("span", null, "~"), /*#__PURE__*/React__default['default'].createElement(BusinessSearchSelect$1, {
@@ -34455,27 +34462,29 @@ var RuleField = /*#__PURE__*/function (_Component) {
                 }
                 callback(values, valueNames);
               },
-              getPopupContainer: function getPopupContainer() {
+              highestPopContainer: function highestPopContainer() {
                 return document.body;
               }
             }));
           } else {
             var _values13;
-            var _currentValue12 = dataInputBusinessType === 12 ? ((_values13 = values) === null || _values13 === void 0 ? void 0 : _values13.map(function (s, vIndex) {
+            var _currentValue12 = dataInputBusinessType === 12 || SET_TYPE.indexOf(selectOperation) > -1 ? ((_values13 = values) === null || _values13 === void 0 ? void 0 : _values13.map(function (s, vIndex) {
               return {
                 key: s,
-                label: valueNames[vIndex]
+                label: valueNames[vIndex],
+                value: s
               };
             })) || [] : values[0] && {
               key: values[0],
-              label: valueNames[0]
+              label: valueNames[0],
+              value: values[0]
             } || {};
             return /*#__PURE__*/React__default['default'].createElement(BusinessSearchSelect$1, {
               selectBusinessType: "brand",
               selectProps: _objectSpread2({
                 style: styleCommon,
                 placeholder: '请选择品牌'
-              }, dataInputBusinessType === 12 ? {
+              }, dataInputBusinessType === 12 || SET_TYPE.indexOf(selectOperation) > -1 ? {
                 mode: 'multiple',
                 maxTagCount: 1
               } : {}),
@@ -34486,7 +34495,7 @@ var RuleField = /*#__PURE__*/function (_Component) {
                 filterInit: 'qp-brandCode-in'
               },
               onChange: function onChange(value) {
-                if (dataInputBusinessType === 12) {
+                if (dataInputBusinessType === 12 || SET_TYPE.indexOf(selectOperation) > -1) {
                   values = value.map(function (i) {
                     return i.key;
                   }) || [];
@@ -34499,7 +34508,7 @@ var RuleField = /*#__PURE__*/function (_Component) {
                 }
                 callback(values, valueNames);
               },
-              getPopupContainer: function getPopupContainer() {
+              highestPopContainer: function highestPopContainer() {
                 return document.body;
               }
             });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bit-sun/business-component",
-  "version": "4.0.12-alpha.24",
+  "version": "4.0.12-alpha.26",
   "scripts": {
     "start": "dumi dev",
     "docs:build": "dumi build",

package/src/components/Business/PropertyModal/index.tsx

@@ -113,7 +113,10 @@ const PropertySelector = ({
         if ((value?.propertyList || []).some(item => !item.isCommonUse)) {
             setShowNotCommon(true);
         }
-        settingValue.current = {...value};
+        settingValue.current = {
+            ...value,
+            classifyCode: value?.classifyCode || classifyOptionList[0]?.value,
+        };
         setChoosedValues(choosedPropertyList);
 
     }, [value, visible])

package/src/components/Business/SearchSelect/index.md

@@ -426,7 +426,7 @@ export default () => {
   
   useEffect(() => {
     if(tabKey === 'multiple') {
-      setValue(['1540295745870573570', '1540173160826613762'])
+      setValue([])
     }
   },[tabKey])
   
@@ -448,7 +448,7 @@ export default () => {
     // },
     // prefixUrl: { selectPrefix: '/bop/api', formSelectFix: '/bop/api' },
     selectProps,
-    // labelInValue: true,
+    labelInValue: true,
     selectBusinessType: 'physicalWarehouse',
   };
 
@@ -520,7 +520,7 @@ export default () => {
     //   needStatusSearch: true
     // },
     selectProps,
-    selectBusinessType: 'realWarehouse',
+    selectBusinessType: 'brand',
   };
 
   const onTabChange = (key) => {

package/src/components/Functional/SearchSelect/index.tsx

@@ -28,6 +28,7 @@ const SearchSelect = forwardRef((props: any, ref: any) => {
     sourceName,
     needModalTable = true,
     getPopupContainer = undefined,
+    highestPopContainer = undefined,
     fieldComponent,
     onSaveCallback,
     selectBusinessType,
@@ -1080,7 +1081,11 @@ const SearchSelect = forwardRef((props: any, ref: any) => {
                 event.stopPropagation();
                 event.nativeEvent.stopImmediatePropagation();
 
-                const oldSelect = value?.map(s => ({ value: s?.value||s }))||[];
+                const oldSelect = value?.map(s => ({ 
+                  value: s?.value||s,
+                  key: s?.key||s,
+                  label: s?.label|| '',
+                }))||[];
                 const newSelect = [JSON.parse(JSON.stringify(record))];
                 const srs = getRealStr(oldSelect,newSelect,record);
                 onSelectClick(srs,dataSource,false)
@@ -1239,7 +1244,7 @@ const SearchSelect = forwardRef((props: any, ref: any) => {
               suffixIcon: <div className={`search_select_expand_button ${(sDisabled)?'search_select_expand_button_disabled':''}`} onClick={showModal}><SearchOutlined /></div>
             } : {})}
             {...currentSelectProps}
-            getPopupContainer={(triggerNode) => triggerNode.parentElement || getPopupContainer && getPopupContainer(triggerNode)}
+            getPopupContainer={(triggerNode) => (highestPopContainer && highestPopContainer()) || triggerNode.parentElement || getPopupContainer && getPopupContainer(triggerNode)}
           >
             {items.map(item => (
               <Option key={item.value} label={item.text}>

package/src/components/Solution/RuleComponent/ruleFiled.js

@@ -2176,7 +2176,7 @@ export default class RuleField extends Component {
                   }
                   callback(values, valueNames);
                 }}
-                getPopupContainer={() => document.body}
+                highestPopContainer={() => document.body}
               />
               <span>~</span>
               <BusinessSearchSelect
@@ -2207,21 +2207,21 @@ export default class RuleField extends Component {
                   }
                   callback(values, valueNames);
                 }}
-                getPopupContainer={() => document.body}
+                highestPopContainer={() => document.body}
               />
             </>
           );
         } else {
-          const currentValue = dataInputBusinessType === 12 ?
-            values?.map((s,vIndex)=> ({key: s, label: valueNames[vIndex]}))||[]
-            : values[0]&&{key:values[0],label:valueNames[0]}||{}
+          const currentValue = dataInputBusinessType === 12 || SET_TYPE.indexOf(selectOperation) > -1 ?
+            values?.map((s,vIndex)=> ({key: s, label: valueNames[vIndex], value: s}))||[]
+            : values[0]&&{key:values[0],label:valueNames[0], value: values[0]}||{};
           return (
             <BusinessSearchSelect
               selectBusinessType="brand"
               selectProps={{
                 style: styleCommon,
                 placeholder: '请选择品牌',
-                ...(dataInputBusinessType === 12
+                ...(dataInputBusinessType === 12 || SET_TYPE.indexOf(selectOperation) > -1
                   ? {
                     mode: 'multiple',
                     maxTagCount: 1,
@@ -2235,7 +2235,7 @@ export default class RuleField extends Component {
                 filterInit: 'qp-brandCode-in',
               }}
               onChange={(value) => {
-                if (dataInputBusinessType === 12) {
+                if (dataInputBusinessType === 12  || SET_TYPE.indexOf(selectOperation) > -1) {
                   values = value.map((i) => i.key)||[];
                   valueNames = value.map((i) => i.label || '')||[];
                 } else {
@@ -2244,7 +2244,7 @@ export default class RuleField extends Component {
                 }
                 callback(values, valueNames);
               }}
-              getPopupContainer={() => document.body}
+              highestPopContainer={() => document.body}
             />
           );
         }