@dfsj/components 3.1.1 → 3.1.3

package/CHANGELOG.md

@@ -2,6 +2,21 @@
 
 All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## 3.1.3 (2024-07-01)
+
+### Features
+
+- (components) 增加时间轴导出 ([ca11a1f](http://10.10.12.18/dfsj/dfsj/commits/ca11a1f00f0e963b4c4f483fae3cacd76f65d522))
+- (template) 增加要素图标 ([f6d046b](http://10.10.12.18/dfsj/dfsj/commits/f6d046b4e3805a115477516deae719dca54cac3f))
+- (template)标绘工具 ([b35fa56](http://10.10.12.18/dfsj/dfsj/commits/b35fa56f91041545eed077b383531bc196543f21))
+
+## 3.1.2 (2024-06-20)
+
+### Features
+
+- (components) 增加时间轴导出 ([ca11a1f](http://10.10.12.18/dfsj/dfsj/commits/ca11a1f00f0e963b4c4f483fae3cacd76f65d522))
+- (template) 增加要素图标 ([f6d046b](http://10.10.12.18/dfsj/dfsj/commits/f6d046b4e3805a115477516deae719dca54cac3f))
+
 ## [3.1.1](https://gitee.com/verdaccio/ec/compare/@dfsj/components@3.1.0...@dfsj/components@3.1.1) (2024-05-21)
 
 **Note:** Version bump only for package @dfsj/components

package/dist/components/Boards/index.d.ts

@@ -1,4 +1,4 @@
 import type { BoardItem, BoardState } from './src/props';
-import { BoardProps } from './src/props';
+import { BoardProps, BoardPosition } from './src/props';
 import Boards from './src/Boards.vue';
-export { BoardProps, BoardState, BoardItem, Boards };
+export { BoardProps, BoardState, BoardItem, Boards, BoardPosition };

package/dist/components/Boards/src/Boards.vue.d.ts

@@ -11,6 +11,14 @@ declare const _default: import("vue").DefineComponent<{
             state: string;
         };
     };
+    customStyle: {
+        type: () => import("./props").CustomStyle;
+        default: () => {
+            margin: any[];
+            fixed: any[];
+            color: string;
+        };
+    };
 }, (_ctx: any, _cache: any) => import("vue").VNode<import("vue").RendererNode, import("vue").RendererElement, {
     [key: string]: any;
 }>, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, string, import("vue").PublicProps, Readonly<import("vue").ExtractPropTypes<{
@@ -26,8 +34,21 @@ declare const _default: import("vue").DefineComponent<{
             state: string;
         };
     };
+    customStyle: {
+        type: () => import("./props").CustomStyle;
+        default: () => {
+            margin: any[];
+            fixed: any[];
+            color: string;
+        };
+    };
 }>>, {
     position: string;
     board: import("./props").BoardState;
+    customStyle: {
+        margin: any[];
+        fixed: any[];
+        color: string;
+    };
 }, {}>;
 export default _default;

package/dist/components/Boards/src/Boards.vue2.js

@@ -1,6 +1,16 @@
-import { defineComponent, computed, watch, resolveComponent, openBlock, createElementBlock, normalizeClass, createElementVNode, withModifiers, createVNode, Fragment, withCtx, renderList, createBlock, toDisplayString, withDirectives, resolveDynamicComponent, markRaw, normalizeProps, guardReactiveProps, vShow, mergeProps, defineAsyncComponent } from 'vue';
-import { BoardProps } from './props.js';
+import _slicedToArray from '@babel/runtime/helpers/slicedToArray';
+import _toConsumableArray from '@babel/runtime/helpers/toConsumableArray';
+import _defineProperty from '@babel/runtime/helpers/defineProperty';
+import { defineComponent, toRefs, ref, computed, unref, onMounted, watch, resolveComponent, openBlock, createElementBlock, normalizeClass, normalizeStyle, createElementVNode, withModifiers, createVNode, Fragment, withCtx, renderList, createBlock, toDisplayString, withDirectives, resolveDynamicComponent, markRaw, normalizeProps, guardReactiveProps, vShow, mergeProps, defineAsyncComponent } from 'vue';
+import { BoardProps, BoardPosition } from './props.js';
+import '../../Icon/src/Icon.vue.js';
+import '../../Icon/src/SvgIcon.vue.js';
+import { useElementBounding } from '../../../node_modules/.pnpm/@vueuse_core@10.7.2_vue@3.4.21/node_modules/@vueuse/core/index.js';
+import { isString } from '../../../utils/is.js';
+import script$1 from '../../Icon/src/Icon.vue2.js';
 
+function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
+function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 var _hoisted_1 = {
   "class": "custom-label"
 };
@@ -18,9 +28,23 @@ var script = defineComponent({
   setup: function setup(__props) {
     var cache = new Map();
     var props = __props;
+    var _toRefs = toRefs(props),
+      position = _toRefs.position,
+      board = _toRefs.board,
+      customStyle = _toRefs.customStyle;
     var isAsyncComponent = function isAsyncComponent(component) {
       return !!(component && component.__asyncLoader);
     };
+    var el = ref(null);
+    var _useElementBounding = useElementBounding(el),
+      top = _useElementBounding.top,
+      right = _useElementBounding.right,
+      bottom = _useElementBounding.bottom,
+      left = _useElementBounding.left;
+    var color = computed(function () {
+      var _customStyle$value$co;
+      return (_customStyle$value$co = customStyle.value.color) !== null && _customStyle$value$co !== void 0 ? _customStyle$value$co : '#11848f';
+    });
     function resolve(source) {
       var component = cache.get(source);
       if (component == null) {
@@ -33,56 +57,133 @@ var script = defineComponent({
       return component;
     }
     function tabClick(id) {
-      console.log('点击了...', id === null || id === void 0 ? void 0 : id.index);
-      props.board.index = id === null || id === void 0 ? void 0 : id.index;
+      board.value.index = id === null || id === void 0 ? void 0 : id.index;
     }
     var toggle = function toggle() {
-      props.board.state = props.board.state === 'spread' ? 'minify' : 'spread';
+      board.value.state = board.value.state === 'spread' ? 'minify' : 'spread';
     };
     var icon = computed(function () {
-      if (props.board.state == 'hidden') return null;
+      if (board.value.state == 'hidden') return null;
       return 'ic:round-chevron-right';
     });
+    var tabPosition = computed(function () {
+      var mapping = _defineProperty(_defineProperty(_defineProperty(_defineProperty({}, BoardPosition.EAST, 'right'), BoardPosition.WEST, 'left'), BoardPosition.SOUTH, 'top'), BoardPosition.TOP, 'top');
+      return mapping === null || mapping === void 0 ? void 0 : mapping[position.value];
+    });
+    var transform = computed(function () {
+      var _transform = '';
+      if (board.value.state == 'spread') {
+        _transform = '';
+      } else {
+        if (position.value == BoardPosition.WEST) {
+          _transform = "translateX(-".concat(right.value, "px)");
+        } else if (position.value == BoardPosition.EAST) {
+          _transform = "translateX(".concat(window.innerWidth - left.value, "px)");
+        } else if (position.value == BoardPosition.SOUTH) {
+          _transform = "translateY(".concat(window.innerHeight - top.value, "px)");
+        } else if (position.value == BoardPosition.TOP) {
+          _transform = "translateY(-".concat(bottom.value, "px)");
+        }
+      }
+      return _transform;
+    });
+    var getStyle = computed(function () {
+      var _customStyle$value$fi;
+      var fixed = {};
+      var margin = '';
+      if (((_customStyle$value$fi = customStyle.value.fixed) === null || _customStyle$value$fi === void 0 ? void 0 : _customStyle$value$fi.length) != 4) {
+        customStyle.value.fixed = [0, 0, 0, 0];
+      }
+      if (isString(customStyle.value.margin)) {
+        margin = customStyle.value.margin;
+      } else {
+        var _customStyle$value$ma;
+        if (((_customStyle$value$ma = customStyle.value.margin) === null || _customStyle$value$ma === void 0 ? void 0 : _customStyle$value$ma.length) != 4) {
+          customStyle.value.margin = [0, 0, 0, 0];
+          margin = _toConsumableArray(unref(customStyle).margin).join(' ');
+        }
+      }
+      var _customStyle$value$fi2 = _slicedToArray(customStyle.value.fixed, 4),
+        t = _customStyle$value$fi2[0],
+        r = _customStyle$value$fi2[1],
+        b = _customStyle$value$fi2[2],
+        l = _customStyle$value$fi2[3];
+      if ([BoardPosition.EAST, BoardPosition.WEST].includes(position.value)) {
+        fixed = {
+          top: t || 0,
+          bottom: b || 0
+        };
+      } else if ([BoardPosition.FULL].includes(position.value)) {
+        fixed = {
+          top: t || 0,
+          bottom: b || 0,
+          left: l || 0,
+          right: r || 0
+        };
+      } else if ([BoardPosition.TOP].includes(position.value)) {
+        fixed = {
+          top: t || 0,
+          left: l || 0,
+          right: r || 0
+        };
+      } else {
+        fixed = {
+          left: l || 0,
+          right: r || 0
+        };
+      }
+      return _objectSpread(_objectSpread({}, fixed), {}, {
+        margin: margin,
+        transform: transform.value
+      });
+    });
+    onMounted(function () {
+      var _el$value;
+      el === null || el === void 0 || (_el$value = el.value) === null || _el$value === void 0 || (_el$value = _el$value.style) === null || _el$value === void 0 || _el$value.setProperty('--board-tab-color', color.value);
+    });
     watch(function () {
-      return props.board;
-    }, function (value, oldValue, onCleanup) {
-      console.log(value, oldValue);
-    }, {});
+      return customStyle.value.color;
+    }, function () {
+      var _el$value2;
+      el === null || el === void 0 || (_el$value2 = el.value) === null || _el$value2 === void 0 || (_el$value2 = _el$value2.style) === null || _el$value2 === void 0 || _el$value2.setProperty('--board-tab-color', color.value);
+    }, {
+      deep: true
+    });
     return function (_ctx, _cache) {
-      var _ctx$board;
-      var _component_Icon = resolveComponent("Icon");
+      var _unref2;
       var _component_el_tab_pane = resolveComponent("el-tab-pane");
       var _component_el_tabs = resolveComponent("el-tabs");
       return openBlock(), createElementBlock("div", {
-        "class": normalizeClass([prefixCls, _ctx.board.state, _ctx.position, 'p-2']),
-        style: {
-          "top": "0"
-        }
+        "class": normalizeClass([prefixCls, unref(board).state, unref(position), 'p-2']),
+        style: normalizeStyle(getStyle.value),
+        ref_key: "el",
+        ref: el
       }, [createElementVNode("span", {
         onClick: withModifiers(toggle, ["stop"]),
         "class": normalizeClass(['board--wing', {
           hidden: !icon.value
-        }]),
-        color: "primary"
-      }, [createVNode(_component_Icon, {
+        }])
+      }, [createVNode(unref(script$1), {
+        size: 26,
         icon: icon.value
       }, null, 8, ["icon"])], 2), createElementVNode("div", {
         "class": normalizeClass("".concat(prefixCls, "__layout h-full flex"))
-      }, [_ctx.board.items.length > 1 ? (openBlock(), createElementBlock(Fragment, {
+      }, [unref(board).items.length > 1 ? (openBlock(), createElementBlock(Fragment, {
         key: 0
       }, [createElementVNode("div", null, [createVNode(_component_el_tabs, {
         "class": "multiple-toggle-tab",
-        modelValue: _ctx.board.value,
+        modelValue: unref(board).value,
         "onUpdate:modelValue": _cache[0] || (_cache[0] = function ($event) {
-          return _ctx.board.value = $event;
+          return unref(board).value = $event;
         }),
         onTabClick: tabClick,
-        "tab-position": 'right'
+        "tab-position": tabPosition.value,
+        "data-content": unref(customStyle).color
       }, {
         "default": withCtx(function () {
-          return [(openBlock(true), createElementBlock(Fragment, null, renderList(_ctx.board.items, function (b, i) {
+          return [(openBlock(true), createElementBlock(Fragment, null, renderList(unref(board).items, function (b, i) {
             return openBlock(), createBlock(_component_el_tab_pane, {
-              key: b === null || b === void 0 ? void 0 : b.value,
+              key: b === null || b === void 0 ? void 0 : b.id,
               name: b.id,
               label: b.label
             }, {
@@ -94,18 +195,18 @@ var script = defineComponent({
           }), 128))];
         }),
         _: 1
-      }, 8, ["modelValue"])]), createElementVNode("div", _hoisted_2, [(openBlock(true), createElementBlock(Fragment, null, renderList((_ctx$board = _ctx.board) === null || _ctx$board === void 0 ? void 0 : _ctx$board.items, function (item) {
+      }, 8, ["modelValue", "tab-position", "data-content"])]), createElementVNode("div", _hoisted_2, [(openBlock(true), createElementBlock(Fragment, null, renderList((_unref2 = unref(board)) === null || _unref2 === void 0 ? void 0 : _unref2.items, function (item) {
         return openBlock(), createElementBlock("div", {
           key: item.id,
           "class": normalizeClass(["board--panel-container", {
-            active: _ctx.board.value === item.id
+            active: unref(board).value === item.id
           }])
-        }, [withDirectives((openBlock(), createBlock(resolveDynamicComponent(markRaw(resolve(item.content))), normalizeProps(guardReactiveProps(item.props)), null, 16)), [[vShow, _ctx.board.value === item.id]])], 2);
-      }), 128))])], 64)) : (openBlock(), createElementBlock("div", _hoisted_3, [(openBlock(true), createElementBlock(Fragment, null, renderList(_ctx.board.items, function (item) {
+        }, [withDirectives((openBlock(), createBlock(resolveDynamicComponent(markRaw(resolve(item.content))), normalizeProps(guardReactiveProps(item.props)), null, 16)), [[vShow, unref(board).value === item.id]])], 2);
+      }), 128))])], 64)) : (openBlock(), createElementBlock("div", _hoisted_3, [(openBlock(true), createElementBlock(Fragment, null, renderList(unref(board).items, function (item) {
         return withDirectives((openBlock(), createBlock(resolveDynamicComponent(markRaw(resolve(item.content))), normalizeProps(mergeProps({
           key: item.id
-        }, item.props)), null, 16)), [[vShow, _ctx.board.value === item.id]]);
-      }), 128))]))], 2)], 2);
+        }, item.props)), null, 16)), [[vShow, unref(board).value === item.id]]);
+      }), 128))]))], 2)], 6);
     };
   }
 });

