vant 3.5.2 → 3.6.0

package/lib/composables/use-height.js

@@ -22,14 +22,20 @@ __export(stdin_exports, {
 module.exports = __toCommonJS(stdin_exports);
 var import_use = require("@vant/use");
 var import_vue = require("vue");
-const useHeight = (element) => {
+var import_on_popup_reopen = require("./on-popup-reopen");
+const useHeight = (element, withSafeArea) => {
   const height = (0, import_vue.ref)();
   const setHeight = () => {
     height.value = (0, import_use.useRect)(element).height;
   };
   (0, import_vue.onMounted)(() => {
     (0, import_vue.nextTick)(setHeight);
-    setTimeout(setHeight, 100);
+    if (withSafeArea) {
+      for (let i = 1; i <= 3; i++) {
+        setTimeout(setHeight, 100 * i);
+      }
+    }
   });
+  (0, import_on_popup_reopen.onPopupReopen)(() => (0, import_vue.nextTick)(setHeight));
   return height;
 };

package/lib/composables/use-lock-scroll.js

@@ -28,9 +28,11 @@ let totalLockCount = 0;
 const BODY_LOCK_CLASS = "van-overflow-hidden";
 function useLockScroll(rootRef, shouldLock) {
   const touch = (0, import_use_touch.useTouch)();
+  const DIRECTION_UP = "01";
+  const DIRECTION_DOWN = "10";
   const onTouchMove = (event) => {
     touch.move(event);
-    const direction = touch.deltaY.value > 0 ? "10" : "01";
+    const direction = touch.deltaY.value > 0 ? DIRECTION_DOWN : DIRECTION_UP;
     const el = (0, import_use.getScrollParent)(event.target, rootRef.value);
     const { scrollHeight, offsetHeight, scrollTop } = el;
     let status = "11";

package/lib/composables/use-placeholder.js

@@ -23,7 +23,7 @@ module.exports = __toCommonJS(stdin_exports);
 var import_vue = require("vue");
 var import_use_height = require("./use-height");
 function usePlaceholder(contentRef, bem) {
-  const height = (0, import_use_height.useHeight)(contentRef);
+  const height = (0, import_use_height.useHeight)(contentRef, true);
   return (renderContent) => (0, import_vue.createVNode)("div", {
     "class": bem("placeholder"),
     "style": {

package/lib/config-provider/ConfigProvider.d.ts

@@ -9,6 +9,7 @@ declare const configProviderProps: {
         type: PropType<keyof HTMLElementTagNameMap>;
         default: keyof HTMLElementTagNameMap;
     };
+    zIndex: NumberConstructor;
     themeVars: PropType<Record<string, Numeric>>;
     iconPrefix: StringConstructor;
 };
@@ -18,6 +19,7 @@ declare const _default: import("vue").DefineComponent<{
         type: PropType<keyof HTMLElementTagNameMap>;
         default: keyof HTMLElementTagNameMap;
     };
+    zIndex: NumberConstructor;
     themeVars: PropType<Record<string, Numeric>>;
     iconPrefix: StringConstructor;
 }, () => JSX.Element, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, Record<string, any>, string, import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<ExtractPropTypes<{
@@ -25,6 +27,7 @@ declare const _default: import("vue").DefineComponent<{
         type: PropType<keyof HTMLElementTagNameMap>;
         default: keyof HTMLElementTagNameMap;
     };
+    zIndex: NumberConstructor;
     themeVars: PropType<Record<string, Numeric>>;
     iconPrefix: StringConstructor;
 }>>, {

package/lib/config-provider/ConfigProvider.js

@@ -24,10 +24,12 @@ module.exports = __toCommonJS(stdin_exports);
 var import_vue = require("vue");
 var import_vue2 = require("vue");
 var import_utils = require("../utils");
+var import_use_global_z_index = require("../composables/use-global-z-index");
 const [name, bem] = (0, import_utils.createNamespace)("config-provider");
 const CONFIG_PROVIDER_KEY = Symbol(name);
 const configProviderProps = {
   tag: (0, import_utils.makeStringProp)("div"),
+  zIndex: Number,
   themeVars: Object,
   iconPrefix: String
 };
@@ -50,6 +52,11 @@ var stdin_default = (0, import_vue2.defineComponent)({
       }
     });
     (0, import_vue2.provide)(CONFIG_PROVIDER_KEY, props);
+    (0, import_vue2.watchEffect)(() => {
+      if (props.zIndex !== void 0) {
+        (0, import_use_global_z_index.setGlobalZIndex)(props.zIndex);
+      }
+    });
     return () => (0, import_vue.createVNode)(props.tag, {
       "class": bem(),
       "style": style.value

package/lib/config-provider/index.d.ts

@@ -3,6 +3,7 @@ export declare const ConfigProvider: import("../utils").WithInstall<import("vue"
         type: import("vue").PropType<keyof HTMLElementTagNameMap>;
         default: keyof HTMLElementTagNameMap;
     };
+    zIndex: NumberConstructor;
     themeVars: import("vue").PropType<Record<string, import("../utils").Numeric>>;
     iconPrefix: StringConstructor;
 }, () => JSX.Element, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, Record<string, any>, string, import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{
@@ -10,6 +11,7 @@ export declare const ConfigProvider: import("../utils").WithInstall<import("vue"
         type: import("vue").PropType<keyof HTMLElementTagNameMap>;
         default: keyof HTMLElementTagNameMap;
     };
+    zIndex: NumberConstructor;
     themeVars: import("vue").PropType<Record<string, import("../utils").Numeric>>;
     iconPrefix: StringConstructor;
 }>>, {

package/lib/dialog/Dialog.d.ts

@@ -30,7 +30,7 @@ declare const dialogProps: {
     theme: PropType<DialogTheme>;
     width: (NumberConstructor | StringConstructor)[];
     message: PropType<DialogMessage>;
-    callback: PropType<(action?: DialogAction | undefined) => void>;
+    callback: PropType<(action?: DialogAction) => void>;
     allowHtml: BooleanConstructor;
     className: PropType<unknown>;
     transition: {

package/lib/empty/Empty.d.ts

@@ -1,4 +1,4 @@
-import { PropType, type ExtractPropTypes } from 'vue';
+import { type PropType, type ExtractPropTypes } from 'vue';
 import { Numeric } from '../utils';
 declare const emptyProps: {
     image: {

package/lib/empty/Empty.js

@@ -22,15 +22,9 @@ __export(stdin_exports, {
 module.exports = __toCommonJS(stdin_exports);
 var import_vue = require("vue");
 var import_vue2 = require("vue");
+var import_use_id = require("../composables/use-id");
 var import_utils = require("../utils");
-var import_Images = require("./Images");
 const [name, bem] = (0, import_utils.createNamespace)("empty");
-const PRESET_IMAGES = {
-  error: import_Images.renderError,
-  search: import_Images.renderSearch,
-  network: import_Images.renderNetwork,
-  default: import_Images.renderMaterial
-};
 const emptyProps = {
   image: (0, import_utils.makeStringProp)("default"),
   imageSize: [Number, String, Array],
@@ -42,15 +36,6 @@ var stdin_default = (0, import_vue2.defineComponent)({
   setup(props, {
     slots
   }) {
-    const renderImage = () => {
-      var _a;
-      if (slots.image) {
-        return slots.image();
-      }
-      return ((_a = PRESET_IMAGES[props.image]) == null ? void 0 : _a.call(PRESET_IMAGES)) || (0, import_vue.createVNode)("img", {
-        "src": props.image
-      }, null);
-    };
     const renderDescription = () => {
       const description = slots.description ? slots.description() : props.description;
       if (description) {
@@ -66,6 +51,286 @@ var stdin_default = (0, import_vue2.defineComponent)({
         }, [slots.default()]);
       }
     };
+    const baseId = (0, import_use_id.useId)();
+    const getId = (num) => `${baseId}-${num}`;
+    const getUrlById = (num) => `url(#${getId(num)})`;
+    const renderStop = (color, offset, opacity) => (0, import_vue.createVNode)("stop", {
+      "stop-color": color,
+      "offset": `${offset}%`,
+      "stop-opacity": opacity
+    }, null);
+    const renderStops = (fromColor, toColor) => [renderStop(fromColor, 0), renderStop(toColor, 100)];
+    const renderShadow = (id) => [(0, import_vue.createVNode)("defs", null, [(0, import_vue.createVNode)("radialGradient", {
+      "id": getId(id),
+      "cx": "50%",
+      "cy": "54%",
+      "fx": "50%",
+      "fy": "54%",
+      "r": "297%",
+      "gradientTransform": "matrix(-.16 0 0 -.33 .58 .72)"
+    }, [renderStop("#EBEDF0", 0), renderStop("#F2F3F5", 100, 0.3)])]), (0, import_vue.createVNode)("ellipse", {
+      "fill": getUrlById(id),
+      "opacity": ".8",
+      "cx": "80",
+      "cy": "140",
+      "rx": "46",
+      "ry": "8"
+    }, null)];
+    const renderBuilding = () => [(0, import_vue.createVNode)("defs", null, [(0, import_vue.createVNode)("linearGradient", {
+      "id": getId("a"),
+      "x1": "64%",
+      "y1": "100%",
+      "x2": "64%"
+    }, [renderStop("#FFF", 0, 0.5), renderStop("#F2F3F5", 100)])]), (0, import_vue.createVNode)("g", {
+      "opacity": ".8"
+    }, [(0, import_vue.createVNode)("path", {
+      "d": "M36 131V53H16v20H2v58h34z",
+      "fill": getUrlById("a")
+    }, null), (0, import_vue.createVNode)("path", {
+      "d": "M123 15h22v14h9v77h-31V15z",
+      "fill": getUrlById("a")
+    }, null)])];
+    const renderCloud = () => [(0, import_vue.createVNode)("defs", null, [(0, import_vue.createVNode)("linearGradient", {
+      "id": getId("b"),
+      "x1": "64%",
+      "y1": "97%",
+      "x2": "64%",
+      "y2": "0%"
+    }, [renderStop("#F2F3F5", 0, 0.3), renderStop("#F2F3F5", 100)])]), (0, import_vue.createVNode)("g", {
+      "opacity": ".8"
+    }, [(0, import_vue.createVNode)("path", {
+      "d": "M87 6c3 0 7 3 8 6a8 8 0 1 1-1 16H80a7 7 0 0 1-8-6c0-4 3-7 6-7 0-5 4-9 9-9Z",
+      "fill": getUrlById("b")
+    }, null), (0, import_vue.createVNode)("path", {
+      "d": "M19 23c2 0 3 1 4 3 2 0 4 2 4 4a4 4 0 0 1-4 3v1h-7v-1l-1 1c-2 0-3-2-3-4 0-1 1-3 3-3 0-2 2-4 4-4Z",
+      "fill": getUrlById("b")
+    }, null)])];
+    const renderNetwork = () => (0, import_vue.createVNode)("svg", {
+      "viewBox": "0 0 160 160"
+    }, [(0, import_vue.createVNode)("defs", null, [(0, import_vue.createVNode)("linearGradient", {
+      "id": getId(1),
+      "x1": "64%",
+      "y1": "100%",
+      "x2": "64%"
+    }, [renderStop("#FFF", 0, 0.5), renderStop("#F2F3F5", 100)]), (0, import_vue.createVNode)("linearGradient", {
+      "id": getId(2),
+      "x1": "50%",
+      "x2": "50%",
+      "y2": "84%"
+    }, [renderStop("#EBEDF0", 0), renderStop("#DCDEE0", 100, 0)]), (0, import_vue.createVNode)("linearGradient", {
+      "id": getId(3),
+      "x1": "100%",
+      "x2": "100%",
+      "y2": "100%"
+    }, [renderStops("#EAEDF0", "#DCDEE0")]), (0, import_vue.createVNode)("radialGradient", {
+      "id": getId(4),
+      "cx": "50%",
+      "cy": "0%",
+      "fx": "50%",
+      "fy": "0%",
+      "r": "100%",
+      "gradientTransform": "matrix(0 1 -.54 0 .5 -.5)"
+    }, [renderStop("#EBEDF0", 0), renderStop("#FFF", 100, 0)])]), (0, import_vue.createVNode)("g", {
+      "fill": "none"
+    }, [renderBuilding(), (0, import_vue.createVNode)("path", {
+      "fill": getUrlById(4),
+      "d": "M0 139h160v21H0z"
+    }, null), (0, import_vue.createVNode)("path", {
+      "d": "M80 54a7 7 0 0 1 3 13v27l-2 2h-2a2 2 0 0 1-2-2V67a7 7 0 0 1 3-13z",
+      "fill": getUrlById(2)
+    }, null), (0, import_vue.createVNode)("g", {
+      "opacity": ".6",
+      "stroke-linecap": "round",
+      "stroke-width": "7"
+    }, [(0, import_vue.createVNode)("path", {
+      "d": "M64 47a19 19 0 0 0-5 13c0 5 2 10 5 13",
+      "stroke": getUrlById(3)
+    }, null), (0, import_vue.createVNode)("path", {
+      "d": "M53 36a34 34 0 0 0 0 48",
+      "stroke": getUrlById(3)
+    }, null), (0, import_vue.createVNode)("path", {
+      "d": "M95 73a19 19 0 0 0 6-13c0-5-2-9-6-13",
+      "stroke": getUrlById(3)
+    }, null), (0, import_vue.createVNode)("path", {
+      "d": "M106 84a34 34 0 0 0 0-48",
+      "stroke": getUrlById(3)
+    }, null)]), (0, import_vue.createVNode)("g", {
+      "transform": "translate(31 105)"
+    }, [(0, import_vue.createVNode)("rect", {
+      "fill": "#EBEDF0",
+      "width": "98",
+      "height": "34",
+      "rx": "2"
+    }, null), (0, import_vue.createVNode)("rect", {
+      "fill": "#FFF",
+      "x": "9",
+      "y": "8",
+      "width": "80",
+      "height": "18",
+      "rx": "1.1"
+    }, null), (0, import_vue.createVNode)("rect", {
+      "fill": "#EBEDF0",
+      "x": "15",
+      "y": "12",
+      "width": "18",
+      "height": "6",
+      "rx": "1.1"
+    }, null)])])]);
+    const renderMaterial = () => (0, import_vue.createVNode)("svg", {
+      "viewBox": "0 0 160 160"
+    }, [(0, import_vue.createVNode)("defs", null, [(0, import_vue.createVNode)("linearGradient", {
+      "x1": "50%",
+      "x2": "50%",
+      "y2": "100%",
+      "id": getId(5)
+    }, [renderStops("#F2F3F5", "#DCDEE0")]), (0, import_vue.createVNode)("linearGradient", {
+      "x1": "95%",
+      "y1": "48%",
+      "x2": "5.5%",
+      "y2": "51%",
+      "id": getId(6)
+    }, [renderStops("#EAEDF1", "#DCDEE0")]), (0, import_vue.createVNode)("linearGradient", {
+      "y1": "45%",
+      "x2": "100%",
+      "y2": "54%",
+      "id": getId(7)
+    }, [renderStops("#EAEDF1", "#DCDEE0")])]), renderBuilding(), renderCloud(), (0, import_vue.createVNode)("g", {
+      "transform": "translate(36 50)",
+      "fill": "none"
+    }, [(0, import_vue.createVNode)("g", {
+      "transform": "translate(8)"
+    }, [(0, import_vue.createVNode)("rect", {
+      "fill": "#EBEDF0",
+      "opacity": ".6",
+      "x": "38",
+      "y": "13",
+      "width": "36",
+      "height": "53",
+      "rx": "2"
+    }, null), (0, import_vue.createVNode)("rect", {
+      "fill": getUrlById(5),
+      "width": "64",
+      "height": "66",
+      "rx": "2"
+    }, null), (0, import_vue.createVNode)("rect", {
+      "fill": "#FFF",
+      "x": "6",
+      "y": "6",
+      "width": "52",
+      "height": "55",
+      "rx": "1"
+    }, null), (0, import_vue.createVNode)("g", {
+      "transform": "translate(15 17)",
+      "fill": getUrlById(6)
+    }, [(0, import_vue.createVNode)("rect", {
+      "width": "34",
+      "height": "6",
+      "rx": "1"
+    }, null), (0, import_vue.createVNode)("path", {
+      "d": "M0 14h34v6H0z"
+    }, null), (0, import_vue.createVNode)("rect", {
+      "y": "28",
+      "width": "34",
+      "height": "6",
+      "rx": "1"
+    }, null)])]), (0, import_vue.createVNode)("rect", {
+      "fill": getUrlById(7),
+      "y": "61",
+      "width": "88",
+      "height": "28",
+      "rx": "1"
+    }, null), (0, import_vue.createVNode)("rect", {
+      "fill": "#F7F8FA",
+      "x": "29",
+      "y": "72",
+      "width": "30",
+      "height": "6",
+      "rx": "1"
+    }, null)])]);
+    const renderError = () => (0, import_vue.createVNode)("svg", {
+      "viewBox": "0 0 160 160"
+    }, [(0, import_vue.createVNode)("defs", null, [(0, import_vue.createVNode)("linearGradient", {
+      "x1": "50%",
+      "x2": "50%",
+      "y2": "100%",
+      "id": getId(8)
+    }, [renderStops("#EAEDF1", "#DCDEE0")])]), renderBuilding(), renderCloud(), renderShadow("c"), (0, import_vue.createVNode)("path", {
+      "d": "m59 60 21 21 21-21h3l9 9v3L92 93l21 21v3l-9 9h-3l-21-21-21 21h-3l-9-9v-3l21-21-21-21v-3l9-9h3Z",
+      "fill": getUrlById(8)
+    }, null)]);
+    const renderSearch = () => (0, import_vue.createVNode)("svg", {
+      "viewBox": "0 0 160 160"
+    }, [(0, import_vue.createVNode)("defs", null, [(0, import_vue.createVNode)("linearGradient", {
+      "x1": "50%",
+      "y1": "100%",
+      "x2": "50%",
+      "id": getId(9)
+    }, [renderStops("#EEE", "#D8D8D8")]), (0, import_vue.createVNode)("linearGradient", {
+      "x1": "100%",
+      "y1": "50%",
+      "y2": "50%",
+      "id": getId(10)
+    }, [renderStops("#F2F3F5", "#DCDEE0")]), (0, import_vue.createVNode)("linearGradient", {
+      "x1": "50%",
+      "x2": "50%",
+      "y2": "100%",
+      "id": getId(11)
+    }, [renderStops("#F2F3F5", "#DCDEE0")]), (0, import_vue.createVNode)("linearGradient", {
+      "x1": "50%",
+      "x2": "50%",
+      "y2": "100%",
+      "id": getId(12)
+    }, [renderStops("#FFF", "#F7F8FA")])]), renderBuilding(), renderCloud(), renderShadow("d"), (0, import_vue.createVNode)("g", {
+      "transform": "rotate(-45 113 -4)",
+      "fill": "none"
+    }, [(0, import_vue.createVNode)("rect", {
+      "fill": getUrlById(9),
+      "x": "24",
+      "y": "52.8",
+      "width": "5.8",
+      "height": "19",
+      "rx": "1"
+    }, null), (0, import_vue.createVNode)("rect", {
+      "fill": getUrlById(10),
+      "x": "22.1",
+      "y": "67.3",
+      "width": "9.9",
+      "height": "28",
+      "rx": "1"
+    }, null), (0, import_vue.createVNode)("circle", {
+      "stroke": getUrlById(11),
+      "stroke-width": "8",
+      "cx": "27",
+      "cy": "27",
+      "r": "27"
+    }, null), (0, import_vue.createVNode)("circle", {
+      "fill": getUrlById(12),
+      "cx": "27",
+      "cy": "27",
+      "r": "16"
+    }, null), (0, import_vue.createVNode)("path", {
+      "d": "M37 7c-8 0-15 5-16 12",
+      "stroke": getUrlById(11),
+      "stroke-width": "3",
+      "opacity": ".5",
+      "stroke-linecap": "round",
+      "transform": "rotate(45 29 13)"
+    }, null)])]);
+    const renderImage = () => {
+      var _a;
+      if (slots.image) {
+        return slots.image();
+      }
+      const PRESET_IMAGES = {
+        error: renderError,
+        search: renderSearch,
+        network: renderNetwork,
+        default: renderMaterial
+      };
+      return ((_a = PRESET_IMAGES[props.image]) == null ? void 0 : _a.call(PRESET_IMAGES)) || (0, import_vue.createVNode)("img", {
+        "src": props.image
+      }, null);
+    };
     return () => (0, import_vue.createVNode)("div", {
       "class": bem()
     }, [(0, import_vue.createVNode)("div", {

package/lib/field/Field.d.ts

@@ -304,12 +304,12 @@ declare const _default: import("vue").DefineComponent<{
     "onUpdate:modelValue"?: ((...args: any[]) => any) | undefined;
 }, {
     type: FieldType;
+    required: boolean;
     center: boolean;
     autofocus: boolean;
     disabled: boolean;
     isLink: boolean;
     border: boolean;
-    required: boolean;
     clickable: boolean | null;
     clearable: boolean;
     clearIcon: string;

package/lib/field/Field.js

@@ -140,6 +140,9 @@ var stdin_default = (0, import_vue2.defineComponent)({
         return;
       }
       if (rule.validator) {
+        if ((0, import_utils2.isEmptyValue)(value) && rule.validateEmpty === false) {
+          return;
+        }
         return (0, import_utils2.runRuleValidator)(value, rule).then((result) => {
           if (result && typeof result === "string") {
             state.status = "failed";

package/lib/field/index.d.ts

@@ -176,12 +176,12 @@ export declare const Field: import("../utils").WithInstall<import("vue").DefineC
     "onUpdate:modelValue"?: ((...args: any[]) => any) | undefined;
 }, {
     type: import("./types").FieldType;
+    required: boolean;
     center: boolean;
     autofocus: boolean;
     disabled: boolean;
     isLink: boolean;
     border: boolean;
-    required: boolean;
     clickable: boolean | null;
     clearable: boolean;
     clearIcon: string;

package/lib/field/index.less

@@ -78,7 +78,7 @@
     background-color: transparent;
     border: 0;
     resize: none;
-    // https://github.com/youzan/vant/pull/9418
+    // https://github.com/vant-ui/vant/pull/9418
     user-select: auto;
 
     &::placeholder {

package/lib/field/types.d.ts

@@ -23,6 +23,7 @@ export declare type FieldRule = {
     required?: boolean;
     validator?: FieldRuleValidator;
     formatter?: FiledRuleFormatter;
+    validateEmpty?: boolean;
 };
 export declare type FieldValidationStatus = 'passed' | 'failed' | 'unvalidated';
 export declare type FieldFormSharedProps = 'colon' | 'disabled' | 'readonly' | 'labelWidth' | 'labelAlign' | 'inputAlign' | 'errorMessageAlign';

package/lib/field/utils.d.ts

@@ -1,5 +1,6 @@
 import { HTMLAttributes, InputHTMLAttributes } from 'vue';
 import type { FieldRule, FieldType, FieldAutosizeConfig } from './types';
+export declare function isEmptyValue(value: unknown): boolean;
 export declare function runSyncRule(value: unknown, rule: FieldRule): boolean;
 export declare function runRuleValidator(value: unknown, rule: FieldRule): Promise<unknown>;
 export declare function getRuleMessage(value: unknown, rule: FieldRule): string;

package/lib/field/utils.js

@@ -21,6 +21,7 @@ __export(stdin_exports, {
   endComposing: () => endComposing,
   getRuleMessage: () => getRuleMessage,
   getStringLength: () => getStringLength,
+  isEmptyValue: () => isEmptyValue,
   mapInputType: () => mapInputType,
   resizeTextarea: () => resizeTextarea,
   runRuleValidator: () => runRuleValidator,
@@ -39,8 +40,13 @@ function isEmptyValue(value) {
   return !value;
 }
 function runSyncRule(value, rule) {
-  if (rule.required && isEmptyValue(value)) {
-    return false;
+  if (isEmptyValue(value)) {
+    if (rule.required) {
+      return false;
+    }
+    if (rule.validateEmpty === false) {
+      return true;
+    }
   }
   if (rule.pattern && !rule.pattern.test(String(value))) {
     return false;

package/lib/grid-item/index.less

@@ -25,7 +25,7 @@
     color: var(--van-grid-item-text-color);
     font-size: var(--van-grid-item-text-font-size);
     line-height: 1.5;
-    // https://github.com/youzan/vant/issues/3894
+    // https://github.com/vant-ui/vant/issues/3894
     word-break: break-all;
   }