fix:修复操作框无法点击问题

邱嘉伟
1 parent df883022
Showing 3 changed files with 47 additions and 8 deletions
src/qx-base-condition-item/index.tsx
src/qx-parameter-setting/ParameterModal.tsx
src/qx-parameter-setting/style.less
--- a/src/qx-base-condition-item/index.tsx
View file @377df15
+++ b/src/qx-base-condition-item/index.tsx
View file @377df15
@@ -690,6 +690,7 @@ export const QxBaseConditionItem: React.FC<QxBaseConditionItemProps> = ({
   subset,
   params,
   fieldGroupType,
+  disabled,
   showAssignment = true,
   isMixValue,
   fieldType,
@@ -780,7 +781,7 @@ export const QxBaseConditionItem: React.FC<QxBaseConditionItemProps> = ({
         onChange={handleChange}
         isMultiple={multipleType.includes(fieldGroupType)}
         isRange={optValTypeCheck.isRangeType(value?.opt)}
-        disabled={optValTypeCheck.isEmptyType(value?.opt)}
+        disabled={optValTypeCheck.isEmptyType(value?.opt) || disabled}
         getName={getName}
         widget={field?.extract?.widget}
         isMixValue={isMixValue}
--- a/src/qx-parameter-setting/ParameterModal.tsx
View file @377df15
+++ b/src/qx-parameter-setting/ParameterModal.tsx
View file @377df15
@@ -97,6 +97,8 @@ const ParameterModal: React.FC<ParameterSettingProps> = (props) => {
     type,
   } = props;
   const [searchValue, setSearchValue] = useState('');
+  const [mExpandedKeys, setMExpandedKeys] = useState(expandedKeys);
+  const [isExpand, setIsExpand] = useState(true);
   // const [form] = Form.useForm()
   //判断数组是否只有一个子节点
@@ -130,6 +132,12 @@ const ParameterModal: React.FC<ParameterSettingProps> = (props) => {
     }
     return true;
   };
+
+  const handleTree = (id: any) => {
+    setIsExpand(true);
+    handleAddTree(id);
+  };
+
   const typeDis = !!type;
   const columns = [
     {
@@ -249,7 +257,7 @@ const ParameterModal: React.FC<ParameterSettingProps> = (props) => {
             value={[
               {
                 mappingValues: text?.mappingValues || [],
-                // disabled: disabled,
+                disabled: record.disabled,
                 valuesObj: record.valuesObj || [],
                 params: { appCode: 'appCode', useId: true },
                 // valueOptions: getValueOptions(nodeData),
@@ -363,7 +371,7 @@ const ParameterModal: React.FC<ParameterSettingProps> = (props) => {
                       component={SubNodeIcon}
                     />
                   }
-                  onClick={() => handleAddTree(record.id)}
+                  onClick={() => handleTree(record.id)}
                 />
               )}
@@ -380,7 +388,7 @@ const ParameterModal: React.FC<ParameterSettingProps> = (props) => {
                     type={'qx-icon-delete'}
                   />
                 }
-                onClick={() => handleDelete(record)}
+                onClick={(e) => handleDelete(e, record)}
               />
             )}
           </Space>
@@ -614,6 +622,15 @@ const ParameterModal: React.FC<ParameterSettingProps> = (props) => {
   }, [visible]);
   useEffect(() => {
+    setMExpandedKeys(expandedKeys);
+    // if (visible) {
+    //   if (data.length == 0) {
+    //     handleAdd('');
+    //   }
+    // }
+  }, [expandedKeys]);
+
+  useEffect(() => {
     const value = cloneDeep(data);
     const expandedArray: any = [];
     (value || []).map((_item: ParamDesignModel) => {
@@ -779,6 +796,24 @@ const ParameterModal: React.FC<ParameterSettingProps> = (props) => {
     setMidData(_data);
   };
+  const onModalExpand = (data, e, onExpand) => {
+    setIsExpand(false);
+    // console.log('data', data)
+    // console.log('mExpandedKeys', mExpandedKeys)
+    const index = mExpandedKeys.indexOf(data.id);
+    if (index > -1) {
+      mExpandedKeys.splice(index, 1);
+      setMExpandedKeys(mExpandedKeys);
+    } else {
+      mExpandedKeys.push(data.id);
+      setMExpandedKeys(mExpandedKeys);
+    }
+
+    setTimeout(() => {
+      onExpand(data, e);
+    }, 400);
+  };
+
   const RenderTitle = (
     <div>
       高级参数设计器
@@ -798,7 +833,6 @@ const ParameterModal: React.FC<ParameterSettingProps> = (props) => {
       </Tooltip>
     </div>
   );
-
   return (
     <>
       <Modal
@@ -898,7 +932,7 @@ const ParameterModal: React.FC<ParameterSettingProps> = (props) => {
             expandable={{
               defaultExpandAllRows: true,
               childrenColumnName: 'child',
-              expandedRowKeys: expandedKeys,
+              expandedRowKeys: isExpand ? mExpandedKeys : false,
               expandIcon: ({ expanded, onExpand, record }) =>
                 record.child && record.child.length > 0 && expanded ? (
                   <>
@@ -906,7 +940,7 @@ const ParameterModal: React.FC<ParameterSettingProps> = (props) => {
                     <QxBaseIcon
                       className={'table-expanded'}
                       type={'qx-caret-down'}
-                      onClick={(e) => onExpand(record, e)}
+                      onClick={(e) => onModalExpand(record, e, onExpand)}
                     />
                   </>
                 ) : record.child && record.child.length > 0 && !expanded ? (
@@ -915,7 +949,7 @@ const ParameterModal: React.FC<ParameterSettingProps> = (props) => {
                     <QxBaseIcon
                       className={'table-expanded-change'}
                       type={'qx-caret-down'}
-                      onClick={(e) => onExpand(record, e)}
+                      onClick={(e) => onModalExpand(record, e, onExpand)}
                     />
                   </>
                 ) : record.disabled ? (
--- a/src/qx-parameter-setting/style.less
View file @377df15
+++ b/src/qx-parameter-setting/style.less
View file @377df15
@@ -410,6 +410,10 @@
   .ps-table-cell {
     transition: all 0s ease !important;
+    .ant-select-selection-overflow {
+      flex-wrap: nowrap;
+    }
+
     &:hover {
       border: 1px solid @N6 !important;
       box-shadow: 0 0 4px 0 @N6 !important;