@lingxiteam/ebe-utils 0.2.3 → 0.2.4

package/lib/h5public/src/components/factory/src/DynamicTable/components/TypeCells.tsx

@@ -79,6 +79,8 @@ const TypeCells: React.FC<CellProps> = (props) => {
     const { code, operator, value } = data;
 
     const toStringVal = (val: any) => `${val}`;
+    const toNumberVal = (val: any) =>
+      !isNaN(Number(val)) ? Number(val) : toStringVal(val);
 
     switch (operator) {
       case OPERATOR_EQUAL:
@@ -86,9 +88,10 @@ const TypeCells: React.FC<CellProps> = (props) => {
       case OPERATOR_NOT_EQUAL:
         return toStringVal(row[code]) !== toStringVal(value);
       case OPERATOR_GREATER_THAN:
-        return row[code] > value;
+        // 优先转成数字类型比较大小
+        return toNumberVal(row[code]) > toNumberVal(value);
       case OPERATOR_LESS_THAN:
-        return row[code] < value;
+        return toNumberVal(row[code]) < toNumberVal(value);
       case OPERATOR_INCLUDE:
         if (typeof row[code].includes === 'function') {
           return row[code].includes(value);

package/lib/pcpublic/src/components/pcfactory/src/Form/Form.tsx

@@ -1,6 +1,7 @@
 import { LingxiForwardRef } from '@lingxiteam/types';
 import { Col, Form as AntdForm, Row } from 'antd';
 import type { FormLayout } from 'antd/lib/form/Form';
+import classNames from 'classnames';
 import { isEqual } from 'lodash';
 import React, {
   Children,
@@ -146,6 +147,16 @@ export const FormChildren = (props: FormChildrenType) => {
     return colSpace as number;
   })();
 
+  useEffect(() => {
+    if (Number(rowSpace) >= 14) {
+      // 动态设置 CSS 变量
+      document.documentElement.style.setProperty(
+        '--explainHelp-Line-height',
+        `${Number(rowSpace)}px`,
+      );
+    }
+  }, []);
+
   /**
    * 布局子组件
    */
@@ -235,7 +246,10 @@ export const FormChildren = (props: FormChildrenType) => {
   return (
     <Row
       ref={formRef}
-      className={Number(rowSpace) < 14 ? 'form-tips' : undefined}
+      className={classNames({
+        'form-tips': Number(rowSpace) < 14,
+        'explainHelp-line-height': Number(rowSpace) >= 14,
+      })}
       gutter={[compatColSpace, rowSpace as number]}
     >
       {layoutChildren()}

package/lib/pcpublic/src/components/pcfactory/src/Table/BodyCell/index.tsx

@@ -26,6 +26,8 @@ const validateCondition = (data: any, row: any) => {
   const { code, operator, value } = data;
 
   const toStringVal = (val: any) => `${val}`;
+  const toNumberVal = (val: any) =>
+    !isNaN(Number(val)) ? Number(val) : toStringVal(val);
 
   switch (operator) {
     case OPERATOR_EQUAL:
@@ -33,9 +35,10 @@ const validateCondition = (data: any, row: any) => {
     case OPERATOR_NOT_EQUAL:
       return toStringVal(row[code]) !== toStringVal(value);
     case OPERATOR_GREATER_THAN:
-      return row[code] > value;
+      // 优先转成数字类型比较大小
+      return toNumberVal(row[code]) > toNumberVal(value);
     case OPERATOR_LESS_THAN:
-      return row[code] < value;
+      return toNumberVal(row[code]) < toNumberVal(value);
     case OPERATOR_INCLUDE:
       if (typeof row[code].includes === 'function') {
         return row[code].includes(value);

package/lib/pcpublic/src/components/pcfactory/src/Table/OperationCell/SingleBtn.tsx

@@ -11,7 +11,7 @@ const SingleBtn = (props: SingleBtnProps) => {
     onBtnClick,
     getLocale,
     actionsMap,
-    setMorePopVisible,
+    hideMorePopover,
     BtnIcon,
     c,
     idx,
@@ -42,7 +42,7 @@ const SingleBtn = (props: SingleBtnProps) => {
             isPopover &&
             !(typeof c === 'string' ? c === 'delete' : c.type === 'delete')
           ) {
-            setMorePopVisible(false);
+            hideMorePopover();
           }
         }}
         onDoubleClick={(e) => {
@@ -96,7 +96,7 @@ const SingleBtn = (props: SingleBtnProps) => {
               onConfirm={(e: any) => {
                 onDeleteClick(e);
                 if (isPopover) {
-                  setMorePopVisible(false);
+                  hideMorePopover();
                 }
               }}
             >

package/lib/pcpublic/src/components/pcfactory/src/Table/OperationCell/index.tsx

@@ -98,11 +98,37 @@ const OperationCell = (props: OperationCellProps) => {
     return BtnIcon;
   };
 
+  // 更多操作按钮气泡卡片
+  const onMorePopVisible = (vis: boolean, idx: number) => {
+    setMorePopVisible(vis);
+    if (fixedAction && tableRef?.current) {
+      const fixedActionEle =
+        tableRef.current?.querySelectorAll('.ued-table-actions')?.[idx]
+          ?.parentNode;
+      // 操作列固定时 此时fixedActionEle默认antd样式为 position: sticky;z-index: 2
+      // 由于气泡卡片挂在fixedActionEle里面导致被后面的列遮盖
+      if (fixedActionEle) {
+        if (timerRef.current) {
+          clearTimeout(timerRef.current);
+        }
+        if (!vis) {
+          // 防止卡片部分被遮盖再隐藏
+          timerRef.current = setTimeout(() => {
+            fixedActionEle.style.zIndex = 2;
+            timerRef.current = null;
+          }, 200);
+          return;
+        }
+        fixedActionEle.style.zIndex = 3;
+      }
+    }
+  };
+
   // 操作栏单个内置按钮
   const renderBuiltInSingleBtn = (
     c: any,
     row: any,
-    rowIndex: number | null,
+    rowIndex: number,
     idx: number,
     defaultBtnList: any,
     isPopover = false,
@@ -145,7 +171,7 @@ const OperationCell = (props: OperationCellProps) => {
       <SingleBtn
         getLocale={getLocale}
         actionsMap={actionsMap}
-        setMorePopVisible={setMorePopVisible}
+        hideMorePopover={() => onMorePopVisible(false, rowIndex)}
         BtnIcon={BtnIcon}
         c={c}
         idx={idx}
@@ -199,7 +225,7 @@ const OperationCell = (props: OperationCellProps) => {
                 if (typeof onClick === 'function') {
                   onClick(currentRowKey ? row[currentRowKey] : row, row, index);
                 }
-                setMorePopVisible(false);
+                onMorePopVisible(false, index);
               }}
             >
               <div className="ued-table-actions-extendBtn" style={buttonStyle}>
@@ -310,29 +336,7 @@ const OperationCell = (props: OperationCellProps) => {
                         triggerNode?.parentNode as HTMLElement
                 }
                 onOpenChange={(vis: boolean) => {
-                  setMorePopVisible(vis);
-                  if (fixedAction && tableRef?.current) {
-                    const fixedActionEle =
-                      tableRef.current?.querySelectorAll(
-                        '.ued-table-actions',
-                      )?.[index]?.parentNode;
-                    // 操作列固定时 此时fixedActionEle默认antd样式为 position: sticky;z-index: 2
-                    // 由于气泡卡片挂在fixedActionEle里面导致被后面的列遮盖
-                    if (fixedActionEle) {
-                      if (timerRef.current) {
-                        clearTimeout(timerRef.current);
-                      }
-                      if (!vis) {
-                        // 防止卡片部分被遮盖再隐藏
-                        timerRef.current = setTimeout(() => {
-                          fixedActionEle.style.zIndex = 2;
-                          timerRef.current = null;
-                        }, 200);
-                        return;
-                      }
-                      fixedActionEle.style.zIndex = 3;
-                    }
-                  }
+                  onMorePopVisible(vis, index);
                 }}
               >
                 <Button

package/lib/pcpublic/src/components/pcfactory/src/Table/types/OperationCell.d.ts

@@ -28,7 +28,7 @@ export interface SingleBtnProps {
   onBtnClick: (e: any) => void;
   getLocale: LocaleFunction;
   actionsMap: any;
-  setMorePopVisible: (vis: boolean) => void;
+  hideMorePopover: () => void;
   BtnIcon?: React.ReactElement;
   c: any;
   idx: number;

package/lib/pcpublic/src/components/pcfactory/src/Tree/index.tsx

@@ -113,6 +113,7 @@ export interface MyTreeProps {
   closeExpandedKey?: any;
   showLine?: any;
   getEngineApis: any;
+  nodeIconsType?: 'default' | 'forceDropdown';
 }
 
 // const prefixCls = 'tree';
@@ -141,6 +142,7 @@ const MyTree = LingxiForwardRef<any, MyTreeProps>((props, ref) => {
     onClickMenuItem,
     customRenderCode,
     getEngineApis,
+    nodeIconsType = 'default',
     ...resetProps
   } = props;
 
@@ -187,6 +189,8 @@ const MyTree = LingxiForwardRef<any, MyTreeProps>((props, ref) => {
 
   // 当前操作字段key
   const [editingKey, setEditingKey] = useState('');
+  // 强制菜单模式
+  const forceDrowdown = nodeIconsType === 'forceDropdown';
 
   useImperativeHandle(ref, () => ({
     get dataSource() {
@@ -880,7 +884,7 @@ const MyTree = LingxiForwardRef<any, MyTreeProps>((props, ref) => {
         }
         return true;
       });
-      if (finalNodeIcons.length <= 3) {
+      if (finalNodeIcons.length <= 3 && !forceDrowdown) {
         iconsDom = (
           <div key={c.key} className="ued-tree-icons ued-tree-icons-normal">
             {renderIcons(c, finalNodeIcons)}

package/lib/pcpublic/src/components/pcfactory/src/styles/components/Form.less

@@ -8,6 +8,10 @@
   .form-tips .@{form-prefix-cls}-item-with-help {
     margin-bottom: 14px;
   }
+
+  .explainHelp-line-height .@{form-item-prefix-cls}-explain {
+    line-height: var(--explainHelp-Line-height);
+  }
   
   .@{form-prefix-cls}-item {
     // height: 100%;

package/lib/public/src/utils/cmd.ts

@@ -480,3 +480,11 @@ export const getLocalLocation = ({
     }
   });
 };
+
+export const isTrue = (value: any) => {
+  return value == true || value === 'true';
+};
+
+export const isFalse = (value: any) => {
+  return value == false || value === 'false';
+};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lingxiteam/ebe-utils",
-  "version": "0.2.3",
+  "version": "0.2.4",
   "description": "",
   "keywords": [],
   "author": "",
@@ -19,7 +19,7 @@
     "@babel/types": "^7.12.12",
     "cac": "^6.7.14",
     "fs-extra": "9.x",
-    "@lingxiteam/ebe": "0.2.3"
+    "@lingxiteam/ebe": "0.2.4"
   },
   "publishConfig": {
     "access": "public"