@bit-sun/business-component 2.4.11 → 2.4.12-beta01

package/dist/index.esm.js

@@ -2723,7 +2723,7 @@ var handleSourceName = function handleSourceName(sName) {
 var Option$1 = Select.Option;
 var SearchSelect = /*#__PURE__*/forwardRef(function (props, ref) {
   var value = props.value,
-    onChange = props.onChange,
+    onChangeTemp = props.onChange,
     _props$selectProps = props.selectProps,
     selectProps = _props$selectProps === void 0 ? {} : _props$selectProps,
     _props$modalTableProp = props.modalTableProps,
@@ -3142,7 +3142,18 @@ var SearchSelect = /*#__PURE__*/forwardRef(function (props, ref) {
       }); // 调用api方法
     }
   };
-
+  // 下拉框改变事件
+  var onChange = function onChange() {
+    var _props$selectProps2;
+    onChangeTemp.apply(void 0, arguments);
+    if (props === null || props === void 0 ? void 0 : props.selectChangeCallback) {
+      props.selectChangeCallback.apply(props, arguments);
+    }
+    if (props === null || props === void 0 ? void 0 : (_props$selectProps2 = props.selectProps) === null || _props$selectProps2 === void 0 ? void 0 : _props$selectProps2.selectChangeCallback) {
+      var _props$selectProps3;
+      (_props$selectProps3 = props.selectProps).selectChangeCallback.apply(_props$selectProps3, arguments);
+    }
+  };
   useEffect(function () {
     if (init) {
       run('init');
@@ -10179,12 +10190,14 @@ var TreeSearchSelect = function TreeSearchSelect(props) {
     _remoteSource$initial = remoteSource.initialParams,
     initialParams = _remoteSource$initial === void 0 ? {} : _remoteSource$initial,
     _remoteSource$treeChi = remoteSource.treeChildrenRoom,
-    treeChildrenRoom = _remoteSource$treeChi === void 0 ? 'children' : _remoteSource$treeChi;
+    treeChildrenRoom = _remoteSource$treeChi === void 0 ? 'children' : _remoteSource$treeChi,
+    _remoteSource$special = remoteSource.specialBracket,
+    specialBracket = _remoteSource$special === void 0 ? false : _remoteSource$special;
   var mapSearchTree = function mapSearchTree(treeDataItem) {
     var haveChildren = Array.isArray(treeDataItem[treeChildrenRoom]) && treeDataItem[treeChildrenRoom].length > 0; // 盘算是否为父节点
     var isRoot = (treeDataItem === null || treeDataItem === void 0 ? void 0 : treeDataItem.id) == '0'; // 判断是否为根节点
     return {
-      title: treeDataItem[resKeyValue[1]],
+      title: specialBracket ? "\u3010".concat(treeDataItem[resKeyValue[0]], "\u3011").concat(treeDataItem[resKeyValue[1]]) : treeDataItem[resKeyValue[1]],
       key: treeDataItem[resKeyValue[0]],
       value: treeDataItem[resKeyValue[0]],
       parentId: treeDataItem.parent,
@@ -29861,9 +29874,7 @@ var RuleObjectComponent = /*#__PURE__*/function (_Component) {
                 };
               }) || undefined;
               _this.propertyCodeToRangeIdMap["".concat(item.code, ".").concat(element.code)] = list;
-            } else {
-              _this.propertyCodeToRangeIdMap["".concat(item.code, ".").concat(element.code)] = Object.keys(infoVo).length ? infoVo : undefined;
-            }
+            } else ;
             var child = {
               title: "".concat(item.name, "-").concat(element.name),
               key: element.id,
@@ -29905,9 +29916,7 @@ var RuleObjectComponent = /*#__PURE__*/function (_Component) {
             };
           }) || undefined;
           _this.propertyCodeToRangeIdMap["".concat(rootObjCode, ".").concat(parentKey, ".").concat(element.code)] = _list;
-        } else {
-          _this.propertyCodeToRangeIdMap["".concat(rootObjCode, ".").concat(parentKey, ".").concat(element.code)] = Object.keys(infoVo).length ? infoVo : undefined;
-        }
+        } else ;
         var child = {
           title: "".concat(parentTitle, "-").concat(element.name),
           key: "".concat(parentKey, ".").concat(element.id),

package/dist/index.js

@@ -2743,7 +2743,7 @@ var handleSourceName = function handleSourceName(sName) {
 var Option$1 = antd.Select.Option;
 var SearchSelect = /*#__PURE__*/React.forwardRef(function (props, ref) {
   var value = props.value,
-    onChange = props.onChange,
+    onChangeTemp = props.onChange,
     _props$selectProps = props.selectProps,
     selectProps = _props$selectProps === void 0 ? {} : _props$selectProps,
     _props$modalTableProp = props.modalTableProps,
@@ -3162,7 +3162,18 @@ var SearchSelect = /*#__PURE__*/React.forwardRef(function (props, ref) {
       }); // 调用api方法
     }
   };
-
+  // 下拉框改变事件
+  var onChange = function onChange() {
+    var _props$selectProps2;
+    onChangeTemp.apply(void 0, arguments);
+    if (props === null || props === void 0 ? void 0 : props.selectChangeCallback) {
+      props.selectChangeCallback.apply(props, arguments);
+    }
+    if (props === null || props === void 0 ? void 0 : (_props$selectProps2 = props.selectProps) === null || _props$selectProps2 === void 0 ? void 0 : _props$selectProps2.selectChangeCallback) {
+      var _props$selectProps3;
+      (_props$selectProps3 = props.selectProps).selectChangeCallback.apply(_props$selectProps3, arguments);
+    }
+  };
   React.useEffect(function () {
     if (init) {
       run('init');
@@ -10199,12 +10210,14 @@ var TreeSearchSelect = function TreeSearchSelect(props) {
     _remoteSource$initial = remoteSource.initialParams,
     initialParams = _remoteSource$initial === void 0 ? {} : _remoteSource$initial,
     _remoteSource$treeChi = remoteSource.treeChildrenRoom,
-    treeChildrenRoom = _remoteSource$treeChi === void 0 ? 'children' : _remoteSource$treeChi;
+    treeChildrenRoom = _remoteSource$treeChi === void 0 ? 'children' : _remoteSource$treeChi,
+    _remoteSource$special = remoteSource.specialBracket,
+    specialBracket = _remoteSource$special === void 0 ? false : _remoteSource$special;
   var mapSearchTree = function mapSearchTree(treeDataItem) {
     var haveChildren = Array.isArray(treeDataItem[treeChildrenRoom]) && treeDataItem[treeChildrenRoom].length > 0; // 盘算是否为父节点
     var isRoot = (treeDataItem === null || treeDataItem === void 0 ? void 0 : treeDataItem.id) == '0'; // 判断是否为根节点
     return {
-      title: treeDataItem[resKeyValue[1]],
+      title: specialBracket ? "\u3010".concat(treeDataItem[resKeyValue[0]], "\u3011").concat(treeDataItem[resKeyValue[1]]) : treeDataItem[resKeyValue[1]],
       key: treeDataItem[resKeyValue[0]],
       value: treeDataItem[resKeyValue[0]],
       parentId: treeDataItem.parent,
@@ -29881,9 +29894,7 @@ var RuleObjectComponent = /*#__PURE__*/function (_Component) {
                 };
               }) || undefined;
               _this.propertyCodeToRangeIdMap["".concat(item.code, ".").concat(element.code)] = list;
-            } else {
-              _this.propertyCodeToRangeIdMap["".concat(item.code, ".").concat(element.code)] = Object.keys(infoVo).length ? infoVo : undefined;
-            }
+            } else ;
             var child = {
               title: "".concat(item.name, "-").concat(element.name),
               key: element.id,
@@ -29925,9 +29936,7 @@ var RuleObjectComponent = /*#__PURE__*/function (_Component) {
             };
           }) || undefined;
           _this.propertyCodeToRangeIdMap["".concat(rootObjCode, ".").concat(parentKey, ".").concat(element.code)] = _list;
-        } else {
-          _this.propertyCodeToRangeIdMap["".concat(rootObjCode, ".").concat(parentKey, ".").concat(element.code)] = Object.keys(infoVo).length ? infoVo : undefined;
-        }
+        } else ;
         var child = {
           title: "".concat(parentTitle, "-").concat(element.name),
           key: "".concat(parentKey, ".").concat(element.id),

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bit-sun/business-component",
-  "version": "2.4.11",
+  "version": "2.4.12-beta01",
   "scripts": {
     "start": "dumi dev",
     "docs:build": "dumi build",

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

@@ -16,7 +16,7 @@ const { Option } = Select;
 const SearchSelect = forwardRef((props: any, ref: any) => {
   const {
     value, // 必传
-    onChange,
+    onChange: onChangeTemp,
     selectProps = {},
     modalTableProps = {},
     labelInValue = false,
@@ -390,6 +390,17 @@ const SearchSelect = forwardRef((props: any, ref: any) => {
     }
   }
 
+  // 下拉框改变事件
+  const onChange = (...arg) => {
+    onChangeTemp(...arg)
+    if(props?.selectChangeCallback){
+      props.selectChangeCallback(...arg)
+    }
+    if(props?.selectProps?.selectChangeCallback) {
+      props.selectProps.selectChangeCallback(...arg)
+    }
+  }
+
   useEffect(() => {
     if (init) {
       run('init')

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

@@ -41,26 +41,29 @@ const TreeSearchSelect = (props: any) => {
     resKeyValue = ['id', 'name'],
     initialParams = {},
     treeChildrenRoom = 'children',// 树状结构的子集容器 默认为 'children'
+    specialBracket = false
   } = remoteSource;
 
   const mapSearchTree = (treeDataItem: any) => {
     const haveChildren = Array.isArray(treeDataItem[treeChildrenRoom]) && treeDataItem[treeChildrenRoom].length > 0; // 盘算是否为父节点
     const isRoot = treeDataItem?.id == '0'; // 判断是否为根节点
     return {
-      title: treeDataItem[resKeyValue[1]],
+      title: specialBracket
+        ? `【${treeDataItem[resKeyValue[0]]}】${treeDataItem[resKeyValue[1]]}`
+        : treeDataItem[resKeyValue[1]],
       key: treeDataItem[resKeyValue[0]],
       value: treeDataItem[resKeyValue[0]],
       parentId: treeDataItem.parent,
       data: { ...treeDataItem },
       isLeaf: !haveChildren,
-      disabled: isDisabled(haveChildren,isRoot),
+      disabled: isDisabled(haveChildren, isRoot),
       children: haveChildren ? treeDataItem[treeChildrenRoom].map((i: any) => mapSearchTree(i)) : [],
     };
   };
 
-  const isDisabled = (isParent: boolean,isRoot: boolean) => {
+  const isDisabled = (isParent: boolean, isRoot: boolean) => {
     if (isChoose) {
-      if(rootDisabled && isRoot){
+      if (rootDisabled && isRoot) {
         return rootDisabled
       }
       return false;
@@ -74,11 +77,11 @@ const TreeSearchSelect = (props: any) => {
       [`${paramsKey}`]: q,
       ...initialParams,
     }
-    axios.get(`${url}?${stringify(paramsData)}`, {headers}).then(async (res: any) => {
+    axios.get(`${url}?${stringify(paramsData)}`, { headers }).then(async (res: any) => {
       const resData = res?.data || [];
       let coverData;
 
-      if(judgeIsRequestSuccess(resData)) {
+      if (judgeIsRequestSuccess(resData)) {
         const { data } = resData;
         if (remoteSource.converter) {
           coverData = await remoteSource.converter({ data: [data] })
@@ -97,14 +100,14 @@ const TreeSearchSelect = (props: any) => {
 
   const formatData = (value: any) => {
     if (labelInValue) {
-      const formatResult = multiple||treeCheckable ? value.map((i: any) => ({...i, key: i.value})) : { ...value, key: value?.value };
+      const formatResult = multiple || treeCheckable ? value.map((i: any) => ({ ...i, key: i.value })) : { ...value, key: value?.value };
       return formatResult
     } else {
-      const formatResult = multiple||treeCheckable ? value.map((i: any) => (i?.value || i)) : (_.get(value?.[0], 'value') || value)
+      const formatResult = multiple || treeCheckable ? value.map((i: any) => (i?.value || i)) : (_.get(value?.[0], 'value') || value)
       return formatResult
     }
   }
-  const parallelData = (data: any,result: any) => {
+  const parallelData = (data: any, result: any) => {
     data.forEach((i: any) => {
       result.push(i);
       if (i[treeChildrenRoom]) {
@@ -113,31 +116,31 @@ const TreeSearchSelect = (props: any) => {
     });
     return result;
   }
-  const getSelectItem = (tData: any,selectValue: any) => {
-    const handleList = tData||[];
+  const getSelectItem = (tData: any, selectValue: any) => {
+    const handleList = tData || [];
     let result = [];
-    if(labelInValue) {
-      result = multiple||treeCheckable ? (selectValue?.map((i: any) => {
-        if(handleList.some((s: any) => s.key == i.value)){
+    if (labelInValue) {
+      result = multiple || treeCheckable ? (selectValue?.map((i: any) => {
+        if (handleList.some((s: any) => s.key == i.value)) {
           return handleList.find((s: any) => s.key == i.value)
         }
-      }) || []) : (handleList?.find((s: any) => s.key == selectValue?.value)||{})
+      }) || []) : (handleList?.find((s: any) => s.key == selectValue?.value) || {})
     } else {
       const cValue = _.get(selectValue?.[0], 'value', selectValue);
-      result = multiple||treeCheckable ? (selectValue?.map((i: any) => {
-        if(handleList.some((s: any) => s.key == i)){
+      result = multiple || treeCheckable ? (selectValue?.map((i: any) => {
+        if (handleList.some((s: any) => s.key == i)) {
           return handleList.find((s: any) => s.key == i)
         }
-      }) || []) : (handleList?.find((s: any) => s.key == cValue)||{})
+      }) || []) : (handleList?.find((s: any) => s.key == cValue) || {})
     }
     return result;
   }
   const handleChange = (data: any, dataName: any) => {
     const handleData = formatData(data);
     // 获取选中树节点当条数据，并返回给调用业务
-    const parallelTreeData = parallelData(treeData,[])
-    const currentItem = getSelectItem(parallelTreeData,data)
-    onChange(handleData,data,currentItem,parallelTreeData);
+    const parallelTreeData = parallelData(treeData, [])
+    const currentItem = getSelectItem(parallelTreeData, data)
+    onChange(handleData, data, currentItem, parallelTreeData);
     onChangeName && onChangeName(dataName);
     getTreeData && getTreeData(treeData); // 把树节点暴露出去
     ctx?.form?.setFieldValue(ctx.name, handleData);
@@ -148,17 +151,17 @@ const TreeSearchSelect = (props: any) => {
   }, []);
 
   const maxTagPlaceholder = (selectedValues: any) => {
-    const onClose = (e: any,item: any) => {
+    const onClose = (e: any, item: any) => {
       e.preventDefault();
-      const newValue = labelInValue ? JSON.parse(JSON.stringify(value)).filter((i: any) => i.value !== item.value): JSON.parse(JSON.stringify(value)).filter((i: any) => i !== item.value)
-      const newValueName = labelInValue ? null: JSON.parse(JSON.stringify(valueName)).filter((i: any) => i !== item.label)
+      const newValue = labelInValue ? JSON.parse(JSON.stringify(value)).filter((i: any) => i.value !== item.value) : JSON.parse(JSON.stringify(value)).filter((i: any) => i !== item.value)
+      const newValueName = labelInValue ? null : JSON.parse(JSON.stringify(valueName)).filter((i: any) => i !== item.label)
       handleChange(newValue, newValueName);
     }
     return (
       <Tooltip title={selectedValues.map((i: any) => (
         <Tag
           closable={true}
-          onClose={(e) => onClose(e,i)}
+          onClose={(e) => onClose(e, i)}
           style={{ marginRight: 3, background: '#f5f5f5', height: '24px', border: '1px solid #f0f0f0' }}
         >
           {i.label}
@@ -190,7 +193,7 @@ const TreeSearchSelect = (props: any) => {
         multiple={multiple} // 	支持多选（当设置 treeCheckable 时自动变为 true）
         maxTagPlaceholder={maxTagPlaceholder}
         onChange={handleChange}
-        disabled={disabled || mode==='view' || ctx?.mode === 'view'}
+        disabled={disabled || mode === 'view' || ctx?.mode === 'view'}
         getPopupContainer={(triggerNode) => (getPopupContainer && getPopupContainer(triggerNode)) || document.body}
       >
       </TreeSelect>

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

@@ -138,9 +138,9 @@ class RuleObjectComponent extends Component {
                     `${item.code}.${element.code}`
                   ] = list;
                 } else {
-                  this.propertyCodeToRangeIdMap[
-                    `${item.code}.${element.code}`
-                  ] = Object.keys(infoVo).length ? infoVo : undefined;
+                  // this.propertyCodeToRangeIdMap[
+                  //   `${item.code}.${element.code}`
+                  // ] = Object.keys(infoVo).length ? infoVo : undefined;
                 }
                 let child = {
                   title: `${item.name}-${element.name}`,
@@ -200,9 +200,9 @@ class RuleObjectComponent extends Component {
           `${rootObjCode}.${parentKey}.${element.code}`
         ] = list;
       } else {
-        this.propertyCodeToRangeIdMap[
-          `${rootObjCode}.${parentKey}.${element.code}`
-        ] = Object.keys(infoVo).length ? infoVo : undefined;
+        // this.propertyCodeToRangeIdMap[
+        //   `${rootObjCode}.${parentKey}.${element.code}`
+        // ] = Object.keys(infoVo).length ? infoVo : undefined;
       }
       let child = {
         title: `${parentTitle}-${element.name}`,