plain-design 1.0.0-beta.95 → 1.0.0-beta.96

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "plain-design",
-  "version": "1.0.0-beta.95",
+  "version": "1.0.0-beta.96",
   "description": "",
   "main": "dist/plain-design.min.js",
   "module": "dist/plain-design.commonjs.min.js",

package/src/packages/components/Form/form.scss

@@ -49,6 +49,12 @@
     .form-item-content {
       display: inline-block;
       box-sizing: border-box;
+
+      .form-item-content-inner {
+        & > .#{componentName(form-item)}:first-child {
+          margin-top: 0 !important;
+        }
+      }
     }
 
     &.form-item-label-align-left {

package/src/packages/components/createScrollDraggier/index.ts

@@ -21,15 +21,19 @@ export function createScrollDraggier(
     getScroll,
     dataModel,
     getItemElements,
+    getHost,
+    getStrut,
     onDraggierStart,
     onDraggierMove,
     onDraggierEnd,
     onDraggierTap,
   }: {
     props: { horizontal: boolean },
-    getScroll: () => PlainScroll | undefined,
+    getScroll: undefined | null | (() => PlainScroll | undefined),
     dataModel: { value: any[] | undefined | null },
     getItemElements: () => HTMLElement[],
+    getHost?: () => HTMLElement,
+    getStrut?: () => HTMLElement,
 
     onDraggierStart?: iVirtualDraggierHandler,
     onDraggierMove?: iVirtualDraggierHandler,
@@ -39,7 +43,7 @@ export function createScrollDraggier(
 ) {
 
   /*管理自动滚动*/
-  const autoScrollManager = createAutoScrollManager(getScroll);
+  const autoScrollManager = !getScroll ? null : createAutoScrollManager(getScroll);
 
   /*静态变量*/
   const dragStaticState = {
@@ -83,11 +87,11 @@ export function createScrollDraggier(
       throw new Error(`Can't find [data-vid] elements!`);
     }
 
-    dragStaticState.hostElement = findParentElement(dragStaticState.dragElement, el => hasClass(el, getComponentCls('scroll')))!;
+    dragStaticState.hostElement = getHost ? getHost() : findParentElement(dragStaticState.dragElement, el => hasClass(el, getComponentCls('scroll')))!;
     if (!dragStaticState.hostElement) {
       throw new Error(`Can't find host elements`);
     }
-    dragStaticState.strutElement = findParentElement(dragStaticState.dragElement, el => hasClass(el, 'scroll-content'))!;
+    dragStaticState.strutElement = getStrut ? getStrut() : findParentElement(dragStaticState.dragElement, el => hasClass(el, 'scroll-content'))!;
     if (!dragStaticState.strutElement) {
       throw new Error(`Can't find strut elements`);
     }
@@ -200,14 +204,14 @@ export function createScrollDraggier(
       dragReactiveState.onScroll = (e: Event) => {
         update();
       };
-      const ejectOnScroll = getScroll()!.on.onScroll(dragReactiveState.onScroll);
+      const ejectOnScroll = !getScroll ? null : getScroll()?.on.onScroll(dragReactiveState.onScroll);
       draggierEffects.push(() => {
-        ejectOnScroll();
+        ejectOnScroll?.();
         dragReactiveState.onScroll = doNothing;
       });
 
       /*拖拽结束的时候停止自动滚动*/
-      draggierEffects.push(() => getScroll()?.methods.stopAutoScroll());
+      draggierEffects.push(() => getScroll?.()?.methods.stopAutoScroll());
       draggierEffects.push(async () => {
         await dragReactiveState.endingDefer.promise;
         dragReactiveState.pointIndex = null;
@@ -301,11 +305,11 @@ export function createScrollDraggier(
       const resultStart = Math.max(minStart, Math.min(maxStart, newStart));
 
       if (resultStart == minStart) {
-        autoScrollManager.set(props.horizontal ? 'left' : 'top');
+        autoScrollManager?.set(props.horizontal ? 'left' : 'top');
       } else if (resultStart == maxStart) {
-        autoScrollManager.set(props.horizontal ? 'right' : 'bottom');
+        autoScrollManager?.set(props.horizontal ? 'right' : 'bottom');
       } else {
-        autoScrollManager.set(null);
+        autoScrollManager?.set(null);
       }
 
       const styleName = props.horizontal ? 'left' : 'top';