package/dist/components/Boards/src/props.d.ts

@@ -11,6 +11,18 @@ export type BoardState = {
     index: number;
     value: string | number;
 };
+export type CustomStyle = {
+    margin?: [string | number, string | number, string | number, string | number];
+    fixed?: [string | number, string | number, string | number, string | number];
+    color?: string;
+};
+export declare enum BoardPosition {
+    EAST = "east",
+    TOP = "top",
+    WEST = "west",
+    SOUTH = "south",
+    FULL = "full"
+}
 export declare const BoardProps: {
     position: import("vue-types").VueTypeDef<string> & {
         default: string;
@@ -24,4 +36,12 @@ export declare const BoardProps: {
             state: string;
         };
     };
+    customStyle: {
+        type: () => CustomStyle;
+        default: () => {
+            margin: any[];
+            fixed: any[];
+            color: string;
+        };
+    };
 };

package/dist/components/Boards/src/props.js

@@ -1,5 +1,13 @@
 import propTypes from '../../../utils/propTypes.js';
 
+var BoardPosition;
+(function (BoardPosition) {
+  BoardPosition["EAST"] = "east";
+  BoardPosition["TOP"] = "top";
+  BoardPosition["WEST"] = "west";
+  BoardPosition["SOUTH"] = "south";
+  BoardPosition["FULL"] = "full";
+})(BoardPosition || (BoardPosition = {}));
 var BoardProps = {
   position: propTypes.oneOf(['east', 'top', 'west', 'south', 'full']).def('east'),
   board: {
@@ -12,7 +20,17 @@ var BoardProps = {
         state: 'spread'
       };
     }
+  },
+  customStyle: {
+    type: Object,
+    "default": function _default() {
+      return {
+        margin: [],
+        fixed: [],
+        color: 'red'
+      };
+    }
   }
 };
 
