Merge pull request #1877 from DevCloudFE/dev

update main from dev

Author: GreatZPP

packages/devui-vue/devui/action-timeline/src/action-timeline.tsx

@@ -48,10 +48,10 @@ export default defineComponent({
         <div class={timelineItemClass(index, parentIndex, actionData, item)}>
           <div class="vertical-list-item-top">
             <div class="vertical-list-item-top-left">
-              <div class={itemIconClass(item, true)}>
+              {ctx.slots.iconContent?.({ option: item }) || <div class={itemIconClass(item, true)}>
                 {!item.icon && <div class="list-empty-icon-dot"></div>}
                 <em class={itemIconClass(item)}></em>
-              </div>
+              </div>}
               <div class="vertical-list-item-top-left-title">{ctx.slots.title?.({ option: item })}</div>
             </div>
             <div class="dp-action-timeline-item-data">{item.createdAt}</div>
@@ -62,10 +62,10 @@ export default defineComponent({
     const renderHorizontalBody = (actionData: ActionData, parentIndex: number) =>
       actionData.actions?.map((item, index) => (
         <div class={timelineItemClass(index, parentIndex, actionData, item)}>
-          <div class={itemIconClass(item, true)}>
+          {ctx.slots.iconContent?.({ option: item }) || <div class={itemIconClass(item, true)}>
             {!item.icon && <div class="list-empty-icon-dot"></div>}
             <em class={itemIconClass(item)}></em>
-          </div>
+          </div>}
           <div class="dp-action-timeline-list-data">{ctx.slots.content?.({ option: item })}</div>
           <div class="dp-action-timeline-item-date">{item.createdAt}</div>
           {!(actionData.actions && data?.value && index === actionData.actions.length - 1 && parentIndex === data?.value?.length - 1) && (

packages/devui-vue/devui/breadcrumb/src/utils.ts

@@ -1,3 +1,3 @@
-export const getPropsSlot = (slots, props, prop = 'default') => {
+export const getPropsSlot = (slots: any, props: any, prop = 'default') => {
   return props[prop] ?? slots[prop]?.();
 };

packages/devui-vue/devui/category-search/src/composables/use-category-search.ts

@@ -1,6 +1,6 @@
 import { ref, computed, toRefs, provide, watch, onMounted, reactive } from 'vue';
 import type { Ref, SetupContext } from 'vue';
-import { mergeWith, cloneDeep, merge } from 'lodash-es';
+import { mergeWith, cloneDeep, merge } from 'lodash';
 import RadioMenu from '../components/radio-menu';
 import CheckboxMenu from '../components/checkbox-menu';
 import LabelMenu from '../components/label-menu';

packages/devui-vue/devui/editor-md/src/components/toolbar.tsx

@@ -6,20 +6,20 @@ import './toolbar.scss';
 export default defineComponent({
   name: 'DMdToolbar',
   setup() {
-    const { toolbars, toolbarConfig } = useToolbar();
-
+    const { toolbars, toolbarConfig, customToolbars } = useToolbar();
+    const tempToolbars = { ...toolbars, ...customToolbars?.value };
     return () => (
       <div class="md-toolbar-container">
         {toolbarConfig.value.map((item, index) =>
           Array.isArray(item) ? (
             <>
               {item.map((key, idx) => (
-                <ToolbarItem config={toolbars[key]} key={`${index}-${idx}`} />
+                <ToolbarItem config={tempToolbars[key]} key={`${index}-${idx}`} />
               ))}
               <span class="md-toolbar-span"></span>
             </>
           ) : (
-            <ToolbarItem config={toolbars[item]} key={index} />
+            <ToolbarItem config={tempToolbars[item]} key={index} />
           )
         )}
       </div>

packages/devui-vue/devui/editor-md/src/composables/use-editor-md-toolbar.ts

@@ -2,7 +2,7 @@ import { inject } from 'vue';
 import { EditorMdInjectionKey, IEditorMdInjection } from '../editor-md-types';
 
 export function useToolbar() {
-  const { toolbars, toolbarConfig } = inject(EditorMdInjectionKey) as IEditorMdInjection;
+  const { toolbars, toolbarConfig, customToolbars } = inject(EditorMdInjectionKey) as IEditorMdInjection;
 
-  return { toolbars, toolbarConfig };
+  return { toolbars, toolbarConfig, customToolbars };
 }

packages/devui-vue/devui/editor-md/src/composables/use-editor-md.ts

@@ -414,8 +414,10 @@ export function useEditorMd(props: EditorMdProps, ctx: SetupContext) {
     renderRef,
     containerRef,
     toolbars,
+    toolbarConfig,
     previewHtmlList,
     isHintShow,
+    customToolbars,
     getEditorIns,
     onPaste,
     previewContentChange,

packages/devui-vue/devui/editor-md/src/editor-md-types.ts

@@ -136,6 +136,7 @@ export interface IEditorMdInjection {
   showFullscreen: Ref<boolean>;
   toolbars: Record<string, IToolbarItemConfig>;
   toolbarConfig: Ref<ToolbarConfigProp>;
+  customToolbars: Ref<Record<string, IToolbarItemConfig> | undefined> | undefined;
   getEditorIns: () => any;
   t: (name: string) => string;
 }

packages/devui-vue/devui/editor-md/src/editor-md.tsx

@@ -17,6 +17,7 @@ export default defineComponent({
     const {
       mode,
       toolbarConfig,
+      customToolbars,
       editorContainerHeight,
       hidePreviewView,
       placeholder,
@@ -66,6 +67,7 @@ export default defineComponent({
       showFullscreen,
       toolbars,
       toolbarConfig,
+      customToolbars,
       getEditorIns,
       t: locale,
     });

packages/devui-vue/devui/editor-md/src/utils.ts

@@ -84,5 +84,5 @@ export function locale(key: string): string {
     loading: '正在加载中...',
     pasting: '您粘贴内容较多, 正在努力加载中，请耐心等待...',
   };
-  return localeMap[key];
+  return localeMap[key] || key;
 }

packages/devui-vue/devui/input-number/__tests__/input-number.spec.tsx

@@ -279,3 +279,20 @@ describe('d-input-number', () => {
     expect(selectFn).toBeCalledTimes(2);
   });
 });
+
+
+it('allowEmpty', async () => {
+  const num = ref();
+  const wrapper = mount({
+    setup() {
+      return () => <DInputNumber v-model={num.value} allowEmpty={true} ></DInputNumber>;
+    },
+  });
+  num.value = undefined;
+  const inputInner = wrapper.find(ns.e('input-box'));
+  expect((inputInner.element as HTMLInputElement).value).toBeNull;
+  num.value = 51;
+  expect((inputInner.element as HTMLInputElement).value).toBe('51');
+  num.value = '';
+  expect((inputInner.element as HTMLInputElement).value).toBeNull;
+});