@lingxiteam/ebe-utils 0.2.22 → 0.2.24

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

@@ -10,6 +10,59 @@
     margin-bottom: 14px;
   }
 
+  .formLabel-required {
+    font-size: 12px;
+    margin-right: 2px;
+    color: #ff4d4f;
+    position: relative;
+    top: 1px;
+    font-family: 'SimSun, sans-serif';
+  }
+
+  .formLabel-colon {
+    margin-left: 2px;
+    margin-right: 4px;
+  }
+
+  .formLabel-item-label {
+    display: flex;
+    flex-wrap: nowrap;
+    justify-content: flex-start;
+    align-items: flex-start;
+
+    &-title {
+      display: inline-block;
+      max-width: calc(100%-16px);
+      overflow: hidden;
+      white-space: nowrap;
+      text-overflow: ellipsis;
+      
+      &-label-wrap {
+        white-space: unset;
+        overflow-y: visible;
+      }
+    }
+
+    &::after {
+      content: ':';
+      display: inline-block;
+      width: 8px;
+      text-align: center;
+      margin-right: 8px;
+    }
+
+    &-no-colon {
+      .formLabel-item-label-title { 
+        max-width: 100%;
+        padding-right: 8px;
+      }
+      &::after {
+        display: none;
+        content: '';
+      }
+    }
+  }
+
   .explainHelp-line-height .@{form-item-prefix-cls}-explain {
     line-height: var(--explainHelp-Line-height);
   }
@@ -23,8 +76,10 @@
     &-label {
       line-height: 32px;
 
-      & > .@{form-prefix-cls}-item-required::before {
+      & > label.@{form-prefix-cls}-item-required:not(.pcfactory-form-item-required-mark-optional)::before {
         margin-right: 2px;
+        position: relative;
+        top: 1px;
         font-size: @font-size-sm;
       }
     }
@@ -78,6 +133,10 @@
       .@{form-prefix-cls}-item-hidden {
         display: none !important;
       }
+      // 解决ie11 垂直布局高度没撑开问题
+      .@{form-item-prefix-cls}-row {
+        display: block;
+      }
       .@{form-prefix-cls}-item-visibility {
         visibility: hidden;
         transform: opacity 0.3s ease;
@@ -133,6 +192,7 @@
     white-space: nowrap;
     text-align: right;
     vertical-align: middle;
+    margin-bottom: -4px;
 
     &-left {
       text-align: left;
@@ -193,16 +253,8 @@
       }
 
       &::after {
-        & when (@form-item-trailing-colon=true) {
-          content: ':';
-        }
-        & when not (@form-item-trailing-colon=true) {
-          content: ' ';
-        }
-
-        position: relative;
-        top: -0.5px;
-        margin: 0 @form-item-label-colon-margin-right 0 @form-item-label-colon-margin-left;
+        display: none;
+        content: '';
       }
 
       &.@{form-item-prefix-cls}-no-colon::after {
@@ -235,7 +287,7 @@
     position: relative;
     display: flex;
     align-items: center;
-    min-height: @input-height-base;
+    min-height: @input-height-sm !important;
 
     &-content {
       flex: auto;
@@ -283,3 +335,40 @@
   // }
 }
 
+.@{form-prefix-cls}-horizontal {
+  .@{form-item-prefix-cls} {
+    // label不换行
+    &-label {
+      &::after {
+        content: ':';
+        display: inline-block;
+        width: 8px;
+        text-align: center;
+        margin-right: 8px;
+      }
+  
+      &>label {
+        // 减去冒号占位符宽度
+        max-width: calc(100% - 16px);
+        & > span {
+          white-space: nowrap;
+          overflow: hidden;
+          text-overflow: ellipsis;
+        }
+      }
+    }
+
+    &-no-colon {
+      .@{form-item-prefix-cls}-label {
+
+        & > label {
+          max-width: 100%;
+        }
+        &::after {
+          content: '';
+        }
+      }
+    }
+  }
+}
+

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

@@ -24,6 +24,12 @@
       border-right: none;
     }
   }
+
+  &.@{ant-prefix}-input-after-border-right-width {
+    .@{ant-prefix}-select-selector {
+      border-right-width: 0px !important;
+    }
+  }
 }
 
 .@{ant-prefix}-form-item-control-input-content {

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

@@ -20,9 +20,17 @@
     overflow: hidden;
   }
 