-export { BoardProps };
+export { BoardPosition, BoardProps };

package/dist/components/Editor/src/Editor.vue2.js

@@ -44,9 +44,7 @@ var script = defineComponent({
     }, function (val) {
       if (val === unref(valueHtml)) return;
       valueHtml.value = val;
-    }, {
-      immediate: true
-    });
+    }, {});
     watch(function () {
       return valueHtml.value;
     }, function (val) {
@@ -54,6 +52,7 @@ var script = defineComponent({
     });
     var handleCreated = function handleCreated(editor) {
       editorRef.value = editor;
+      valueHtml.value = props.modelValue;
     };
     var editorConfig = computed(function () {
       return Object.assign({

package/dist/components/Form/src/Form.vue2.js

@@ -163,7 +163,7 @@ var script = defineComponent({
               options = _context.sent;
               setSchema([{
                 field: item.field,
-                path: item.component === ComponentNameEnum.TREE_SELECT ? 'componentProps.data' : 'componentProps.options',
+                path: item.component === ComponentNameEnum.TREE_SELECT || item.component === ComponentNameEnum.TRANSFER ? 'componentProps.data' : 'componentProps.options',
                 value: options
               }]);
             case 4:
@@ -293,7 +293,7 @@ var script = defineComponent({
               };
             }
             var Comp = function Comp() {
-              var _item$componentProps5;
+              var _item$componentProps5, _item$componentProps6;
               var itemVal = computed({
                 get: function get$1() {
                   return get(formModel.value, item.field);
@@ -302,7 +302,19 @@ var script = defineComponent({
                   set(formModel.value, item.field, val);
                 }
               });
-              return createVNode(Com, mergeProps({
+              return item.component === ComponentNameEnum.UPLOAD ? createVNode(Com, mergeProps({
+                "file-list": itemVal.value,
+                "onUpdate:file-list": function onUpdateFileList($event) {
+                  return itemVal.value = $event;
+                },
+                "ref": function ref(el) {
+                  return setComponentRefMap(el, item.field);
+                }
+              }, autoSetPlaceholder && setTextPlaceholder(item), setComponentProps(item), {
+                "style": ((_item$componentProps5 = item.componentProps) === null || _item$componentProps5 === void 0 ? void 0 : _item$componentProps5.style) || {
+                  width: '100%'
+                }
+              }), slotsMap) : createVNode(Com, mergeProps({
                 "modelValue": itemVal.value,
                 "onUpdate:modelValue": function onUpdateModelValue($event) {
                   return itemVal.value = $event;
@@ -311,7 +323,7 @@ var script = defineComponent({
                   return setComponentRefMap(el, item.field);
                 }
               }, autoSetPlaceholder && setTextPlaceholder(item), setComponentProps(item), {
-                "style": ((_item$componentProps5 = item.componentProps) === null || _item$componentProps5 === void 0 ? void 0 : _item$componentProps5.style) || {}
+                "style": ((_item$componentProps6 = item.componentProps) === null || _item$componentProps6 === void 0 ? void 0 : _item$componentProps6.style) || {}
               }), slotsMap);
             };
             return createVNode(Fragment, null, [Comp()]);

package/dist/components/Modal/src/BasicModal.vue.d.ts

@@ -39,6 +39,10 @@ declare const _default: import("vue").DefineComponent<{
         type: BooleanConstructor;
         default: boolean;
     };
+    background: {
+        type: StringConstructor;
+        default: string;
+    };
     maximizer: {
         type: BooleanConstructor;
         default: boolean;
@@ -101,7 +105,20 @@ declare const _default: import("vue").DefineComponent<{
         type: NumberConstructor;
         default: () => number;
     };
-    sizes: ArrayConstructor;
+    sizes: {
+        (arrayLength: number): (string | number)[];
+        (...items: (string | number)[]): (string | number)[];
+        new (arrayLength: number): (string | number)[];
+        new (...items: (string | number)[]): (string | number)[];
+        isArray(arg: any): arg is any[];
+        readonly prototype: any[];
+        from<T>(arrayLike: ArrayLike<T>): T[];
+        from<T_1, U>(arrayLike: ArrayLike<T_1>, mapfn: (v: T_1, k: number) => U, thisArg?: any): U[];
+        from<T_2>(iterable: Iterable<T_2> | ArrayLike<T_2>): T_2[];
+        from<T_3, U_1>(iterable: Iterable<T_3> | ArrayLike<T_3>, mapfn: (v: T_3, k: number) => U_1, thisArg?: any): U_1[];
+        of<T_4>(...items: T_4[]): T_4[];
+        readonly [Symbol.species]: ArrayConstructor;
+    };
     offset: ObjectConstructor;
     overflow: StringConstructor;
     modally: BooleanConstructor;
@@ -164,6 +181,10 @@ declare const _default: import("vue").DefineComponent<{
         type: BooleanConstructor;
         default: boolean;
     };
+    background: {
+        type: StringConstructor;
+        default: string;
+    };
     maximizer: {
         type: BooleanConstructor;
         default: boolean;
@@ -226,7 +247,20 @@ declare const _default: import("vue").DefineComponent<{
         type: NumberConstructor;
         default: () => number;
     };
-    sizes: ArrayConstructor;
+    sizes: {
+        (arrayLength: number): (string | number)[];
+        (...items: (string | number)[]): (string | number)[];
+        new (arrayLength: number): (string | number)[];
+        new (...items: (string | number)[]): (string | number)[];
+        isArray(arg: any): arg is any[];
+        readonly prototype: any[];
+        from<T>(arrayLike: ArrayLike<T>): T[];
+        from<T_1, U>(arrayLike: ArrayLike<T_1>, mapfn: (v: T_1, k: number) => U, thisArg?: any): U[];
+        from<T_2>(iterable: Iterable<T_2> | ArrayLike<T_2>): T_2[];
+        from<T_3, U_1>(iterable: Iterable<T_3> | ArrayLike<T_3>, mapfn: (v: T_3, k: number) => U_1, thisArg?: any): U_1[];
+        of<T_4>(...items: T_4[]): T_4[];
+        readonly [Symbol.species]: ArrayConstructor;
+    };
     offset: ObjectConstructor;
     overflow: StringConstructor;
     modally: BooleanConstructor;
@@ -257,6 +291,7 @@ declare const _default: import("vue").DefineComponent<{
     onCancel: (...args: any[]) => any;
     onSubmit: (...args: any[]) => any;
     header: boolean;
+    background: string;
     maximizer: boolean;
     closer: boolean;
     maximum: any;

package/dist/components/Modal/src/BasicModal.vue2.js

@@ -38,7 +38,6 @@ var script = defineComponent({
     watch(function () {
       return visible.value;
     }, function (value) {
-      console.log('.....', value);
       innerVisible.value = value;
     }, {
       deep: true
@@ -80,7 +79,6 @@ var script = defineComponent({
     var bodyStyle = computed(function () {
       return toBodyStyle(props, locator, maximum);
     });
-    console.log('--titleAftertitleAfter-', props);
     var getBindValue = computed(function () {
       return _objectSpread(_objectSpread(_objectSpread(_objectSpread({}, attrs), slots), props), {}, {
         onSwitch: onSwitch,
@@ -103,8 +101,11 @@ var script = defineComponent({
       var _slotFn = props === null || props === void 0 ? void 0 : props.title;
       return (_slot !== null && _slot !== void 0 ? _slot : isFunction(_slotFn)) ? _slotFn === null || _slotFn === void 0 ? void 0 : _slotFn() : _slotFn;
     };
+    var hasMover = computed(function () {
+      return !!(slots !== null && slots !== void 0 && slots['mover']);
+    });
     return function () {
-      var _props$animation, _props$animation2;
+      var _props$animation, _props$animation2, _slots$mover, _slots$default;
       return innerVisible.value ? createVNode("div", {
         "class": "component modal dialog component-modal-page-wrap ".concat(mainClass.value),
         "style": mainStyle.value
@@ -123,9 +124,11 @@ var script = defineComponent({
               return getTitleBefore();
             },
             icon: function icon() {
-              return createVNode(script$3, {
+              return props.headerIcon ? createVNode(script$3, {
+                "color": "white",
+                "size": 26,
                 "icon": props.headerIcon
-              }, null);
+              }, null) : null;
             },
             title: function title() {
               return getTitle();
@@ -135,12 +138,9 @@ var script = defineComponent({
             }
           }), createVNode("div", {
             "class": "modal--content component-modal-content"
-          }, {
-            "default": function _default() {
-              var _slots$default;
-              return (_slots$default = slots["default"]) === null || _slots$default === void 0 ? void 0 : _slots$default.call(slots);
-            }
-          }), withDirectives(createVNode(script$1, null, null), [[resolveDirective("bind"), getBindValue]])])];
+          }, [hasMover.value && createVNode("div", {
+            "class": "mover ".concat(moverClass)
+          }, [(_slots$mover = slots.mover) === null || _slots$mover === void 0 ? void 0 : _slots$mover.call(slots)]), (_slots$default = slots["default"]) === null || _slots$default === void 0 ? void 0 : _slots$default.call(slots)]), withDirectives(createVNode(script$1, null, null), [[resolveDirective("bind"), getBindValue]])])];
         }
       })]) : null;
     };

package/dist/components/Modal/src/components/ModalHeader.vue.d.ts

@@ -3,6 +3,10 @@ declare const _default: import("vue").DefineComponent<{
         type: BooleanConstructor;
         default: boolean;
     };
+    background: {
+        type: StringConstructor;
+        default: string;
+    };
     maximizer: {
         type: BooleanConstructor;
         default: boolean;
@@ -67,6 +71,10 @@ declare const _default: import("vue").DefineComponent<{
         type: BooleanConstructor;
         default: boolean;
     };
+    background: {
+        type: StringConstructor;
+        default: string;
+    };
     maximizer: {
         type: BooleanConstructor;
         default: boolean;
@@ -126,6 +134,7 @@ declare const _default: import("vue").DefineComponent<{
     };
 }>>, {
     header: boolean;
+    background: string;
     maximizer: boolean;
     closer: boolean;
     maximum: any;

package/dist/components/Modal/src/components/ModalHeader.vue2.js

@@ -1,4 +1,4 @@
-import { defineComponent, openBlock, createElementBlock, normalizeClass, unref, createCommentVNode, createElementVNode, normalizeStyle, renderSlot, createVNode, withModifiers } from 'vue';
+import { defineComponent, computed, openBlock, createElementBlock, normalizeClass, unref, normalizeStyle, createCommentVNode, createElementVNode, renderSlot, createBlock, withModifiers } from 'vue';
 import { headerProps } from '../props.js';
 import '../../../Icon/src/Icon.vue.js';
 import { moverClass } from '../config.js';
@@ -23,20 +23,23 @@ var _hoisted_4 = {
 var _hoisted_5 = {
   "class": "modal-header-right-control-wrap"
 };
-var _hoisted_6 = {
-  key: 0,
-  "class": "header--control"
-};
 var script = defineComponent({
   __name: 'ModalHeader',
   props: headerProps,
   setup: function setup(__props) {
     var props = __props;
+    var getStyle = computed(function () {
+      return {
+        background: props.background,
+        color: '#fff'
+      };
+    });
     return function (_ctx, _cache) {
       var _ctx$switcherIcon;
       return !!_ctx.header ? (openBlock(), createElementBlock("div", {
         key: 0,
         "class": normalizeClass(['component-modal-header', unref(moverClass)]),
+        style: normalizeStyle(getStyle.value),
         onDblclick: _cache[0] || (_cache[0] = function () {
           return _ctx.onSwitch();
         })
@@ -45,17 +48,21 @@ var script = defineComponent({
         style: normalizeStyle({
           'justify-content': props.titleAlign
         })
-      }, [createCommentVNode(" 左侧的信息"), _ctx.$slots.headerBefore ? (openBlock(), createElementBlock("div", _hoisted_1, [renderSlot(_ctx.$slots, "headerBefore")])) : createCommentVNode("v-if", true), createCommentVNode("图标"), _ctx.$slots.icon ? (openBlock(), createElementBlock("div", _hoisted_2, [renderSlot(_ctx.$slots, "icon")])) : createCommentVNode("v-if", true), createCommentVNode("文字"), _ctx.$slots.title ? (openBlock(), createElementBlock("div", _hoisted_3, [renderSlot(_ctx.$slots, "title")])) : createCommentVNode("v-if", true), createCommentVNode("追加"), _ctx.$slots.headerAfter ? (openBlock(), createElementBlock("div", _hoisted_4, [renderSlot(_ctx.$slots, "headerAfter")])) : createCommentVNode("v-if", true)], 4), createCommentVNode("   右侧的按钮"), createElementVNode("div", _hoisted_5, [!!_ctx.switcherIcon || !!_ctx.closerIcon ? (openBlock(), createElementBlock("div", _hoisted_6, [createCommentVNode("        @ts-ignore"), createVNode(script$1, {
+      }, [createCommentVNode(" 左侧的信息"), _ctx.$slots.headerBefore ? (openBlock(), createElementBlock("div", _hoisted_1, [renderSlot(_ctx.$slots, "headerBefore")])) : createCommentVNode("v-if", true), createCommentVNode("图标"), _ctx.$slots.icon ? (openBlock(), createElementBlock("div", _hoisted_2, [renderSlot(_ctx.$slots, "icon")])) : createCommentVNode("v-if", true), createCommentVNode("文字"), _ctx.$slots.title ? (openBlock(), createElementBlock("div", _hoisted_3, [renderSlot(_ctx.$slots, "title")])) : createCommentVNode("v-if", true), createCommentVNode("追加"), _ctx.$slots.headerAfter ? (openBlock(), createElementBlock("div", _hoisted_4, [renderSlot(_ctx.$slots, "headerAfter")])) : createCommentVNode("v-if", true)], 4), createCommentVNode("   右侧的按钮"), createElementVNode("div", _hoisted_5, [!!_ctx.switcherIcon ? (openBlock(), createBlock(script$1, {
+        key: 0,
         "class": "cursor-pointer",
-        size: 24,
+        size: 28,
+        color: "white",
         onClick: withModifiers(_ctx.onSwitch, ["stop"]),
         icon: (_ctx$switcherIcon = _ctx.switcherIcon) === null || _ctx$switcherIcon === void 0 ? void 0 : _ctx$switcherIcon[props.maximum].image
-      }, null, 8, ["onClick", "icon"]), createVNode(script$1, {
-        size: 24,
+      }, null, 8, ["onClick", "icon"])) : createCommentVNode("v-if", true), !!_ctx.closerIcon ? (openBlock(), createBlock(script$1, {
+        key: 1,
+        size: 28,
+        color: "white",
         "class": "cursor-pointer",
         onClick: withModifiers(_ctx.onClose, ["stop"]),
         icon: _ctx.closerIcon.image
-      }, null, 8, ["onClick", "icon"])])) : createCommentVNode("v-if", true)])], 34)) : createCommentVNode("v-if", true);
+      }, null, 8, ["onClick", "icon"])) : createCommentVNode("v-if", true)])], 38)) : createCommentVNode("v-if", true);
     };
   }
 });