xrk-components 2.0.0-beta.74 → 2.0.0-beta.76

package/lib/index.esm.js

@@ -74141,7 +74141,7 @@ script$i.__file = "packages/xrk/search/search.vue";
 
 var __default__$f = { name: 'base-cascader' };
 var script$h = /*#__PURE__*/ defineComponent(__assign(__assign({}, __default__$f), { props: {
-        options: { type: [Array, Function], required: true },
+        options: { type: [Array, Function], required: false },
         modelValue: { type: null, required: false },
         size: { type: String, required: false },
         placeholder: { type: String, required: false },
@@ -74177,6 +74177,8 @@ var script$h = /*#__PURE__*/ defineComponent(__assign(__assign({}, __default__$f
         });
         var cascaderOptions = computed(function () {
             var _a;
+            if (!_props.options)
+                return [];
             if (typeof _props.options === 'function') {
                 return (_a = _props.options) === null || _a === void 0 ? void 0 : _a.call(_props, _props.modelValue);
             }
@@ -76906,12 +76908,7 @@ var script$2 = /*#__PURE__*/ defineComponent(__assign(__assign({}, __default__$2
         var props = __props;
         var ctx = getCurrentInstance();
         var slots = useSlots();
-        var menuList = computed(function () {
-            var _a;
-            if (props.menuType === 'vertical')
-                return props.menus;
-            return ((_a = currentMenu.value) === null || _a === void 0 ? void 0 : _a.menuList) || [];
-        });
+        var menuList = ref(props.menuType === 'vertical' ? props.menus : []);
         var hideMenuFlag = computed(function () {
             if (props.menuType === 'horizontal') {
                 return !props.hideMenu && menuList.value.length;
@@ -76939,7 +76936,7 @@ var script$2 = /*#__PURE__*/ defineComponent(__assign(__assign({}, __default__$2
             }
         };
         watch(function () { var _a, _b, _c; return (_c = (_b = (_a = ctx === null || ctx === void 0 ? void 0 : ctx.appContext) === null || _a === void 0 ? void 0 : _a.config) === null || _b === void 0 ? void 0 : _b.globalProperties) === null || _c === void 0 ? void 0 : _c.$route; }, function () {
-            var _a, _b, _c;
+            var _a, _b, _c, _d;
             if (props.menuType === 'horizontal') {
                 var _route_1 = (_c = (_b = (_a = ctx === null || ctx === void 0 ? void 0 : ctx.appContext) === null || _a === void 0 ? void 0 : _a.config) === null || _b === void 0 ? void 0 : _b.globalProperties) === null || _c === void 0 ? void 0 : _c.$route;
                 currentMenu.value = menuBase.value.find(function (item) {
@@ -76947,6 +76944,7 @@ var script$2 = /*#__PURE__*/ defineComponent(__assign(__assign({}, __default__$2
                     var arr = menusMap.get(((_a = _route_1 === null || _route_1 === void 0 ? void 0 : _route_1.meta) === null || _a === void 0 ? void 0 : _a.parentPath) || (_route_1 === null || _route_1 === void 0 ? void 0 : _route_1.path)) || [];
                     return arr.includes(item.url);
                 });
+                menuList.value = ((_d = currentMenu.value) === null || _d === void 0 ? void 0 : _d.menuList) || [];
             }
         }, { immediate: true });
         var MenuTopRender = defineComponent({
@@ -77028,7 +77026,7 @@ var script$2 = /*#__PURE__*/ defineComponent(__assign(__assign({}, __default__$2
                         }, {
                             default: withCtx(function () { return [
                                 createVNode(unref(BaseLayoutMenu), {
-                                    menus: unref(menuList),
+                                    menus: menuList.value,
                                     onMenuClick: _cache[0] || (_cache[0] = function (menu) { return emits('menuClick', menu); })
                                 }, null, 8 /* PROPS */, ["menus"])
                             ]; }),

package/lib/index.umd.js

@@ -74144,7 +74144,7 @@ usage: app.provide(ZINDEX_INJECTION_KEY, { current: 0 })`);
 
   var __default__$f = { name: 'base-cascader' };
   var script$h = /*#__PURE__*/ vue.defineComponent(__assign(__assign({}, __default__$f), { props: {
-          options: { type: [Array, Function], required: true },
+          options: { type: [Array, Function], required: false },
           modelValue: { type: null, required: false },
           size: { type: String, required: false },
           placeholder: { type: String, required: false },
@@ -74180,6 +74180,8 @@ usage: app.provide(ZINDEX_INJECTION_KEY, { current: 0 })`);
           });
           var cascaderOptions = vue.computed(function () {
               var _a;
+              if (!_props.options)
+                  return [];
               if (typeof _props.options === 'function') {
                   return (_a = _props.options) === null || _a === void 0 ? void 0 : _a.call(_props, _props.modelValue);
               }
@@ -76909,12 +76911,7 @@ usage: app.provide(ZINDEX_INJECTION_KEY, { current: 0 })`);
           var props = __props;
           var ctx = vue.getCurrentInstance();
           var slots = vue.useSlots();
-          var menuList = vue.computed(function () {
-              var _a;
-              if (props.menuType === 'vertical')
-                  return props.menus;
-              return ((_a = currentMenu.value) === null || _a === void 0 ? void 0 : _a.menuList) || [];
-          });
+          var menuList = vue.ref(props.menuType === 'vertical' ? props.menus : []);
           var hideMenuFlag = vue.computed(function () {
               if (props.menuType === 'horizontal') {
                   return !props.hideMenu && menuList.value.length;
@@ -76942,7 +76939,7 @@ usage: app.provide(ZINDEX_INJECTION_KEY, { current: 0 })`);
               }
           };
           vue.watch(function () { var _a, _b, _c; return (_c = (_b = (_a = ctx === null || ctx === void 0 ? void 0 : ctx.appContext) === null || _a === void 0 ? void 0 : _a.config) === null || _b === void 0 ? void 0 : _b.globalProperties) === null || _c === void 0 ? void 0 : _c.$route; }, function () {
-              var _a, _b, _c;
+              var _a, _b, _c, _d;
               if (props.menuType === 'horizontal') {
                   var _route_1 = (_c = (_b = (_a = ctx === null || ctx === void 0 ? void 0 : ctx.appContext) === null || _a === void 0 ? void 0 : _a.config) === null || _b === void 0 ? void 0 : _b.globalProperties) === null || _c === void 0 ? void 0 : _c.$route;
                   currentMenu.value = menuBase.value.find(function (item) {
@@ -76950,6 +76947,7 @@ usage: app.provide(ZINDEX_INJECTION_KEY, { current: 0 })`);
                       var arr = menusMap.get(((_a = _route_1 === null || _route_1 === void 0 ? void 0 : _route_1.meta) === null || _a === void 0 ? void 0 : _a.parentPath) || (_route_1 === null || _route_1 === void 0 ? void 0 : _route_1.path)) || [];
                       return arr.includes(item.url);
                   });
+                  menuList.value = ((_d = currentMenu.value) === null || _d === void 0 ? void 0 : _d.menuList) || [];
               }
           }, { immediate: true });
           var MenuTopRender = vue.defineComponent({
@@ -77031,7 +77029,7 @@ usage: app.provide(ZINDEX_INJECTION_KEY, { current: 0 })`);
                           }, {
                               default: vue.withCtx(function () { return [
                                   vue.createVNode(vue.unref(BaseLayoutMenu), {
-                                      menus: vue.unref(menuList),
+                                      menus: menuList.value,
                                       onMenuClick: _cache[0] || (_cache[0] = function (menu) { return emits('menuClick', menu); })
                                   }, null, 8 /* PROPS */, ["menus"])
                               ]; }),

package/lib/packages/base/cascader/cascader.d.ts

@@ -1,7 +1,7 @@
 declare const _default: import("vue").DefineComponent<{
     options: {
         type: (ArrayConstructor | FunctionConstructor)[];
-        required: true;
+        required: false;
     };
     modelValue: {
         type: null;
@@ -122,7 +122,7 @@ declare const _default: import("vue").DefineComponent<{
 }>, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, ("update:modelValue" | "change" | "expand-change" | "blur" | "focus" | "visible-change" | "remove-tag")[], "update:modelValue" | "change" | "expand-change" | "blur" | "focus" | "visible-change" | "remove-tag", import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{
     options: {
         type: (ArrayConstructor | FunctionConstructor)[];
-        required: true;
+        required: false;
     };
     modelValue: {
         type: null;

package/lib/packages/base/cascader/index.d.ts

@@ -26,7 +26,7 @@ export interface BaseCascaderProps extends BaseCascaderListener, Omit<CascaderPr
      * 选择项
      * 可通过函数形式，动态修改选择项的配置（activeValue 是当前 选择的内容）
      */
-    options: Array<OptionProps> | ((activeValue: Array<any>) => Array<OptionProps>);
+    options?: Array<OptionProps> | ((activeValue: Array<any>) => Array<OptionProps>);
     size?: 'large' | 'default' | 'small';
     placeholder?: string;
     disabled?: boolean;

package/lib/packages/base/cascader/test.d.ts

@@ -0,0 +1,7 @@
+declare const _default: {
+    name: string;
+    components: import("vue").VNode<import("vue").RendererNode, import("vue").RendererElement, {
+        [key: string]: any;
+    }>[];
+};
+export default _default;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "xrk-components",
-  "version": "2.0.0-beta.74",
+  "version": "2.0.0-beta.76",
   "description": "",
   "main": "lib/index.esm.js",
   "typings": "lib/packages/index.d.ts",