+  &-primary {
+    color: @primary-color !important;
+  }
+
+  &-primary-remark-color {
+    color: fade(@primary-color, 50%) !important;
+  }
+
   &-label {
     max-width: 100%;
-    color: #414352;
+    color: @text-color;
     line-height: 20px;
     font-size: 12px;
     overflow: hidden;
@@ -32,15 +40,15 @@
 
   &-lightBackground,
   &-otherLightBackground {
-    padding: 0 8px;
-    background-color: rgba(68, 119, 238, 0.10);
+    padding: 0 10px 0 4px;
+    background-color: fade(@primary-color, 10%);
     border-radius: 2px;
   }
 
   &-darkBackground,
   &-otherDarkBackground {
-    padding: 0 8px;
-    background-color: #4477EE;
+    padding: 0 10px 0 4px;
+    background-color: @primary-color;
     border-radius: 2px;
     color: #fff;
   }
@@ -48,7 +56,7 @@
   &-remark {
     width: 100%;
     margin-top: 2px;
-    color: rgba(28, 36, 46, 0.45);
+    color: @text-color-secondary;
     line-height: 18px;
     font-size: 12px;
     overflow: hidden;
@@ -82,6 +90,58 @@
   }
 
   &-multiple {
+    .@{select-prefix-cls}-selection-overflow {
+      padding: 2px 0;
+      &-item {
+        line-height: 0;
+      }
+    }
+    .ued-multiple-select-tag {
+      position: relative;
+      max-width: 100%;
+      margin: 2px 4px 2px 0;
+      padding: 4px 14px 4px 4px;
+      color: @text-color;
+      background-color: fade(@text-color, 6%);;
+      overflow: hidden;
+      text-overflow: ellipsis;
+      white-space: nowrap;
+      border: 0;
+      border-radius: 4px;
+
+      .anticon-close {
+        position: absolute;
+        top: 50%;
+        right: 4px;
+        transform: translateY(-50%);
+        color: @text-color-secondary;
+      }
+    }
+    .lightBackground {
+      .ued-multiple-select-tag;
+
+      padding: 0;
+      padding-right: 4px;
+      background-color: fade(@primary-color, 10%);;
+      .ued-select-item-lightBackground {
+        background-color: transparent !important;
+      }
+    }
+    .darkBackground {
+      .ued-multiple-select-tag;
+
+      padding: 0;
+      padding-right: 4px;
+      background-color: @primary-color;
+      color: #fff;
+    }
+
+    .jsx {
+      .ued-multiple-select-tag;
+      padding: 0;
+      background-color: transparent;
+    }
+    
     .ued-select-checked-tag {
       position: relative;
       display: flex;
@@ -169,6 +229,10 @@
       color: @text-color;
       background-color: @item-active-bg;
       font-weight: normal;
+      .@{select-prefix-cls}-item-option-state {
+        margin-left: 8px;
+        align-content: center;
+      }
     }
   }
 

package/lib/pcpublic/src/components/pcfactory/src/utils/ChannelContainer.tsx

@@ -1,4 +1,12 @@
-import React, { FC, forwardRef, ForwardRefExoticComponent, FunctionComponent, useCallback, useRef, useState } from 'react';
+import React, {
+  FC,
+  useRef,
+  useState,
+  useCallback,
+  FunctionComponent,
+  ForwardRefExoticComponent,
+  forwardRef,
+} from 'react';
 // TODO: 替换成自定义hooks 待处理
 import { useDeepCompareEffect } from 'ahooks';
 import { get, isEqualWith, set } from 'lodash';
@@ -25,25 +33,23 @@ export interface ChannelContainerProps {
  * @param props
  * @returns
  */
-const Container: FC<ChannelContainerProps> = props => {
+const Container: FC<ChannelContainerProps> = (props) => {
   const { children } = props;
   const childrenProps = useRef<Record<string, any>>({}).current;
   const [, forceUpdate] = useState({});
   const uploadChannelProps = useCallback((props: Record<string, any>, key: string) => {
-    if (
-      !isEqualWith(props, childrenProps[key], (v1, v2) => {
-        if (typeof v1 === 'function' && typeof v2 === 'function') {
-          return true;
-        }
-        return undefined;
-      })
-    ) {
+    if (!isEqualWith(props, childrenProps[key], (v1, v2) => {
+      if (typeof v1 === 'function' && typeof v2 === 'function') {
+        return true;
+      }
+      return undefined;
+    })) {
       childrenProps[key] = props;
       forceUpdate({});
     }
   }, []);
   // @ts-ignore
-  const getProps = useCallback(c => childrenProps[c.key] || {}, []);
+  const getProps = useCallback((c) => childrenProps[c.key] || {}, []);
 
   return children({ uploadChannelProps, getProps });
 };
@@ -55,7 +61,7 @@ Container.displayName = 'ChannelContainer';
  * @param props
  * @returns
  */
-const Item: FC<PanelContentProps> = props => {
+const Item: FC<PanelContentProps> = (props) => {
   const { children, extendProps, uploadChannelProps } = props;
   return React.cloneElement(children, {
     extendProps: {
@@ -87,7 +93,7 @@ export interface useRuntimePropsType {
  */
 const useChannelProps: useRuntimePropsType = (props, depthKey = [], uploadChannelProps) => {
   const target = {};
-  depthKey.forEach(key => set(target, key.split('.'), get(props, key.split('.'))));
+  depthKey.forEach((key) => set(target, key.split('.'), get(props, key.split('.'))));
   useDeepCompareEffect(() => {
     if (uploadChannelProps) {
       uploadChannelProps(target);
@@ -106,7 +112,7 @@ const useChannelProps: useRuntimePropsType = (props, depthKey = [], uploadChanne
  */
 function withChannelItem<T extends Record<string, any>>(
   Component: FunctionComponent<any> | ForwardRefExoticComponent<any>,
-  options: { keyPath: string[] }
+  options: { keyPath: string[] },
 ) {
   const { keyPath } = options;
   return forwardRef((props: T, ref) => {

package/lib/pcpublic/src/components/pcfactory/src/utils/ChildRender.ts

@@ -5,7 +5,7 @@ export interface ChildRenderContextProps {
   collectChildData?: (id: string, data: any) => void;
   collectChildren?: (id: string, children: any) => void;
   update?: () => void;
-  getCurrentData?: (id: string) => { currentIndex: number; props: any };
+  getCurrentData?: (id: string) => { currentIndex: number; props: any; },
   parentProps?: any;
 }
 
@@ -26,7 +26,7 @@ export const useChildRender = () => {
   const childRef = useRef<{
     list: string[];
     data: Map<string, any>;
-    renderChild: Map<string, { current: any }>;
+    renderChild: Map<string, { current: any; }>;
     props: Map<string, any>;
     parentProps: any;
   }>({
@@ -38,11 +38,9 @@ export const useChildRender = () => {
   });
 
   const getIndex = (_id: string) => {
-    return childRef.current.list
-      .filter(id => {
-        return childRef.current.data.get(id)?.visible ?? true;
-      })
-      .findIndex(id => id === _id);
+    return childRef.current.list.filter(id => {
+      return childRef.current.data.get(id)?.visible ?? true;
+    }).findIndex(id => id === _id);
   };
 
   // 渲染子组件
@@ -84,7 +82,7 @@ export const useChildRender = () => {
         };
         return result;
       },
-      collectChildren: (id: string, child: { current: any }) => {
+      collectChildren: (id: string, child: { current: any; }) => {
         childRef.current.renderChild.set(id, child);
         if (childRef.current.renderChild.size === childRef.current.list.length) {
           setColletComplete(true);

package/lib/pcpublic/src/components/pcfactory/src/utils/CustomModule.tsx

@@ -10,10 +10,7 @@ export function isAtLeastReact17(version: string): boolean {
 
 const withErrorBoundary = (
   Component: React.ComponentType,
-  options: {
-    id: string;
-    render?: (error: Error, componentStack: string | null) => React.ReactNode;
-  }
+  options: { id: string; render?: (error: Error, componentStack: string | null) => React.ReactNode; }
 ) =>
   class CustomErrorModule extends React.Component {
     state: Readonly<{
@@ -24,7 +21,7 @@ const withErrorBoundary = (
         componentStack: null,
       };
 
-    componentDidCatch(error: Error & { cause?: Error }, { componentStack }: React.ErrorInfo) {
+    componentDidCatch(error: Error & { cause?: Error; }, { componentStack }: React.ErrorInfo) {
       if (isAtLeastReact17(React.version)) {
         const errorBoundaryError = new Error(error.message);
         errorBoundaryError.name = `React ErrorBoundary ${errorBoundaryError.name}`;
@@ -90,6 +87,7 @@ interface CustomModuleProps {
   allowMap?: Record<string, any>;
 }
 
+
 const CustomModule: FC<CustomModuleProps> = ({ sandBoxLoadModule, code, compProps, errorInfo, allowMap }) => {
   if (typeof code === 'function') {
     // 特殊处理：源码传递JSX过来，用方法传递上下文
@@ -107,7 +105,7 @@ const CustomModule: FC<CustomModuleProps> = ({ sandBoxLoadModule, code, compProp
   return Component ? <Component {...compProps} /> : null;
 };
 
-export const getJSXHtml = (reactNode: React.ReactElement, cb?: (html: string) => void, options: { id?: string } = {}) => {
+export const getJSXHtml = (reactNode: React.ReactElement, cb?: (html: string) => void, options: { id?: string; } = {}) => {
   const { id = `__JSX_id__${Math.random()}` } = options || {};
   let tempDOM = document.getElementById(id);
   if (!tempDOM) {

package/lib/pcpublic/src/components/pcfactory/src/utils/DummyFormContext.ts

@@ -9,7 +9,7 @@ const useDummyFormContext = () => {
 // 以下是用于嵌套fieldName写法的东西
 const CHECK_ARR = ['[', ']', '.'];
 // 判断当前索引是否在引号的字符串引用范围内
-const inRange = (ind: number, rangearr: any[]) => {
+const inRange = (ind:number, rangearr:any[]) => {
   let result = false;
   const findObj = rangearr.find(r => {
     if (ind > r.end || ind < r.start) {
@@ -26,13 +26,13 @@ const inRange = (ind: number, rangearr: any[]) => {
   return findObj ? result : false;
 };
 // 检查路径。这个方法返回被切分好的标识符数组，空数组代表这个路径是不合法的
-const pathSplit = (str: string) => {
+const pathSplit = (str:string) => {
   const result = [];
 
-  let lastchar: string;
-  let rangestartind: number;
-  let quotechar: string;
-  const quoterange: any[] = [];
+  let lastchar:string;
+  let rangestartind:number;
+  let quotechar:string;
+  const quoterange:any[] = [];
   const strarr = [...str];
   // 第一次遍历，进行简易的词法分析，本次仅额外处理形如[""]的完整字符串强调形式
   strarr.forEach((c, ind) => {
@@ -75,15 +75,11 @@ const pathSplit = (str: string) => {
   return result;
 };
 
-const getObjByPath = (obj: any, path: string) => {
+const getObjByPath = (obj:any, path:string) => {
   if (!obj) return undefined;
   const sp = pathSplit(path);
   // chained: 表示这个值取自一个链式写法 notcompletechain:表示途径属性链不完整，比如一个对象里的a字段对象里没有b字段，但取它的a.b，虽然不会报错（得到undefined），但这属性链条不完整
-  const finalresult = {
-    chained: false,
-    notcompletechain: false,
-    value: undefined,
-  };
+  const finalresult = { chained: false, notcompletechain: false, value: undefined };
 
   let temp = obj;
   if (sp.length > 0) {
@@ -102,7 +98,7 @@ const getObjByPath = (obj: any, path: string) => {
   return finalresult;
 };
 
-const setObjByPath = (obj: any, path: string, val: any) => {
+const setObjByPath = (obj:any, path:string, val:any) => {
   if (!obj) return;
 
   const sp = pathSplit(path);

package/lib/pcpublic/src/components/pcfactory/src/utils/Empty/empty.tsx

@@ -1,25 +1,13 @@
+import React from 'react';
+
 export default (props: any) => {
   return (
     <svg width="64" height="40" viewBox="0 0 64 40" fill="none" xmlns="http://www.w3.org/2000/svg">
       <g id=".components/empty-img-simple" clipPath="url(#clip0_6752_81174)">
-        <path
-          id="Vector"
-          d="M32 39.7027C49.6731 39.7027 64 36.592 64 32.7547C64 28.9174 49.6731 25.8066 32 25.8066C14.3269 25.8066 0 28.9174 0 32.7547C0 36.592 14.3269 39.7027 32 39.7027Z"
-          fill="#F5F5F5"
-        />
+        <path id="Vector" d="M32 39.7027C49.6731 39.7027 64 36.592 64 32.7547C64 28.9174 49.6731 25.8066 32 25.8066C14.3269 25.8066 0 28.9174 0 32.7547C0 36.592 14.3269 39.7027 32 39.7027Z" fill="#F5F5F5" />
         <g id="Group">
-          <path
-            id="Vector_2"
-            d="M55 13.6653L44.854 2.24866C44.367 1.47048 43.656 1 42.907 1H21.093C20.344 1 19.633 1.47048 19.146 2.24767L9 13.6663V22.8367H55V13.6653Z"
-            fill="white"
-            stroke="#D9D9D9"
-          />
-          <path
-            id="Vector_3"
-            d="M41.613 16.8135C41.613 15.2205 42.607 13.9053 43.84 13.9043H55V31.9067C55 34.0139 53.68 35.741 52.05 35.741H11.95C10.32 35.741 9 34.0129 9 31.9067V13.9043H20.16C21.393 13.9043 22.387 15.2175 22.387 16.8106V16.8324C22.387 18.4255 23.392 19.7119 24.624 19.7119H39.376C40.608 19.7119 41.613 18.4136 41.613 16.8205V16.8135Z"
-            fill="#FAFAFA"
-            stroke="#D9D9D9"
-          />
+          <path id="Vector_2" d="M55 13.6653L44.854 2.24866C44.367 1.47048 43.656 1 42.907 1H21.093C20.344 1 19.633 1.47048 19.146 2.24767L9 13.6663V22.8367H55V13.6653Z" fill="white" stroke="#D9D9D9" />
+          <path id="Vector_3" d="M41.613 16.8135C41.613 15.2205 42.607 13.9053 43.84 13.9043H55V31.9067C55 34.0139 53.68 35.741 52.05 35.741H11.95C10.32 35.741 9 34.0129 9 31.9067V13.9043H20.16C21.393 13.9043 22.387 15.2175 22.387 16.8106V16.8324C22.387 18.4255 23.392 19.7119 24.624 19.7119H39.376C40.608 19.7119 41.613 18.4136 41.613 16.8205V16.8135Z" fill="#FAFAFA" stroke="#D9D9D9" />
         </g>
       </g>
       <defs>

package/lib/pcpublic/src/components/pcfactory/src/utils/Empty/index.tsx

@@ -1,9 +1,9 @@
-import { LocaleFunction } from '@lingxiteam/types';
+import React, { useMemo } from 'react';
 import { Empty } from 'antd';
 import classnames from 'classnames';
-import { useMemo } from 'react';
-import useCompState from '../hooks/useCompState';
+import { LocaleFunction } from '@lingxiteam/types';
 import EmptySvg from './empty';
+import useCompState from '../hooks/useCompState';
 
 interface EmptyProps {
   dataState: any; // 数据状态

package/lib/pcpublic/src/components/pcfactory/src/utils/Holidays.ts

@@ -1,43 +1,13 @@
-import moment, { Moment } from 'moment';
 import { HolidaysLimitType } from './generatorDisabledCallback';
-import HolidaysData from './HolidaysList.json';
-
-const getHolidays = () => {
-  const workdays: string[] = [];
-  const holidays: string[] = [];
-  const loop = (source: any[], list: string[]) => {
-    source.forEach(item => {
-      if (item.start_date < item.end_date) {
-        let tmpDate = item.end_date;
-        while (tmpDate !== item.start_date) {
-          list.push(tmpDate);
-          tmpDate = moment(tmpDate, 'YYYY-MM-DD').subtract(1, 'days').format('YYYY-MM-DD');
-        }
-      }
-      list.push(item.start_date);
-    });
-  };
-
-  loop(
-    HolidaysData.filter(el => el.date_type === '补班'),
-    workdays
-  );
-  loop(
-    HolidaysData.filter(el => el.date_type === '节假日'),
-    holidays
-  );
-
-  return [workdays, holidays];
-};
-
-const [workdays, holidays] = getHolidays();
+import { Moment } from 'moment';
+import { workdays, holidays } from './HolidaysFormat';
 
 /**
  * 判断是否为节假日
  * @param cur
  * @returns
  */
-export const isHoliday = (cur: Moment) => {
+export const isHoliday = (cur:Moment) => {
   return holidays.includes(cur.format('YYYY-MM-DD'));
 };
 
@@ -46,15 +16,16 @@ export const isHoliday = (cur: Moment) => {
  * @param cur
  * @returns
  */
-export const isWeekend = (cur: Moment) => {
+export const isWeekend = (cur:Moment) => {
   return [0, 6].includes(cur.day());
 };
 
+
 /**
  * 判断是否为工作日
  * @param cur 当前时间
  */
-export const isWorkdays = (cur: Moment): boolean => {
+export const isWorkdays = (cur:Moment): boolean => {
   const curStr = cur.format('YYYY-MM-DD');
   if (workdays.includes(curStr)) {
     return true;
@@ -78,11 +49,11 @@ export const getHolidaysChecker = (holidaysLimit: HolidaysLimitType) => {
   const disabledWeekend = holidaysLimit === 'weekend' || holidaysLimit === 'all';
 
   /**
-   * 禁用的节假日
-   */
+    * 禁用的节假日
+    */
   const disabledHoliday = holidaysLimit === 'holiday' || holidaysLimit === 'all';
-
-  const isHolidayLimit = (cur: Moment) => {
+ 
+  const isHolidayLimit = (cur:Moment) => {
     if (disabledWeekend) {
       return isWeekend(cur);
     }
@@ -99,6 +70,7 @@ export const getHolidaysChecker = (holidaysLimit: HolidaysLimitType) => {
   };
 };
 
+
 export default {
   workdays,
   holidays,