Merge pull request #299 from lvhuichao/develop

PR 0309

Author: neon-balcony

client/VERSION

@@ -1 +1 @@
-1.1.6
+1.1.7

client/packages/openblocks-core/lib/index.cjs

@@ -3338,7 +3338,8 @@ var MultiBaseComp = /** @class */ (function (_super) {
     MultiBaseComp.prototype.reduce = function (action) {
         var comp = this.reduceOrUndefined(action);
         if (!comp) {
-            throw new Error("not supported action, should not happen");
+            console.warn("not supported action, should not happen, action:", action, "\ncurrent comp:", this);
+            return this;
         }
         return comp;
     };

client/packages/openblocks-core/lib/index.js

@@ -3330,7 +3330,8 @@ var MultiBaseComp = /** @class */ (function (_super) {
     MultiBaseComp.prototype.reduce = function (action) {
         var comp = this.reduceOrUndefined(action);
         if (!comp) {
-            throw new Error("not supported action, should not happen");
+            console.warn("not supported action, should not happen, action:", action, "\ncurrent comp:", this);
+            return this;
         }
         return comp;
     };

client/packages/openblocks-core/src/baseComps/multiBaseComp.tsx

@@ -63,7 +63,13 @@ export abstract class MultiBaseComp<
   override reduce(action: CompAction): this {
     const comp = this.reduceOrUndefined(action);
     if (!comp) {
-      throw new Error("not supported action, should not happen");
+      console.warn(
+        "not supported action, should not happen, action:",
+        action,
+        "\ncurrent comp:",
+        this
+      );
+      return this;
     }
     return comp;
   }

client/packages/openblocks-design/src/components/CustomModal.tsx

@@ -44,6 +44,7 @@ const ModalHeaderTitle = styled.div`
   color: #222222;
   flex-grow: 1;
   min-width: 0;
+  height: 16px;
   display: flex;
   align-items: center;
 
@@ -58,6 +59,7 @@ const ModalCloseIcon = styled.div`
   margin-left: 16px;
   width: 16px;
   height: 16px;
+  display: flex;
   cursor: pointer;
   color: ${GreyTextColor};
 
@@ -101,8 +103,8 @@ export const ModalFooterWrapper = styled.div`
     height: 28px;
     margin-top: 12px;
     margin-left: 8px;
-    padding-left: 12px;
-    padding-right: 12px;
+    padding-left: 11px;
+    padding-right: 11px;
   }
 `;
 
@@ -268,6 +270,7 @@ CustomModal.confirm = (props: {
   bodyStyle?: React.CSSProperties;
   footer?: ReactNode;
   type?: "info" | "warn" | "error" | "success";
+  width?: number | string;
 }): any => {
   const defaultConfirmProps: ModalFuncProps = {
     ...DEFAULT_PROPS,
@@ -317,6 +320,7 @@ CustomModal.confirm = (props: {
         okText={props.okText}
         bodyStyle={{ ...defaultConfirmProps.bodyStyle, ...props.bodyStyle }}
         footer={props.footer}
+        width={props.width}
       />
     ),
   });

client/packages/openblocks-design/src/components/Menu.tsx

@@ -77,6 +77,13 @@ const StyledAntdMenu = styled(AntdMenu)`
   .ant-menu-item:focus-visible {
     box-shadow: unset;
   }
+
+  .ant-menu-item-disabled .text {
+    color: #b8b9bf;
+    & + span {
+      opacity: 0.4;
+    }
+  }
 `;
 
 const MenuItemContentWrapper = styled.div`

client/packages/openblocks-design/src/components/form.tsx

@@ -321,6 +321,7 @@ const FormSelect = (props: any) => {
   return (
     <SelectWrapper>
       <CustomSelect
+        open={props.open}
         mode={props.mode}
         value={value}
         style={{
@@ -352,7 +353,7 @@ const FormSelect = (props: any) => {
 
 export interface FormSelectItemProps<T extends OptionsType>
   extends FormItemProps,
-    Pick<SelectProps, "mode"> {
+    Pick<SelectProps, "mode" | "open"> {
   options: T;
   afterChange?: (value: ValueFromOption<T>) => void;
 }