@ditari/bsui 1.1.35 → 1.1.37

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # @ditari/bsui
 
+## 1.1.37
+
+### Patch Changes
+
+- 修复 show 组件，菜单收缩的时候没用进行添加宽度的 bug
+
+## 1.1.36
+
+### Patch Changes
+
+- 日期控件，回写初始数据
+
 ## 1.1.35
 
 ### Patch Changes

package/dist/cjs/date/RangePicker.cjs

@@ -28,7 +28,6 @@ var RangePicker = /* @__PURE__ */ vue.defineComponent({
     attrs
   }) {
     const dates = vue.ref([]);
-    const modelValue = vue.ref(props.value);
     const internalModel = vue.ref((props == null ? void 0 : props.value) || {});
     const onChange = (dates2) => {
       if (!dates2) {
@@ -43,11 +42,22 @@ var RangePicker = /* @__PURE__ */ vue.defineComponent({
       emit("update:value", internalModel.value);
     };
     vue.watchEffect(() => {
+      const value = props.value;
       props.field.forEach((key, index) => {
-        if (modelValue[key] === "") {
+        if (value[key] === "") {
           dates.value && (dates.value[index] = "");
         } else {
-          dates.value && (dates.value[index] = modelValue.value[key]);
+          dates.value && (dates.value[index] = value[key]);
+        }
+      });
+    });
+    vue.watchEffect(() => {
+      const value = props.value;
+      props.field.forEach((key, index) => {
+        if (value[key] === "") {
+          dates.value && (dates.value[index] = "");
+        } else {
+          dates.value && (dates.value[index] = value[key]);
         }
       });
     });

package/dist/cjs/date/RangePicker.cjs.map

@@ -1 +1 @@
-{"version":3,"file":"RangePicker.cjs","sources":["../../../src/date/RangePicker.tsx"],"sourcesContent":["import { defineComponent, ref, watchEffect } from \"vue\";\nimport type { PropType } from \"vue\";\nimport { RangePicker } from \"ant-design-vue\";\n\n/**\n * 日期范围控件\n */\nexport default defineComponent({\n  name: \"DRangePicker\",\n  props: {\n    value: {\n      type: Object as PropType<{ [name: string]: unknown }>\n    },\n    field: {\n      required: true,\n      default: [] as string[]\n    },\n    format: {\n      default: \"YYYY-MM-DD\"\n    },\n    valueFormat: {\n      default: \"YYYY-MM-DD\"\n    }\n  },\n  emits: [\"update:value\"],\n  setup(props, { emit, attrs }) {\n    const dates = ref<string[]>([]);\n    const modelValue: any = ref(props.value);\n\n    //内部model\n    const internalModel = ref<{ [name: string]: unknown }>(props?.value || {});\n\n    // 监听日期变化\n    const onChange = (dates: [any, any]) => {\n      if (!dates) {\n        props.field.forEach((key) => {\n          internalModel.value[key] = \"\";\n        });\n      } else {\n        props.field.forEach((key, index) => {\n          internalModel.value[key] = dates[index];\n        });\n      }\n      emit(\"update:value\", internalModel.value);\n    };\n\n    watchEffect(() => {\n      props.field.forEach((key, index) => {\n        if (modelValue[key] === \"\") {\n          dates.value && (dates.value[index] = \"\");\n        } else {\n          dates.value && (dates.value[index] = modelValue.value[key]);\n        }\n      });\n    });\n\n    return () => (\n      <div>\n        <RangePicker\n          {...attrs}\n          v-model:value={dates.value}\n          onChange={onChange}\n          format={props.format}\n          valueFormat={props.valueFormat}\n          style={{ width: \"100%\" }}\n        ></RangePicker>\n      </div>\n    );\n  }\n});\n"],"names":["defineComponent","name","props","value","type","Object","field","required","default","format","valueFormat","emits","setup","emit","attrs","dates","ref","modelValue","internalModel","onChange","forEach","key","index","watchEffect","_createVNode","RangePicker","_mergeProps","$event","width"],"mappings":"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"}
+{"version":3,"file":"RangePicker.cjs","sources":["../../../src/date/RangePicker.tsx"],"sourcesContent":["import { defineComponent, ref, watchEffect } from \"vue\";\nimport type { PropType } from \"vue\";\nimport { RangePicker } from \"ant-design-vue\";\n\n/**\n * 日期范围控件\n */\nexport default defineComponent({\n  name: \"DRangePicker\",\n  props: {\n    value: {\n      type: Object as PropType<{ [name: string]: unknown }>\n    },\n    field: {\n      required: true,\n      default: [] as string[]\n    },\n    format: {\n      default: \"YYYY-MM-DD\"\n    },\n    valueFormat: {\n      default: \"YYYY-MM-DD\"\n    }\n  },\n  emits: [\"update:value\"],\n  setup(props, { emit, attrs }) {\n    const dates = ref<string[]>([]);\n\n    //内部model\n    const internalModel = ref<{ [name: string]: unknown }>(props?.value || {});\n\n    // 监听日期变化\n    const onChange = (dates: [any, any]) => {\n      if (!dates) {\n        props.field.forEach((key) => {\n          internalModel.value[key] = \"\";\n        });\n      } else {\n        props.field.forEach((key, index) => {\n          internalModel.value[key] = dates[index];\n        });\n      }\n      emit(\"update:value\", internalModel.value);\n    };\n\n    watchEffect(() => {\n      const value: any = props.value;\n      props.field.forEach((key, index) => {\n        if (value[key] === \"\") {\n          dates.value && (dates.value[index] = \"\");\n        } else {\n          dates.value && (dates.value[index] = value[key]);\n        }\n      });\n    });\n\n    watchEffect(() => {\n      const value: any = props.value;\n      props.field.forEach((key, index) => {\n        if (value[key] === \"\") {\n          dates.value && (dates.value[index] = \"\");\n        } else {\n          dates.value && (dates.value[index] = value[key]);\n        }\n      });\n    });\n\n    return () => (\n      <div>\n        <RangePicker\n          {...attrs}\n          v-model:value={dates.value}\n          onChange={onChange}\n          format={props.format}\n          valueFormat={props.valueFormat}\n          style={{ width: \"100%\" }}\n        ></RangePicker>\n      </div>\n    );\n  }\n});\n"],"names":["defineComponent","name","props","value","type","Object","field","required","default","format","valueFormat","emits","setup","emit","attrs","dates","ref","internalModel","onChange","forEach","key","index","watchEffect","_createVNode","RangePicker","_mergeProps","$event","width"],"mappings":"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"}

package/dist/cjs/layout/FuckMain.vue.d.ts

@@ -1,11 +1,4 @@
-declare const _default: import("vue").DefineComponent<{
-    showConfig: {
-        type: null;
-        required: true;
-        default: any;
-    };
-}, {
-    props: any;
+declare const _default: import("vue").DefineComponent<{}, {
     store: import("pinia").Store<string, {
         list: string[];
     }, {
@@ -131,13 +124,5 @@ declare const _default: import("vue").DefineComponent<{
         readonly CloseOutlined: import("@ant-design/icons-vue/lib/icons/CloseOutlined").CloseOutlinedIconType;
     }, {}, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, string, import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{}>>, {}, {}>;
     readonly Menu: import("vue").DefineComponent<{}, () => JSX.Element, {}, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, string, import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{}>>, {}, {}>;
-}, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, string, import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{
-    showConfig: {
-        type: null;
-        required: true;
-        default: any;
-    };
-}>>, {
-    showConfig: any;
-}, {}>;
+}, {}, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, string, import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{}>>, {}, {}>;
 export default _default;

package/dist/cjs/layout/FuckMain.vue2.cjs

@@ -13,17 +13,12 @@ const _hoisted_2 = { class: "ditari-menu" };
 const _hoisted_3 = { class: "ditari-user-menu" };
 var _sfc_main = /* @__PURE__ */ vue.defineComponent({
   __name: "FuckMain",
-  props: {
-    "showConfig": { type: null, required: true, default: { backBtn: "LeftOutlined" } }
-  },
   setup(__props) {
-    const props = __props;
     const store$1 = store.useKeepAliveStore();
     const keepAliveNames = vue.computed(() => store$1.get);
     const settingsStore = store.useSettingsStore();
     const { switchCollapsed } = settingsStore;
     const collapsedStatus = vue.computed(() => settingsStore.getCollapsed);
-    vue.provide("showConfig", props.showConfig);
     return (_ctx, _cache) => {
       const _component_a_layout_sider = vue.resolveComponent("a-layout-sider");
       const _component_router_view = vue.resolveComponent("router-view");
@@ -80,26 +75,7 @@ var _sfc_main = /* @__PURE__ */ vue.defineComponent({
                       vue.createVNode(NavTabs.default),
                       vue.createElementVNode("div", _hoisted_3, [
                         vue.renderSlot(_ctx.$slots, "operation")
-                      ]),
-                      vue.createCommentVNode('        <div class="ditari-layout-header">'),
-                      vue.createCommentVNode('          <div class="ditari-layout-header-left">'),
-                      vue.createCommentVNode('            <div class="ditari-side-collapsed" @click="switchCollapsed">'),
-                      vue.createCommentVNode("              <menu-unfold-outlined"),
-                      vue.createCommentVNode('                v-if="collapsedStatus"'),
-                      vue.createCommentVNode('                class="trigger"'),
-                      vue.createCommentVNode('                style="font-size: 16px; font-weight: bold; cursor: pointer"'),
-                      vue.createCommentVNode("              />"),
-                      vue.createCommentVNode("              <menu-fold-outlined"),
-                      vue.createCommentVNode("                v-else"),
-                      vue.createCommentVNode('                style="font-size: 16px; font-weight: bold; cursor: pointer"'),
-                      vue.createCommentVNode("              />"),
-                      vue.createCommentVNode("            </div>"),
-                      vue.createCommentVNode("            "),
-                      vue.createCommentVNode("          </div>"),
-                      vue.createCommentVNode('          <div class="ditari-user-menu">'),
-                      vue.createCommentVNode('            <slot name="operation"></slot>'),
-                      vue.createCommentVNode("          </div>"),
-                      vue.createCommentVNode("        </div>")
+                      ])
                     ],
                     4
                     /* STYLE */

package/dist/cjs/layout/FuckMain.vue2.cjs.map

@@ -1 +1 @@
-{"version":3,"file":"FuckMain.vue2.cjs","sources":["../../../src/layout/FuckMain.vue"],"sourcesContent":["<script setup lang=\"ts\">\n/**\n * FUCK MAIN 入口文件\n */\nimport { computed, provide } from \"vue\";\nimport { MenuFoldOutlined, MenuUnfoldOutlined } from \"@ant-design/icons-vue\";\nimport { useKeepAliveStore, useSettingsStore } from \"@ditari/store\";\n\n//标签页组件\nimport DNavTabs from \"./NavTabs.vue\";\n// 菜单组件\nimport Menu from \"../menu/Menu\";\n\nconst props = defineProps({\n  \"showConfig\": { type: null, required: true, default: { backBtn: \"LeftOutlined\" } as any }\n});\n\n// 缓存store\nconst store = useKeepAliveStore();\n// 缓存的names\nconst keepAliveNames = computed(() => store.get);\n// 设置store\nconst settingsStore = useSettingsStore();\nconst { switchCollapsed } = settingsStore;\nconst collapsedStatus = computed(() => settingsStore.getCollapsed);\n\n// 注入show组件的配置文件\nprovide(\"showConfig\", props.showConfig);\n</script>\n<template>\n  <a-layout class=\"ditari-layout\">\n    <a-layout-sider\n      v-model:collapsed=\"collapsedStatus\"\n      :trigger=\"null\"\n      collapsible\n      class=\"ditari-layout-sider\"\n    >\n      <div class=\"ditari-logo\">\n        <slot name=\"logo\"></slot>\n      </div>\n      <div class=\"ditari-menu\">\n        <Menu />\n      </div>\n    </a-layout-sider>\n    <a-layout>\n      <div\n        class=\"ditari-fuck-top-layout\"\n        :style=\"{ left: collapsedStatus ? '80px' : '200px' }\"\n      >\n        <div class=\"ditari-side-collapsed\" @click=\"switchCollapsed\">\n          <menu-unfold-outlined\n            v-if=\"collapsedStatus\"\n            class=\"trigger\"\n            style=\"font-size: 16px; font-weight: bold; cursor: pointer\"\n          />\n          <menu-fold-outlined\n            v-else\n            style=\"font-size: 16px; font-weight: bold; cursor: pointer\"\n          />\n        </div>\n        <d-nav-tabs />\n        <div class=\"ditari-user-menu\">\n          <slot name=\"operation\"></slot>\n        </div>\n        <!--        <div class=\"ditari-layout-header\">-->\n        <!--          <div class=\"ditari-layout-header-left\">-->\n        <!--            <div class=\"ditari-side-collapsed\" @click=\"switchCollapsed\">-->\n        <!--              <menu-unfold-outlined-->\n        <!--                v-if=\"collapsedStatus\"-->\n        <!--                class=\"trigger\"-->\n        <!--                style=\"font-size: 16px; font-weight: bold; cursor: pointer\"-->\n        <!--              />-->\n        <!--              <menu-fold-outlined-->\n        <!--                v-else-->\n        <!--                style=\"font-size: 16px; font-weight: bold; cursor: pointer\"-->\n        <!--              />-->\n        <!--            </div>-->\n        <!--            -->\n        <!--          </div>-->\n        <!--          <div class=\"ditari-user-menu\">-->\n        <!--            <slot name=\"operation\"></slot>-->\n        <!--          </div>-->\n        <!--        </div>-->\n      </div>\n      <a-layout-content\n        style=\"margin-top: 42px\"\n        class=\"ditari-layout-content\"\n        :style=\"{ marginLeft: collapsedStatus ? '80px' : '200px' }\"\n      >\n        <router-view v-slot=\"{ Component }\">\n          <transition name=\"main\" mode=\"out-in\" appear>\n            <keep-alive ref=\"keepAliveRef\" :include=\"keepAliveNames\">\n              <component :is=\"Component\" :key=\"$route.path\" />\n            </keep-alive>\n          </transition>\n        </router-view>\n        <slot name=\"micro\"></slot>\n      </a-layout-content>\n    </a-layout>\n  </a-layout>\n  <a-back-top class=\"ditari-ant-back-top\" :visibility-height=\"50\"></a-back-top>\n</template>\n"],"names":["store","useKeepAliveStore","computed","useSettingsStore","provide"],"mappings":";;;;;;;;;;;;;;;;;;;;AAkBA,IAAA,MAAMA,UAAQC,uBAAkB,EAAA,CAAA;AAEhC,IAAA,MAAM,cAAiB,GAAAC,YAAA,CAAS,MAAMF,OAAA,CAAM,GAAG,CAAA,CAAA;AAE/C,IAAA,MAAM,gBAAgBG,sBAAiB,EAAA,CAAA;AACvC,IAAM,MAAA,EAAE,iBAAoB,GAAA,aAAA,CAAA;AAC5B,IAAA,MAAM,eAAkB,GAAAD,YAAA,CAAS,MAAM,aAAA,CAAc,YAAY,CAAA,CAAA;AAGjE,IAAQE,WAAA,CAAA,YAAA,EAAc,MAAM,UAAU,CAAA,CAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;"}
+{"version":3,"file":"FuckMain.vue2.cjs","sources":["../../../src/layout/FuckMain.vue"],"sourcesContent":["<script setup lang=\"ts\">\n/**\n * FUCK MAIN 入口文件\n */\nimport { computed } from \"vue\";\nimport { MenuFoldOutlined, MenuUnfoldOutlined } from \"@ant-design/icons-vue\";\nimport { useKeepAliveStore, useSettingsStore } from \"@ditari/store\";\n\n//标签页组件\nimport DNavTabs from \"./NavTabs.vue\";\n// 菜单组件\nimport Menu from \"../menu/Menu\";\n\n// 缓存store\nconst store = useKeepAliveStore();\n// 缓存的names\nconst keepAliveNames = computed(() => store.get);\n// 设置store\nconst settingsStore = useSettingsStore();\nconst { switchCollapsed } = settingsStore;\nconst collapsedStatus = computed(() => settingsStore.getCollapsed);\n</script>\n<template>\n  <a-layout class=\"ditari-layout\">\n    <a-layout-sider\n      v-model:collapsed=\"collapsedStatus\"\n      :trigger=\"null\"\n      collapsible\n      class=\"ditari-layout-sider\"\n    >\n      <div class=\"ditari-logo\">\n        <slot name=\"logo\"></slot>\n      </div>\n      <div class=\"ditari-menu\">\n        <Menu />\n      </div>\n    </a-layout-sider>\n    <a-layout>\n      <div\n        class=\"ditari-fuck-top-layout\"\n        :style=\"{ left: collapsedStatus ? '80px' : '200px' }\"\n      >\n        <div class=\"ditari-side-collapsed\" @click=\"switchCollapsed\">\n          <menu-unfold-outlined\n            v-if=\"collapsedStatus\"\n            class=\"trigger\"\n            style=\"font-size: 16px; font-weight: bold; cursor: pointer\"\n          />\n          <menu-fold-outlined\n            v-else\n            style=\"font-size: 16px; font-weight: bold; cursor: pointer\"\n          />\n        </div>\n        <d-nav-tabs />\n        <div class=\"ditari-user-menu\">\n          <slot name=\"operation\"></slot>\n        </div>\n      </div>\n      <a-layout-content\n        style=\"margin-top: 42px\"\n        class=\"ditari-layout-content\"\n        :style=\"{ marginLeft: collapsedStatus ? '80px' : '200px' }\"\n      >\n        <router-view v-slot=\"{ Component }\">\n          <transition name=\"main\" mode=\"out-in\" appear>\n            <keep-alive ref=\"keepAliveRef\" :include=\"keepAliveNames\">\n              <component :is=\"Component\" :key=\"$route.path\" />\n            </keep-alive>\n          </transition>\n        </router-view>\n        <slot name=\"micro\"></slot>\n      </a-layout-content>\n    </a-layout>\n  </a-layout>\n  <a-back-top class=\"ditari-ant-back-top\" :visibility-height=\"50\"></a-back-top>\n</template>\n"],"names":["store","useKeepAliveStore","computed","useSettingsStore"],"mappings":";;;;;;;;;;;;;;;;AAcA,IAAA,MAAMA,UAAQC,uBAAkB,EAAA,CAAA;AAEhC,IAAA,MAAM,cAAiB,GAAAC,YAAA,CAAS,MAAMF,OAAA,CAAM,GAAG,CAAA,CAAA;AAE/C,IAAA,MAAM,gBAAgBG,sBAAiB,EAAA,CAAA;AACvC,IAAM,MAAA,EAAE,iBAAoB,GAAA,aAAA,CAAA;AAC5B,IAAA,MAAM,eAAkB,GAAAD,YAAA,CAAS,MAAM,aAAA,CAAc,YAAY,CAAA,CAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;"}

package/dist/cjs/layout/List.vue2.cjs

@@ -78,6 +78,9 @@ var _sfc_main = /* @__PURE__ */ vue.defineComponent({
     vue.watchEffect(() => {
       calcHeight();
     });
+    core.useResizeObserver(document.body, () => {
+      calcHeight();
+    });
     function calcHeight() {
       show.value = false;
       vue.nextTick(() => {

package/dist/cjs/layout/List.vue2.cjs.map

@@ -1 +1 @@
-{"version":3,"file":"List.vue2.cjs","sources":["../../../src/layout/List.vue"],"sourcesContent":["<script lang=\"ts\">\nconst marginBottom = 16\n</script>\n<script setup lang=\"ts\">\nimport {\n  useSlots,\n  ref,\n  onActivated,\n  watch,\n  onDeactivated,\n  onUnmounted,\n  WatchStopHandle,\n  inject,\n  nextTick,\n  watchEffect\n} from \"vue\";\nimport { useElementSize } from \"@vueuse/core\";\nimport { useSettingsStore } from \"@ditari/store\";\nimport { storeToRefs } from \"pinia\";\nimport { useRoute } from \"vue-router\";\n\nconst emits = defineEmits([\"refresh\"]);\n\nconst slots = useSlots();\nconst store = useSettingsStore();\nconst route = useRoute();\nconst configProvider = inject(\"configProvider\") as any;\n\nconst { refresh } = storeToRefs(store);\n\nconst toolsRef = ref();\nconst tableRef = ref();\n\nconst show = ref(false);\nconst height = ref(0);\n\nlet stopHandleWatch: WatchStopHandle;\n\nwatch(\n  () => configProvider?.componentSize,\n  () => {\n    calcHeight();\n  }\n);\n\nuseReload();\n// 处理标签重载\nfunction useReload() {\n  // !route.meta.keepAlive\n  if (!route.name) {\n    stopHandleWatch = useWatch();\n    // 卸载未缓存的组件\n    onUnmounted(() => {\n      stopHandleWatch();\n    });\n  } else {\n    // 激活缓存页面\n    onActivated(() => {\n      if (refresh.value) {\n        refresh.value = false;\n        emits(\"refresh\");\n      }\n      stopHandleWatch = useWatch();\n    });\n    // 离开缓存页面\n    onDeactivated(() => {\n      stopHandleWatch();\n    });\n  }\n}\n\nfunction useWatch() {\n  //点击了标签重载图标\n  return watch(\n    () => refresh.value,\n    (val) => {\n      if (val) {\n        // 发送刷新事件到列表页面\n        emits(\"refresh\");\n      }\n    }\n  );\n}\n\n// 监听表单高度变化\n// 然后再获取表格高度\nconst formRef = ref(null);\nconst { height: formHeight } = useElementSize(formRef);\nwatch(\n  () => formHeight.value,\n  () => {\n    calcHeight();\n  },\n  { immediate: true }\n);\n\nwatchEffect(() => {\n  calcHeight();\n});\n\n// 动态计算高度\nfunction calcHeight() {\n  show.value = false;\n  nextTick(() => {\n    height.value = tableRef?.value?.offsetHeight;\n    show.value = true;\n  });\n}\n</script>\n<template>\n  <div class=\"ditari-list-layout\">\n    <div ref=\"contentRef\" class=\"wrapper\">\n      <a-card\n        ref=\"formRef\"\n        :bordered=\"false\"\n        :class=\"{ 'ditari-list-form': slots.form }\"\n        :style=\"{ 'margin-bottom': slots.form ? marginBottom + 'px' : 0 }\"\n      >\n        <slot name=\"form\" />\n      </a-card>\n      <a-card class=\"ditari-list-table\" :bordered=\"false\">\n        <div\n          ref=\"toolsRef\"\n          class=\"xi-tools\"\n          :style=\"{ 'margin-bottom': slots.tools ? marginBottom + 'px' : 0 }\"\n        >\n          <a-space>\n            <slot name=\"tools\"></slot>\n          </a-space>\n        </div>\n        <div ref=\"tableRef\" style=\"flex: 1\">\n          <div v-show=\"show\" style=\"height: 100%\">\n            <slot name=\"table\" :height=\"height\" />\n          </div>\n        </div>\n      </a-card>\n    </div>\n    <div class=\"ditari-content-extra\">\n      <slot></slot>\n    </div>\n  </div>\n</template>\n<style></style>\n"],"names":["useSlots","store","useSettingsStore","useRoute","inject","storeToRefs","ref","watch","onUnmounted","onActivated","onDeactivated","useElementSize","watchEffect","nextTick"],"mappings":"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"}
+{"version":3,"file":"List.vue2.cjs","sources":["../../../src/layout/List.vue"],"sourcesContent":["<script lang=\"ts\">\nconst marginBottom = 16\n</script>\n<script setup lang=\"ts\">\nimport {\n  useSlots,\n  ref,\n  onActivated,\n  watch,\n  onDeactivated,\n  onUnmounted,\n  WatchStopHandle,\n  inject,\n  nextTick,\n  watchEffect\n} from \"vue\";\nimport { useElementSize, useResizeObserver } from \"@vueuse/core\";\nimport { useSettingsStore } from \"@ditari/store\";\nimport { storeToRefs } from \"pinia\";\nimport { useRoute } from \"vue-router\";\n\nconst emits = defineEmits([\"refresh\"]);\n\nconst slots = useSlots();\nconst store = useSettingsStore();\nconst route = useRoute();\nconst configProvider = inject(\"configProvider\") as any;\n\nconst { refresh } = storeToRefs(store);\n\nconst toolsRef = ref();\nconst tableRef = ref();\n\nconst show = ref(false);\nconst height = ref(0);\n\nlet stopHandleWatch: WatchStopHandle;\n\nwatch(\n  () => configProvider?.componentSize,\n  () => {\n    calcHeight();\n  }\n);\n\nuseReload();\n// 处理标签重载\nfunction useReload() {\n  // !route.meta.keepAlive\n  if (!route.name) {\n    stopHandleWatch = useWatch();\n    // 卸载未缓存的组件\n    onUnmounted(() => {\n      stopHandleWatch();\n    });\n  } else {\n    // 激活缓存页面\n    onActivated(() => {\n      if (refresh.value) {\n        refresh.value = false;\n        emits(\"refresh\");\n      }\n      stopHandleWatch = useWatch();\n    });\n    // 离开缓存页面\n    onDeactivated(() => {\n      stopHandleWatch();\n    });\n  }\n}\n\nfunction useWatch() {\n  //点击了标签重载图标\n  return watch(\n    () => refresh.value,\n    (val) => {\n      if (val) {\n        // 发送刷新事件到列表页面\n        emits(\"refresh\");\n      }\n    }\n  );\n}\n\n// 监听表单高度变化\n// 然后再获取表格高度\nconst formRef = ref(null);\nconst { height: formHeight } = useElementSize(formRef);\nwatch(\n  () => formHeight.value,\n  () => {\n    calcHeight();\n  },\n  { immediate: true }\n);\n\nwatchEffect(() => {\n  calcHeight();\n});\n\nuseResizeObserver(document.body, () => {\n  calcHeight();\n});\n\n// 动态计算高度\nfunction calcHeight() {\n  show.value = false;\n  nextTick(() => {\n    height.value = tableRef?.value?.offsetHeight;\n    show.value = true;\n  });\n}\n</script>\n<template>\n  <div class=\"ditari-list-layout\">\n    <div ref=\"contentRef\" class=\"wrapper\">\n      <a-card\n        ref=\"formRef\"\n        :bordered=\"false\"\n        :class=\"{ 'ditari-list-form': slots.form }\"\n        :style=\"{ 'margin-bottom': slots.form ? marginBottom + 'px' : 0 }\"\n      >\n        <slot name=\"form\" />\n      </a-card>\n      <a-card class=\"ditari-list-table\" :bordered=\"false\">\n        <div\n          ref=\"toolsRef\"\n          class=\"xi-tools\"\n          :style=\"{ 'margin-bottom': slots.tools ? marginBottom + 'px' : 0 }\"\n        >\n          <a-space>\n            <slot name=\"tools\"></slot>\n          </a-space>\n        </div>\n        <div ref=\"tableRef\" style=\"flex: 1\">\n          <div v-show=\"show\" style=\"height: 100%\">\n            <slot name=\"table\" :height=\"height\" />\n          </div>\n        </div>\n      </a-card>\n    </div>\n    <div class=\"ditari-content-extra\">\n      <slot></slot>\n    </div>\n  </div>\n</template>\n<style></style>\n"],"names":["useSlots","store","useSettingsStore","useRoute","inject","storeToRefs","ref","watch","onUnmounted","onActivated","onDeactivated","useElementSize","watchEffect","useResizeObserver","nextTick"],"mappings":"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"}

package/dist/cjs/layout/Show.vue.d.ts

@@ -82,6 +82,7 @@ declare const _default: import("vue").DefineComponent<{
         gridMatching(): any;
     }>;
     showConfig: any;
+    collapsedStatus: import("vue").ComputedRef<boolean>;
     btnRender: () => import("vue").VNode<import("vue").RendererNode, import("vue").RendererElement, {
         [key: string]: any;
     }>;

package/dist/cjs/layout/Show.vue2.cjs

@@ -10,10 +10,6 @@ var store = require('@ditari/store');
 var pinia = require('pinia');
 
 const _hoisted_1 = { class: "ditari-show-layout" };
-const _hoisted_2 = {
-  key: 0,
-  class: "ditari-show-footer"
-};
 const delayTime = 200;
 var _sfc_main = /* @__PURE__ */ vue.defineComponent({
   __name: "Show",
@@ -29,6 +25,7 @@ var _sfc_main = /* @__PURE__ */ vue.defineComponent({
     const navTabStore = store.useNavTabsStore();
     const settingsStore = store.useSettingsStore();
     const showConfig = vue.inject("showConfig");
+    const collapsedStatus = vue.computed(() => settingsStore.getCollapsed);
     const btnRender = () => {
       if (!showConfig) {
         return vue.h(iconsVue.LeftOutlined);
@@ -106,9 +103,19 @@ var _sfc_main = /* @__PURE__ */ vue.defineComponent({
             }, [
               vue.renderSlot(_ctx.$slots, "default")
             ]),
-            _ctx.$slots.footer ? (vue.openBlock(), vue.createElementBlock("div", _hoisted_2, [
-              vue.renderSlot(_ctx.$slots, "footer")
-            ])) : vue.createCommentVNode("v-if", true)
+            _ctx.$slots.footer ? (vue.openBlock(), vue.createElementBlock(
+              "div",
+              {
+                key: 0,
+                class: "ditari-show-footer",
+                style: vue.normalizeStyle({ left: collapsedStatus.value ? "80px" : "200px" })
+              },
+              [
+                vue.renderSlot(_ctx.$slots, "footer")
+              ],
+              4
+              /* STYLE */
+            )) : vue.createCommentVNode("v-if", true)
           ]),
           _: 3
           /* FORWARDED */

package/dist/cjs/layout/Show.vue2.cjs.map

@@ -1 +1 @@
-{"version":3,"file":"Show.vue2.cjs","sources":["../../../src/layout/Show.vue"],"sourcesContent":["<script lang=\"ts\">\nconst delayTime = 200\n</script>\n<script setup lang=\"ts\">\n/**\n * 详情/新增/编辑组件\n */\nimport { computed, inject, useSlots, watch, h, resolveComponent } from \"vue\";\nimport { useRoute, useRouter } from \"vue-router\";\nimport { useScrollLock, useWindowScroll } from \"@vueuse/core\";\nimport { LeftOutlined } from \"@ant-design/icons-vue\";\nimport { useNavTabsStore, useSettingsStore } from \"@ditari/store\";\n\nimport { storeToRefs } from \"pinia\";\n\nconst props = defineProps({\n  \"close\": { type: Boolean, required: false, default: false },\n  \"loading\": { type: Boolean, required: false, default: false }\n});\n\nconst router = useRouter();\nconst route = useRoute();\nconst slots = useSlots();\n\nconst navTabStore = useNavTabsStore();\nconst settingsStore = useSettingsStore();\n\nconst showConfig = inject(\"showConfig\") as any;\n\nconst btnRender = () => {\n  if (!showConfig) {\n    return h(LeftOutlined);\n  } else {\n    return h(resolveComponent(showConfig.backBtn));\n  }\n};\n\nconst { refresh } = storeToRefs(settingsStore);\n\nconst showLoading = computed(() => props.loading);\n\nconst contentStyle = {\n  padding: `10px 10px ${slots.footer ? \"70px\" : \"10px\"} 10px`\n};\n\n/**\n * 点击返回\n */\nconst onBack = () => {\n  if (props.close) {\n    // 返回关闭标签\n    navTabStore.deleteTabs(route.path);\n    router.go(-1);\n  } else {\n    // 不关闭标签\n    router.go(-1);\n  }\n};\n\n/**\n * 对外暴露方法 调用后关闭标签 并且出发List组件刷新动作\n */\nconst onRefresh = () => {\n  refresh.value = true;\n  navTabStore.deleteTabs(route.fullPath);\n  router.go(-1);\n};\n\n/**\n * 监听屏幕滚动，滚动大于0的时候给a-page-header组件添加阴影\n */\nconst { y } = useWindowScroll();\n// 锁定屏幕\nconst isLocked = useScrollLock(document.body);\n\nwatch(\n  () => props.loading,\n  (val) => {\n    isLocked.value = val;\n  }\n);\n\n\ndefineExpose({\n  closePage: onRefresh\n});\n</script>\n<template>\n  <div class=\"ditari-show-layout\">\n    <a-spin\n      tip=\"正在处理...\"\n      :spinning=\"showLoading\"\n      :delay=\"delayTime\"\n      size=\"large\"\n    >\n      <a-page-header\n        class=\"ditari-page-header\"\n        :class=\"{ active: y > 0 }\"\n        :ghost=\"false\"\n        @back=\"onBack\"\n      >\n        <template #backIcon>\n          <btn-render />\n        </template>\n        <template #title>{{ $route.meta.title }} </template>\n        <template #subTitle>\n          <slot name=\"subTitle\"></slot>\n        </template>\n        <template #extra>\n          <slot name=\"extra\"></slot>\n        </template>\n      </a-page-header>\n      <div class=\"ditari-show-content\" :style=\"contentStyle\">\n        <slot></slot>\n      </div>\n      <div v-if=\"$slots.footer\" class=\"ditari-show-footer\">\n        <slot name=\"footer\"></slot>\n      </div>\n    </a-spin>\n  </div>\n</template>\n<style lang=\"scss\"></style>\n"],"names":["useRouter","useRoute","useSlots","useNavTabsStore","useSettingsStore","inject","h","LeftOutlined","resolveComponent","storeToRefs","computed","useWindowScroll","useScrollLock","watch"],"mappings":";;;;;;;;;;;;;;;;AACA,MAAM,SAAY,GAAA,GAAA,CAAA;;;;;;;;;AAmBlB,IAAA,MAAM,SAASA,mBAAU,EAAA,CAAA;AACzB,IAAA,MAAM,QAAQC,kBAAS,EAAA,CAAA;AACvB,IAAA,MAAM,QAAQC,YAAS,EAAA,CAAA;AAEvB,IAAA,MAAM,cAAcC,qBAAgB,EAAA,CAAA;AACpC,IAAA,MAAM,gBAAgBC,sBAAiB,EAAA,CAAA;AAEvC,IAAM,MAAA,UAAA,GAAaC,WAAO,YAAY,CAAA,CAAA;AAEtC,IAAA,MAAM,YAAY,MAAM;AACtB,MAAA,IAAI,CAAC,UAAY,EAAA;AACf,QAAA,OAAOC,MAAEC,qBAAY,CAAA,CAAA;AAAA,OAChB,MAAA;AACL,QAAA,OAAOD,KAAE,CAAAE,oBAAA,CAAiB,UAAW,CAAA,OAAO,CAAC,CAAA,CAAA;AAAA,OAC/C;AAAA,KACF,CAAA;AAEA,IAAA,MAAM,EAAE,OAAA,EAAY,GAAAC,iBAAA,CAAY,aAAa,CAAA,CAAA;AAE7C,IAAA,MAAM,WAAc,GAAAC,YAAA,CAAS,MAAM,KAAA,CAAM,OAAO,CAAA,CAAA;AAEhD,IAAA,MAAM,YAAe,GAAA;AAAA,MACnB,OAAS,EAAA,CAAA,UAAA,EAAa,KAAM,CAAA,MAAA,GAAS,SAAS,MAAM,CAAA,KAAA,CAAA;AAAA,KACtD,CAAA;AAKA,IAAA,MAAM,SAAS,MAAM;AACnB,MAAA,IAAI,MAAM,KAAO,EAAA;AAEf,QAAY,WAAA,CAAA,UAAA,CAAW,MAAM,IAAI,CAAA,CAAA;AACjC,QAAA,MAAA,CAAO,GAAG,CAAE,CAAA,CAAA,CAAA;AAAA,OACP,MAAA;AAEL,QAAA,MAAA,CAAO,GAAG,CAAE,CAAA,CAAA,CAAA;AAAA,OACd;AAAA,KACF,CAAA;AAKA,IAAA,MAAM,YAAY,MAAM;AACtB,MAAA,OAAA,CAAQ,KAAQ,GAAA,IAAA,CAAA;AAChB,MAAY,WAAA,CAAA,UAAA,CAAW,MAAM,QAAQ,CAAA,CAAA;AACrC,MAAA,MAAA,CAAO,GAAG,CAAE,CAAA,CAAA,CAAA;AAAA,KACd,CAAA;AAKA,IAAM,MAAA,EAAE,CAAE,EAAA,GAAIC,oBAAgB,EAAA,CAAA;AAE9B,IAAM,MAAA,QAAA,GAAWC,kBAAc,CAAA,QAAA,CAAS,IAAI,CAAA,CAAA;AAE5C,IAAAC,SAAA;AAAA,MACE,MAAM,KAAM,CAAA,OAAA;AAAA,MACZ,CAAC,GAAQ,KAAA;AACP,QAAA,QAAA,CAAS,KAAQ,GAAA,GAAA,CAAA;AAAA,OACnB;AAAA,KACF,CAAA;AAGA,IAAa,QAAA,CAAA;AAAA,MACX,SAAW,EAAA,SAAA;AAAA,KACZ,CAAA,CAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;"}
+{"version":3,"file":"Show.vue2.cjs","sources":["../../../src/layout/Show.vue"],"sourcesContent":["<script lang=\"ts\">\nconst delayTime = 200\n</script>\n<script setup lang=\"ts\">\n/**\n * 详情/新增/编辑组件\n */\nimport { computed, inject, useSlots, watch, h, resolveComponent } from \"vue\";\nimport { useRoute, useRouter } from \"vue-router\";\nimport { useScrollLock, useWindowScroll } from \"@vueuse/core\";\nimport { LeftOutlined } from \"@ant-design/icons-vue\";\nimport { useNavTabsStore, useSettingsStore } from \"@ditari/store\";\n\nimport { storeToRefs } from \"pinia\";\n\nconst props = defineProps({\n  \"close\": { type: Boolean, required: false, default: false },\n  \"loading\": { type: Boolean, required: false, default: false }\n});\n\nconst router = useRouter();\nconst route = useRoute();\nconst slots = useSlots();\n\nconst navTabStore = useNavTabsStore();\nconst settingsStore = useSettingsStore();\n\nconst showConfig = inject(\"showConfig\") as any;\nconst collapsedStatus = computed(() => settingsStore.getCollapsed);\nconst btnRender = () => {\n  if (!showConfig) {\n    return h(LeftOutlined);\n  } else {\n    return h(resolveComponent(showConfig.backBtn));\n  }\n};\n\nconst { refresh } = storeToRefs(settingsStore);\n\nconst showLoading = computed(() => props.loading);\n\nconst contentStyle = {\n  padding: `10px 10px ${slots.footer ? \"70px\" : \"10px\"} 10px`\n};\n\n/**\n * 点击返回\n */\nconst onBack = () => {\n  if (props.close) {\n    // 返回关闭标签\n    navTabStore.deleteTabs(route.path);\n    router.go(-1);\n  } else {\n    // 不关闭标签\n    router.go(-1);\n  }\n};\n\n/**\n * 对外暴露方法 调用后关闭标签 并且出发List组件刷新动作\n */\nconst onRefresh = () => {\n  refresh.value = true;\n  navTabStore.deleteTabs(route.fullPath);\n  router.go(-1);\n};\n\n/**\n * 监听屏幕滚动，滚动大于0的时候给a-page-header组件添加阴影\n */\nconst { y } = useWindowScroll();\n// 锁定屏幕\nconst isLocked = useScrollLock(document.body);\n\nwatch(\n  () => props.loading,\n  (val) => {\n    isLocked.value = val;\n  }\n);\n\n\ndefineExpose({\n  closePage: onRefresh\n});\n</script>\n<template>\n  <div class=\"ditari-show-layout\">\n    <a-spin\n      tip=\"正在处理...\"\n      :spinning=\"showLoading\"\n      :delay=\"delayTime\"\n      size=\"large\"\n    >\n      <a-page-header\n        class=\"ditari-page-header\"\n        :class=\"{ active: y > 0 }\"\n        :ghost=\"false\"\n        @back=\"onBack\"\n      >\n        <template #backIcon>\n          <btn-render />\n        </template>\n        <template #title>{{ $route.meta.title }} </template>\n        <template #subTitle>\n          <slot name=\"subTitle\"></slot>\n        </template>\n        <template #extra>\n          <slot name=\"extra\"></slot>\n        </template>\n      </a-page-header>\n      <div class=\"ditari-show-content\" :style=\"contentStyle\">\n        <slot></slot>\n      </div>\n      <div\n        v-if=\"$slots.footer\"\n        class=\"ditari-show-footer\"\n        :style=\"{ left: collapsedStatus ? '80px' : '200px' }\"\n      >\n        <slot name=\"footer\"></slot>\n      </div>\n    </a-spin>\n  </div>\n</template>\n<style lang=\"scss\"></style>\n"],"names":["useRouter","useRoute","useSlots","useNavTabsStore","useSettingsStore","inject","computed","h","LeftOutlined","resolveComponent","storeToRefs","useWindowScroll","useScrollLock","watch"],"mappings":";;;;;;;;;;;;AACA,MAAM,SAAY,GAAA,GAAA,CAAA;;;;;;;;;AAmBlB,IAAA,MAAM,SAASA,mBAAU,EAAA,CAAA;AACzB,IAAA,MAAM,QAAQC,kBAAS,EAAA,CAAA;AACvB,IAAA,MAAM,QAAQC,YAAS,EAAA,CAAA;AAEvB,IAAA,MAAM,cAAcC,qBAAgB,EAAA,CAAA;AACpC,IAAA,MAAM,gBAAgBC,sBAAiB,EAAA,CAAA;AAEvC,IAAM,MAAA,UAAA,GAAaC,WAAO,YAAY,CAAA,CAAA;AACtC,IAAA,MAAM,eAAkB,GAAAC,YAAA,CAAS,MAAM,aAAA,CAAc,YAAY,CAAA,CAAA;AACjE,IAAA,MAAM,YAAY,MAAM;AACtB,MAAA,IAAI,CAAC,UAAY,EAAA;AACf,QAAA,OAAOC,MAAEC,qBAAY,CAAA,CAAA;AAAA,OAChB,MAAA;AACL,QAAA,OAAOD,KAAE,CAAAE,oBAAA,CAAiB,UAAW,CAAA,OAAO,CAAC,CAAA,CAAA;AAAA,OAC/C;AAAA,KACF,CAAA;AAEA,IAAA,MAAM,EAAE,OAAA,EAAY,GAAAC,iBAAA,CAAY,aAAa,CAAA,CAAA;AAE7C,IAAA,MAAM,WAAc,GAAAJ,YAAA,CAAS,MAAM,KAAA,CAAM,OAAO,CAAA,CAAA;AAEhD,IAAA,MAAM,YAAe,GAAA;AAAA,MACnB,OAAS,EAAA,CAAA,UAAA,EAAa,KAAM,CAAA,MAAA,GAAS,SAAS,MAAM,CAAA,KAAA,CAAA;AAAA,KACtD,CAAA;AAKA,IAAA,MAAM,SAAS,MAAM;AACnB,MAAA,IAAI,MAAM,KAAO,EAAA;AAEf,QAAY,WAAA,CAAA,UAAA,CAAW,MAAM,IAAI,CAAA,CAAA;AACjC,QAAA,MAAA,CAAO,GAAG,CAAE,CAAA,CAAA,CAAA;AAAA,OACP,MAAA;AAEL,QAAA,MAAA,CAAO,GAAG,CAAE,CAAA,CAAA,CAAA;AAAA,OACd;AAAA,KACF,CAAA;AAKA,IAAA,MAAM,YAAY,MAAM;AACtB,MAAA,OAAA,CAAQ,KAAQ,GAAA,IAAA,CAAA;AAChB,MAAY,WAAA,CAAA,UAAA,CAAW,MAAM,QAAQ,CAAA,CAAA;AACrC,MAAA,MAAA,CAAO,GAAG,CAAE,CAAA,CAAA,CAAA;AAAA,KACd,CAAA;AAKA,IAAM,MAAA,EAAE,CAAE,EAAA,GAAIK,oBAAgB,EAAA,CAAA;AAE9B,IAAM,MAAA,QAAA,GAAWC,kBAAc,CAAA,QAAA,CAAS,IAAI,CAAA,CAAA;AAE5C,IAAAC,SAAA;AAAA,MACE,MAAM,KAAM,CAAA,OAAA;AAAA,MACZ,CAAC,GAAQ,KAAA;AACP,QAAA,QAAA,CAAS,KAAQ,GAAA,GAAA,CAAA;AAAA,OACnB;AAAA,KACF,CAAA;AAGA,IAAa,QAAA,CAAA;AAAA,MACX,SAAW,EAAA,SAAA;AAAA,KACZ,CAAA,CAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;"}

package/dist/esm/date/RangePicker.mjs

@@ -24,7 +24,6 @@ var RangePicker = /* @__PURE__ */ defineComponent({
     attrs
   }) {
     const dates = ref([]);
-    const modelValue = ref(props.value);
     const internalModel = ref((props == null ? void 0 : props.value) || {});
     const onChange = (dates2) => {
       if (!dates2) {
@@ -39,11 +38,22 @@ var RangePicker = /* @__PURE__ */ defineComponent({
       emit("update:value", internalModel.value);
     };
     watchEffect(() => {
+      const value = props.value;
       props.field.forEach((key, index) => {
-        if (modelValue[key] === "") {
+        if (value[key] === "") {
           dates.value && (dates.value[index] = "");
         } else {
-          dates.value && (dates.value[index] = modelValue.value[key]);
+          dates.value && (dates.value[index] = value[key]);
+        }
+      });
+    });
+    watchEffect(() => {
+      const value = props.value;
+      props.field.forEach((key, index) => {
+        if (value[key] === "") {
+          dates.value && (dates.value[index] = "");
+        } else {
+          dates.value && (dates.value[index] = value[key]);
         }
       });
     });

package/dist/esm/date/RangePicker.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"RangePicker.mjs","sources":["../../../src/date/RangePicker.tsx"],"sourcesContent":["import { defineComponent, ref, watchEffect } from \"vue\";\nimport type { PropType } from \"vue\";\nimport { RangePicker } from \"ant-design-vue\";\n\n/**\n * 日期范围控件\n */\nexport default defineComponent({\n  name: \"DRangePicker\",\n  props: {\n    value: {\n      type: Object as PropType<{ [name: string]: unknown }>\n    },\n    field: {\n      required: true,\n      default: [] as string[]\n    },\n    format: {\n      default: \"YYYY-MM-DD\"\n    },\n    valueFormat: {\n      default: \"YYYY-MM-DD\"\n    }\n  },\n  emits: [\"update:value\"],\n  setup(props, { emit, attrs }) {\n    const dates = ref<string[]>([]);\n    const modelValue: any = ref(props.value);\n\n    //内部model\n    const internalModel = ref<{ [name: string]: unknown }>(props?.value || {});\n\n    // 监听日期变化\n    const onChange = (dates: [any, any]) => {\n      if (!dates) {\n        props.field.forEach((key) => {\n          internalModel.value[key] = \"\";\n        });\n      } else {\n        props.field.forEach((key, index) => {\n          internalModel.value[key] = dates[index];\n        });\n      }\n      emit(\"update:value\", internalModel.value);\n    };\n\n    watchEffect(() => {\n      props.field.forEach((key, index) => {\n        if (modelValue[key] === \"\") {\n          dates.value && (dates.value[index] = \"\");\n        } else {\n          dates.value && (dates.value[index] = modelValue.value[key]);\n        }\n      });\n    });\n\n    return () => (\n      <div>\n        <RangePicker\n          {...attrs}\n          v-model:value={dates.value}\n          onChange={onChange}\n          format={props.format}\n          valueFormat={props.valueFormat}\n          style={{ width: \"100%\" }}\n        ></RangePicker>\n      </div>\n    );\n  }\n});\n"],"names":["name","props","value","type","Object","field","required","default","format","valueFormat","emits","setup","emit","attrs","dates","ref","modelValue","internalModel","onChange","forEach","key","index","watchEffect","_createVNode","RangePicker","_mergeProps","$event","width"],"mappings":"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"}
+{"version":3,"file":"RangePicker.mjs","sources":["../../../src/date/RangePicker.tsx"],"sourcesContent":["import { defineComponent, ref, watchEffect } from \"vue\";\nimport type { PropType } from \"vue\";\nimport { RangePicker } from \"ant-design-vue\";\n\n/**\n * 日期范围控件\n */\nexport default defineComponent({\n  name: \"DRangePicker\",\n  props: {\n    value: {\n      type: Object as PropType<{ [name: string]: unknown }>\n    },\n    field: {\n      required: true,\n      default: [] as string[]\n    },\n    format: {\n      default: \"YYYY-MM-DD\"\n    },\n    valueFormat: {\n      default: \"YYYY-MM-DD\"\n    }\n  },\n  emits: [\"update:value\"],\n  setup(props, { emit, attrs }) {\n    const dates = ref<string[]>([]);\n\n    //内部model\n    const internalModel = ref<{ [name: string]: unknown }>(props?.value || {});\n\n    // 监听日期变化\n    const onChange = (dates: [any, any]) => {\n      if (!dates) {\n        props.field.forEach((key) => {\n          internalModel.value[key] = \"\";\n        });\n      } else {\n        props.field.forEach((key, index) => {\n          internalModel.value[key] = dates[index];\n        });\n      }\n      emit(\"update:value\", internalModel.value);\n    };\n\n    watchEffect(() => {\n      const value: any = props.value;\n      props.field.forEach((key, index) => {\n        if (value[key] === \"\") {\n          dates.value && (dates.value[index] = \"\");\n        } else {\n          dates.value && (dates.value[index] = value[key]);\n        }\n      });\n    });\n\n    watchEffect(() => {\n      const value: any = props.value;\n      props.field.forEach((key, index) => {\n        if (value[key] === \"\") {\n          dates.value && (dates.value[index] = \"\");\n        } else {\n          dates.value && (dates.value[index] = value[key]);\n        }\n      });\n    });\n\n    return () => (\n      <div>\n        <RangePicker\n          {...attrs}\n          v-model:value={dates.value}\n          onChange={onChange}\n          format={props.format}\n          valueFormat={props.valueFormat}\n          style={{ width: \"100%\" }}\n        ></RangePicker>\n      </div>\n    );\n  }\n});\n"],"names":["name","props","value","type","Object","field","required","default","format","valueFormat","emits","setup","emit","attrs","dates","ref","internalModel","onChange","forEach","key","index","watchEffect","_createVNode","RangePicker","_mergeProps","$event","width"],"mappings":"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"}

package/dist/esm/layout/FuckMain.vue.d.ts

@@ -1,11 +1,4 @@
-declare const _default: import("vue").DefineComponent<{
-    showConfig: {
-        type: null;
-        required: true;
-        default: any;
-    };
-}, {
-    props: any;
+declare const _default: import("vue").DefineComponent<{}, {
     store: import("pinia").Store<string, {
         list: string[];
     }, {
@@ -131,13 +124,5 @@ declare const _default: import("vue").DefineComponent<{
         readonly CloseOutlined: import("@ant-design/icons-vue/lib/icons/CloseOutlined").CloseOutlinedIconType;
     }, {}, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, string, import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{}>>, {}, {}>;
     readonly Menu: import("vue").DefineComponent<{}, () => JSX.Element, {}, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, string, import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{}>>, {}, {}>;
-}, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, string, import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{
-    showConfig: {
-        type: null;
-        required: true;
-        default: any;
-    };
-}>>, {
-    showConfig: any;
-}, {}>;
+}, {}, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, string, import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{}>>, {}, {}>;
 export default _default;

package/dist/esm/layout/FuckMain.vue2.mjs

@@ -1,4 +1,4 @@
-import { defineComponent, computed, provide, resolveComponent, openBlock, createElementBlock, Fragment, createVNode, withCtx, createElementVNode, renderSlot, unref, normalizeStyle, createBlock, createCommentVNode, Transition, KeepAlive, resolveDynamicComponent } from 'vue';
+import { defineComponent, computed, resolveComponent, openBlock, createElementBlock, Fragment, createVNode, withCtx, createElementVNode, renderSlot, unref, normalizeStyle, createBlock, Transition, KeepAlive, resolveDynamicComponent } from 'vue';
 import { MenuUnfoldOutlined, MenuFoldOutlined } from '@ant-design/icons-vue';
 import { useKeepAliveStore, useSettingsStore } from '@ditari/store';
 import DNavTabs from './NavTabs.vue.mjs';
@@ -9,17 +9,12 @@ const _hoisted_2 = { class: "ditari-menu" };
 const _hoisted_3 = { class: "ditari-user-menu" };
 var _sfc_main = /* @__PURE__ */ defineComponent({
   __name: "FuckMain",
-  props: {
-    "showConfig": { type: null, required: true, default: { backBtn: "LeftOutlined" } }
-  },
   setup(__props) {
-    const props = __props;
     const store = useKeepAliveStore();
     const keepAliveNames = computed(() => store.get);
     const settingsStore = useSettingsStore();
     const { switchCollapsed } = settingsStore;
     const collapsedStatus = computed(() => settingsStore.getCollapsed);
-    provide("showConfig", props.showConfig);
     return (_ctx, _cache) => {
       const _component_a_layout_sider = resolveComponent("a-layout-sider");
       const _component_router_view = resolveComponent("router-view");
@@ -76,26 +71,7 @@ var _sfc_main = /* @__PURE__ */ defineComponent({
                       createVNode(DNavTabs),
                       createElementVNode("div", _hoisted_3, [
                         renderSlot(_ctx.$slots, "operation")
-                      ]),
-                      createCommentVNode('        <div class="ditari-layout-header">'),
-                      createCommentVNode('          <div class="ditari-layout-header-left">'),
-                      createCommentVNode('            <div class="ditari-side-collapsed" @click="switchCollapsed">'),
-                      createCommentVNode("              <menu-unfold-outlined"),
-                      createCommentVNode('                v-if="collapsedStatus"'),
-                      createCommentVNode('                class="trigger"'),
-                      createCommentVNode('                style="font-size: 16px; font-weight: bold; cursor: pointer"'),
-                      createCommentVNode("              />"),
-                      createCommentVNode("              <menu-fold-outlined"),
-                      createCommentVNode("                v-else"),
-                      createCommentVNode('                style="font-size: 16px; font-weight: bold; cursor: pointer"'),
-                      createCommentVNode("              />"),
-                      createCommentVNode("            </div>"),
-                      createCommentVNode("            "),
-                      createCommentVNode("          </div>"),
-                      createCommentVNode('          <div class="ditari-user-menu">'),
-                      createCommentVNode('            <slot name="operation"></slot>'),
-                      createCommentVNode("          </div>"),
-                      createCommentVNode("        </div>")
+                      ])
                     ],
                     4
                     /* STYLE */

package/dist/esm/layout/FuckMain.vue2.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"FuckMain.vue2.mjs","sources":["../../../src/layout/FuckMain.vue"],"sourcesContent":["<script setup lang=\"ts\">\n/**\n * FUCK MAIN 入口文件\n */\nimport { computed, provide } from \"vue\";\nimport { MenuFoldOutlined, MenuUnfoldOutlined } from \"@ant-design/icons-vue\";\nimport { useKeepAliveStore, useSettingsStore } from \"@ditari/store\";\n\n//标签页组件\nimport DNavTabs from \"./NavTabs.vue\";\n// 菜单组件\nimport Menu from \"../menu/Menu\";\n\nconst props = defineProps({\n  \"showConfig\": { type: null, required: true, default: { backBtn: \"LeftOutlined\" } as any }\n});\n\n// 缓存store\nconst store = useKeepAliveStore();\n// 缓存的names\nconst keepAliveNames = computed(() => store.get);\n// 设置store\nconst settingsStore = useSettingsStore();\nconst { switchCollapsed } = settingsStore;\nconst collapsedStatus = computed(() => settingsStore.getCollapsed);\n\n// 注入show组件的配置文件\nprovide(\"showConfig\", props.showConfig);\n</script>\n<template>\n  <a-layout class=\"ditari-layout\">\n    <a-layout-sider\n      v-model:collapsed=\"collapsedStatus\"\n      :trigger=\"null\"\n      collapsible\n      class=\"ditari-layout-sider\"\n    >\n      <div class=\"ditari-logo\">\n        <slot name=\"logo\"></slot>\n      </div>\n      <div class=\"ditari-menu\">\n        <Menu />\n      </div>\n    </a-layout-sider>\n    <a-layout>\n      <div\n        class=\"ditari-fuck-top-layout\"\n        :style=\"{ left: collapsedStatus ? '80px' : '200px' }\"\n      >\n        <div class=\"ditari-side-collapsed\" @click=\"switchCollapsed\">\n          <menu-unfold-outlined\n            v-if=\"collapsedStatus\"\n            class=\"trigger\"\n            style=\"font-size: 16px; font-weight: bold; cursor: pointer\"\n          />\n          <menu-fold-outlined\n            v-else\n            style=\"font-size: 16px; font-weight: bold; cursor: pointer\"\n          />\n        </div>\n        <d-nav-tabs />\n        <div class=\"ditari-user-menu\">\n          <slot name=\"operation\"></slot>\n        </div>\n        <!--        <div class=\"ditari-layout-header\">-->\n        <!--          <div class=\"ditari-layout-header-left\">-->\n        <!--            <div class=\"ditari-side-collapsed\" @click=\"switchCollapsed\">-->\n        <!--              <menu-unfold-outlined-->\n        <!--                v-if=\"collapsedStatus\"-->\n        <!--                class=\"trigger\"-->\n        <!--                style=\"font-size: 16px; font-weight: bold; cursor: pointer\"-->\n        <!--              />-->\n        <!--              <menu-fold-outlined-->\n        <!--                v-else-->\n        <!--                style=\"font-size: 16px; font-weight: bold; cursor: pointer\"-->\n        <!--              />-->\n        <!--            </div>-->\n        <!--            -->\n        <!--          </div>-->\n        <!--          <div class=\"ditari-user-menu\">-->\n        <!--            <slot name=\"operation\"></slot>-->\n        <!--          </div>-->\n        <!--        </div>-->\n      </div>\n      <a-layout-content\n        style=\"margin-top: 42px\"\n        class=\"ditari-layout-content\"\n        :style=\"{ marginLeft: collapsedStatus ? '80px' : '200px' }\"\n      >\n        <router-view v-slot=\"{ Component }\">\n          <transition name=\"main\" mode=\"out-in\" appear>\n            <keep-alive ref=\"keepAliveRef\" :include=\"keepAliveNames\">\n              <component :is=\"Component\" :key=\"$route.path\" />\n            </keep-alive>\n          </transition>\n        </router-view>\n        <slot name=\"micro\"></slot>\n      </a-layout-content>\n    </a-layout>\n  </a-layout>\n  <a-back-top class=\"ditari-ant-back-top\" :visibility-height=\"50\"></a-back-top>\n</template>\n"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAkBA,IAAA,MAAM,QAAQ,iBAAkB,EAAA,CAAA;AAEhC,IAAA,MAAM,cAAiB,GAAA,QAAA,CAAS,MAAM,KAAA,CAAM,GAAG,CAAA,CAAA;AAE/C,IAAA,MAAM,gBAAgB,gBAAiB,EAAA,CAAA;AACvC,IAAM,MAAA,EAAE,iBAAoB,GAAA,aAAA,CAAA;AAC5B,IAAA,MAAM,eAAkB,GAAA,QAAA,CAAS,MAAM,aAAA,CAAc,YAAY,CAAA,CAAA;AAGjE,IAAQ,OAAA,CAAA,YAAA,EAAc,MAAM,UAAU,CAAA,CAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;"}
+{"version":3,"file":"FuckMain.vue2.mjs","sources":["../../../src/layout/FuckMain.vue"],"sourcesContent":["<script setup lang=\"ts\">\n/**\n * FUCK MAIN 入口文件\n */\nimport { computed } from \"vue\";\nimport { MenuFoldOutlined, MenuUnfoldOutlined } from \"@ant-design/icons-vue\";\nimport { useKeepAliveStore, useSettingsStore } from \"@ditari/store\";\n\n//标签页组件\nimport DNavTabs from \"./NavTabs.vue\";\n// 菜单组件\nimport Menu from \"../menu/Menu\";\n\n// 缓存store\nconst store = useKeepAliveStore();\n// 缓存的names\nconst keepAliveNames = computed(() => store.get);\n// 设置store\nconst settingsStore = useSettingsStore();\nconst { switchCollapsed } = settingsStore;\nconst collapsedStatus = computed(() => settingsStore.getCollapsed);\n</script>\n<template>\n  <a-layout class=\"ditari-layout\">\n    <a-layout-sider\n      v-model:collapsed=\"collapsedStatus\"\n      :trigger=\"null\"\n      collapsible\n      class=\"ditari-layout-sider\"\n    >\n      <div class=\"ditari-logo\">\n        <slot name=\"logo\"></slot>\n      </div>\n      <div class=\"ditari-menu\">\n        <Menu />\n      </div>\n    </a-layout-sider>\n    <a-layout>\n      <div\n        class=\"ditari-fuck-top-layout\"\n        :style=\"{ left: collapsedStatus ? '80px' : '200px' }\"\n      >\n        <div class=\"ditari-side-collapsed\" @click=\"switchCollapsed\">\n          <menu-unfold-outlined\n            v-if=\"collapsedStatus\"\n            class=\"trigger\"\n            style=\"font-size: 16px; font-weight: bold; cursor: pointer\"\n          />\n          <menu-fold-outlined\n            v-else\n            style=\"font-size: 16px; font-weight: bold; cursor: pointer\"\n          />\n        </div>\n        <d-nav-tabs />\n        <div class=\"ditari-user-menu\">\n          <slot name=\"operation\"></slot>\n        </div>\n      </div>\n      <a-layout-content\n        style=\"margin-top: 42px\"\n        class=\"ditari-layout-content\"\n        :style=\"{ marginLeft: collapsedStatus ? '80px' : '200px' }\"\n      >\n        <router-view v-slot=\"{ Component }\">\n          <transition name=\"main\" mode=\"out-in\" appear>\n            <keep-alive ref=\"keepAliveRef\" :include=\"keepAliveNames\">\n              <component :is=\"Component\" :key=\"$route.path\" />\n            </keep-alive>\n          </transition>\n        </router-view>\n        <slot name=\"micro\"></slot>\n      </a-layout-content>\n    </a-layout>\n  </a-layout>\n  <a-back-top class=\"ditari-ant-back-top\" :visibility-height=\"50\"></a-back-top>\n</template>\n"],"names":[],"mappings":";;;;;;;;;;;;AAcA,IAAA,MAAM,QAAQ,iBAAkB,EAAA,CAAA;AAEhC,IAAA,MAAM,cAAiB,GAAA,QAAA,CAAS,MAAM,KAAA,CAAM,GAAG,CAAA,CAAA;AAE/C,IAAA,MAAM,gBAAgB,gBAAiB,EAAA,CAAA;AACvC,IAAM,MAAA,EAAE,iBAAoB,GAAA,aAAA,CAAA;AAC5B,IAAA,MAAM,eAAkB,GAAA,QAAA,CAAS,MAAM,aAAA,CAAc,YAAY,CAAA,CAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;"}

package/dist/esm/layout/List.vue2.mjs

@@ -1,5 +1,5 @@
 import { defineComponent, useSlots, inject, ref, watch, onUnmounted, onActivated, onDeactivated, watchEffect, nextTick, resolveComponent, openBlock, createElementBlock, createElementVNode, createVNode, normalizeClass, unref, normalizeStyle, withCtx, renderSlot, withDirectives, vShow } from 'vue';
-import { useElementSize } from '@vueuse/core';
+import { useElementSize, useResizeObserver } from '@vueuse/core';
 import { useSettingsStore } from '@ditari/store';
 import { storeToRefs } from 'pinia';
 import { useRoute } from 'vue-router';
@@ -74,6 +74,9 @@ var _sfc_main = /* @__PURE__ */ defineComponent({
     watchEffect(() => {
       calcHeight();
     });
+    useResizeObserver(document.body, () => {
+      calcHeight();
+    });
     function calcHeight() {
       show.value = false;
       nextTick(() => {

package/dist/esm/layout/List.vue2.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"List.vue2.mjs","sources":["../../../src/layout/List.vue"],"sourcesContent":["<script lang=\"ts\">\nconst marginBottom = 16\n</script>\n<script setup lang=\"ts\">\nimport {\n  useSlots,\n  ref,\n  onActivated,\n  watch,\n  onDeactivated,\n  onUnmounted,\n  WatchStopHandle,\n  inject,\n  nextTick,\n  watchEffect\n} from \"vue\";\nimport { useElementSize } from \"@vueuse/core\";\nimport { useSettingsStore } from \"@ditari/store\";\nimport { storeToRefs } from \"pinia\";\nimport { useRoute } from \"vue-router\";\n\nconst emits = defineEmits([\"refresh\"]);\n\nconst slots = useSlots();\nconst store = useSettingsStore();\nconst route = useRoute();\nconst configProvider = inject(\"configProvider\") as any;\n\nconst { refresh } = storeToRefs(store);\n\nconst toolsRef = ref();\nconst tableRef = ref();\n\nconst show = ref(false);\nconst height = ref(0);\n\nlet stopHandleWatch: WatchStopHandle;\n\nwatch(\n  () => configProvider?.componentSize,\n  () => {\n    calcHeight();\n  }\n);\n\nuseReload();\n// 处理标签重载\nfunction useReload() {\n  // !route.meta.keepAlive\n  if (!route.name) {\n    stopHandleWatch = useWatch();\n    // 卸载未缓存的组件\n    onUnmounted(() => {\n      stopHandleWatch();\n    });\n  } else {\n    // 激活缓存页面\n    onActivated(() => {\n      if (refresh.value) {\n        refresh.value = false;\n        emits(\"refresh\");\n      }\n      stopHandleWatch = useWatch();\n    });\n    // 离开缓存页面\n    onDeactivated(() => {\n      stopHandleWatch();\n    });\n  }\n}\n\nfunction useWatch() {\n  //点击了标签重载图标\n  return watch(\n    () => refresh.value,\n    (val) => {\n      if (val) {\n        // 发送刷新事件到列表页面\n        emits(\"refresh\");\n      }\n    }\n  );\n}\n\n// 监听表单高度变化\n// 然后再获取表格高度\nconst formRef = ref(null);\nconst { height: formHeight } = useElementSize(formRef);\nwatch(\n  () => formHeight.value,\n  () => {\n    calcHeight();\n  },\n  { immediate: true }\n);\n\nwatchEffect(() => {\n  calcHeight();\n});\n\n// 动态计算高度\nfunction calcHeight() {\n  show.value = false;\n  nextTick(() => {\n    height.value = tableRef?.value?.offsetHeight;\n    show.value = true;\n  });\n}\n</script>\n<template>\n  <div class=\"ditari-list-layout\">\n    <div ref=\"contentRef\" class=\"wrapper\">\n      <a-card\n        ref=\"formRef\"\n        :bordered=\"false\"\n        :class=\"{ 'ditari-list-form': slots.form }\"\n        :style=\"{ 'margin-bottom': slots.form ? marginBottom + 'px' : 0 }\"\n      >\n        <slot name=\"form\" />\n      </a-card>\n      <a-card class=\"ditari-list-table\" :bordered=\"false\">\n        <div\n          ref=\"toolsRef\"\n          class=\"xi-tools\"\n          :style=\"{ 'margin-bottom': slots.tools ? marginBottom + 'px' : 0 }\"\n        >\n          <a-space>\n            <slot name=\"tools\"></slot>\n          </a-space>\n        </div>\n        <div ref=\"tableRef\" style=\"flex: 1\">\n          <div v-show=\"show\" style=\"height: 100%\">\n            <slot name=\"table\" :height=\"height\" />\n          </div>\n        </div>\n      </a-card>\n    </div>\n    <div class=\"ditari-content-extra\">\n      <slot></slot>\n    </div>\n  </div>\n</template>\n<style></style>\n"],"names":[],"mappings":"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"}
+{"version":3,"file":"List.vue2.mjs","sources":["../../../src/layout/List.vue"],"sourcesContent":["<script lang=\"ts\">\nconst marginBottom = 16\n</script>\n<script setup lang=\"ts\">\nimport {\n  useSlots,\n  ref,\n  onActivated,\n  watch,\n  onDeactivated,\n  onUnmounted,\n  WatchStopHandle,\n  inject,\n  nextTick,\n  watchEffect\n} from \"vue\";\nimport { useElementSize, useResizeObserver } from \"@vueuse/core\";\nimport { useSettingsStore } from \"@ditari/store\";\nimport { storeToRefs } from \"pinia\";\nimport { useRoute } from \"vue-router\";\n\nconst emits = defineEmits([\"refresh\"]);\n\nconst slots = useSlots();\nconst store = useSettingsStore();\nconst route = useRoute();\nconst configProvider = inject(\"configProvider\") as any;\n\nconst { refresh } = storeToRefs(store);\n\nconst toolsRef = ref();\nconst tableRef = ref();\n\nconst show = ref(false);\nconst height = ref(0);\n\nlet stopHandleWatch: WatchStopHandle;\n\nwatch(\n  () => configProvider?.componentSize,\n  () => {\n    calcHeight();\n  }\n);\n\nuseReload();\n// 处理标签重载\nfunction useReload() {\n  // !route.meta.keepAlive\n  if (!route.name) {\n    stopHandleWatch = useWatch();\n    // 卸载未缓存的组件\n    onUnmounted(() => {\n      stopHandleWatch();\n    });\n  } else {\n    // 激活缓存页面\n    onActivated(() => {\n      if (refresh.value) {\n        refresh.value = false;\n        emits(\"refresh\");\n      }\n      stopHandleWatch = useWatch();\n    });\n    // 离开缓存页面\n    onDeactivated(() => {\n      stopHandleWatch();\n    });\n  }\n}\n\nfunction useWatch() {\n  //点击了标签重载图标\n  return watch(\n    () => refresh.value,\n    (val) => {\n      if (val) {\n        // 发送刷新事件到列表页面\n        emits(\"refresh\");\n      }\n    }\n  );\n}\n\n// 监听表单高度变化\n// 然后再获取表格高度\nconst formRef = ref(null);\nconst { height: formHeight } = useElementSize(formRef);\nwatch(\n  () => formHeight.value,\n  () => {\n    calcHeight();\n  },\n  { immediate: true }\n);\n\nwatchEffect(() => {\n  calcHeight();\n});\n\nuseResizeObserver(document.body, () => {\n  calcHeight();\n});\n\n// 动态计算高度\nfunction calcHeight() {\n  show.value = false;\n  nextTick(() => {\n    height.value = tableRef?.value?.offsetHeight;\n    show.value = true;\n  });\n}\n</script>\n<template>\n  <div class=\"ditari-list-layout\">\n    <div ref=\"contentRef\" class=\"wrapper\">\n      <a-card\n        ref=\"formRef\"\n        :bordered=\"false\"\n        :class=\"{ 'ditari-list-form': slots.form }\"\n        :style=\"{ 'margin-bottom': slots.form ? marginBottom + 'px' : 0 }\"\n      >\n        <slot name=\"form\" />\n      </a-card>\n      <a-card class=\"ditari-list-table\" :bordered=\"false\">\n        <div\n          ref=\"toolsRef\"\n          class=\"xi-tools\"\n          :style=\"{ 'margin-bottom': slots.tools ? marginBottom + 'px' : 0 }\"\n        >\n          <a-space>\n            <slot name=\"tools\"></slot>\n          </a-space>\n        </div>\n        <div ref=\"tableRef\" style=\"flex: 1\">\n          <div v-show=\"show\" style=\"height: 100%\">\n            <slot name=\"table\" :height=\"height\" />\n          </div>\n        </div>\n      </a-card>\n    </div>\n    <div class=\"ditari-content-extra\">\n      <slot></slot>\n    </div>\n  </div>\n</template>\n<style></style>\n"],"names":[],"mappings":"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"}

package/dist/esm/layout/Show.vue.d.ts

@@ -82,6 +82,7 @@ declare const _default: import("vue").DefineComponent<{
         gridMatching(): any;
     }>;
     showConfig: any;
+    collapsedStatus: import("vue").ComputedRef<boolean>;
     btnRender: () => import("vue").VNode<import("vue").RendererNode, import("vue").RendererElement, {
         [key: string]: any;
     }>;

package/dist/esm/layout/Show.vue2.mjs

@@ -1,4 +1,4 @@
-import { defineComponent, useSlots, inject, h, resolveComponent, computed, watch, openBlock, createElementBlock, createVNode, withCtx, normalizeClass, unref, createTextVNode, toDisplayString, renderSlot, createElementVNode, createCommentVNode } from 'vue';
+import { defineComponent, useSlots, inject, computed, h, resolveComponent, watch, openBlock, createElementBlock, createVNode, withCtx, normalizeClass, unref, createTextVNode, toDisplayString, renderSlot, createElementVNode, normalizeStyle, createCommentVNode } from 'vue';
 import { useRouter, useRoute } from 'vue-router';
 import { useWindowScroll, useScrollLock } from '@vueuse/core';
 import { LeftOutlined } from '@ant-design/icons-vue';
@@ -6,10 +6,6 @@ import { useNavTabsStore, useSettingsStore } from '@ditari/store';
 import { storeToRefs } from 'pinia';
 
 const _hoisted_1 = { class: "ditari-show-layout" };
-const _hoisted_2 = {
-  key: 0,
-  class: "ditari-show-footer"
-};
 const delayTime = 200;
 var _sfc_main = /* @__PURE__ */ defineComponent({
   __name: "Show",
@@ -25,6 +21,7 @@ var _sfc_main = /* @__PURE__ */ defineComponent({
     const navTabStore = useNavTabsStore();
     const settingsStore = useSettingsStore();
     const showConfig = inject("showConfig");
+    const collapsedStatus = computed(() => settingsStore.getCollapsed);
     const btnRender = () => {
       if (!showConfig) {
         return h(LeftOutlined);
@@ -102,9 +99,19 @@ var _sfc_main = /* @__PURE__ */ defineComponent({
             }, [
               renderSlot(_ctx.$slots, "default")
             ]),
-            _ctx.$slots.footer ? (openBlock(), createElementBlock("div", _hoisted_2, [
-              renderSlot(_ctx.$slots, "footer")
-            ])) : createCommentVNode("v-if", true)
+            _ctx.$slots.footer ? (openBlock(), createElementBlock(
+              "div",
+              {
+                key: 0,
+                class: "ditari-show-footer",
+                style: normalizeStyle({ left: collapsedStatus.value ? "80px" : "200px" })
+              },
+              [
+                renderSlot(_ctx.$slots, "footer")
+              ],
+              4
+              /* STYLE */
+            )) : createCommentVNode("v-if", true)
           ]),
           _: 3
           /* FORWARDED */

package/dist/esm/layout/Show.vue2.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"Show.vue2.mjs","sources":["../../../src/layout/Show.vue"],"sourcesContent":["<script lang=\"ts\">\nconst delayTime = 200\n</script>\n<script setup lang=\"ts\">\n/**\n * 详情/新增/编辑组件\n */\nimport { computed, inject, useSlots, watch, h, resolveComponent } from \"vue\";\nimport { useRoute, useRouter } from \"vue-router\";\nimport { useScrollLock, useWindowScroll } from \"@vueuse/core\";\nimport { LeftOutlined } from \"@ant-design/icons-vue\";\nimport { useNavTabsStore, useSettingsStore } from \"@ditari/store\";\n\nimport { storeToRefs } from \"pinia\";\n\nconst props = defineProps({\n  \"close\": { type: Boolean, required: false, default: false },\n  \"loading\": { type: Boolean, required: false, default: false }\n});\n\nconst router = useRouter();\nconst route = useRoute();\nconst slots = useSlots();\n\nconst navTabStore = useNavTabsStore();\nconst settingsStore = useSettingsStore();\n\nconst showConfig = inject(\"showConfig\") as any;\n\nconst btnRender = () => {\n  if (!showConfig) {\n    return h(LeftOutlined);\n  } else {\n    return h(resolveComponent(showConfig.backBtn));\n  }\n};\n\nconst { refresh } = storeToRefs(settingsStore);\n\nconst showLoading = computed(() => props.loading);\n\nconst contentStyle = {\n  padding: `10px 10px ${slots.footer ? \"70px\" : \"10px\"} 10px`\n};\n\n/**\n * 点击返回\n */\nconst onBack = () => {\n  if (props.close) {\n    // 返回关闭标签\n    navTabStore.deleteTabs(route.path);\n    router.go(-1);\n  } else {\n    // 不关闭标签\n    router.go(-1);\n  }\n};\n\n/**\n * 对外暴露方法 调用后关闭标签 并且出发List组件刷新动作\n */\nconst onRefresh = () => {\n  refresh.value = true;\n  navTabStore.deleteTabs(route.fullPath);\n  router.go(-1);\n};\n\n/**\n * 监听屏幕滚动，滚动大于0的时候给a-page-header组件添加阴影\n */\nconst { y } = useWindowScroll();\n// 锁定屏幕\nconst isLocked = useScrollLock(document.body);\n\nwatch(\n  () => props.loading,\n  (val) => {\n    isLocked.value = val;\n  }\n);\n\n\ndefineExpose({\n  closePage: onRefresh\n});\n</script>\n<template>\n  <div class=\"ditari-show-layout\">\n    <a-spin\n      tip=\"正在处理...\"\n      :spinning=\"showLoading\"\n      :delay=\"delayTime\"\n      size=\"large\"\n    >\n      <a-page-header\n        class=\"ditari-page-header\"\n        :class=\"{ active: y > 0 }\"\n        :ghost=\"false\"\n        @back=\"onBack\"\n      >\n        <template #backIcon>\n          <btn-render />\n        </template>\n        <template #title>{{ $route.meta.title }} </template>\n        <template #subTitle>\n          <slot name=\"subTitle\"></slot>\n        </template>\n        <template #extra>\n          <slot name=\"extra\"></slot>\n        </template>\n      </a-page-header>\n      <div class=\"ditari-show-content\" :style=\"contentStyle\">\n        <slot></slot>\n      </div>\n      <div v-if=\"$slots.footer\" class=\"ditari-show-footer\">\n        <slot name=\"footer\"></slot>\n      </div>\n    </a-spin>\n  </div>\n</template>\n<style lang=\"scss\"></style>\n"],"names":[],"mappings":";;;;;;;;;;;;AACA,MAAM,SAAY,GAAA,GAAA,CAAA;;;;;;;;;AAmBlB,IAAA,MAAM,SAAS,SAAU,EAAA,CAAA;AACzB,IAAA,MAAM,QAAQ,QAAS,EAAA,CAAA;AACvB,IAAA,MAAM,QAAQ,QAAS,EAAA,CAAA;AAEvB,IAAA,MAAM,cAAc,eAAgB,EAAA,CAAA;AACpC,IAAA,MAAM,gBAAgB,gBAAiB,EAAA,CAAA;AAEvC,IAAM,MAAA,UAAA,GAAa,OAAO,YAAY,CAAA,CAAA;AAEtC,IAAA,MAAM,YAAY,MAAM;AACtB,MAAA,IAAI,CAAC,UAAY,EAAA;AACf,QAAA,OAAO,EAAE,YAAY,CAAA,CAAA;AAAA,OAChB,MAAA;AACL,QAAA,OAAO,CAAE,CAAA,gBAAA,CAAiB,UAAW,CAAA,OAAO,CAAC,CAAA,CAAA;AAAA,OAC/C;AAAA,KACF,CAAA;AAEA,IAAA,MAAM,EAAE,OAAA,EAAY,GAAA,WAAA,CAAY,aAAa,CAAA,CAAA;AAE7C,IAAA,MAAM,WAAc,GAAA,QAAA,CAAS,MAAM,KAAA,CAAM,OAAO,CAAA,CAAA;AAEhD,IAAA,MAAM,YAAe,GAAA;AAAA,MACnB,OAAS,EAAA,CAAA,UAAA,EAAa,KAAM,CAAA,MAAA,GAAS,SAAS,MAAM,CAAA,KAAA,CAAA;AAAA,KACtD,CAAA;AAKA,IAAA,MAAM,SAAS,MAAM;AACnB,MAAA,IAAI,MAAM,KAAO,EAAA;AAEf,QAAY,WAAA,CAAA,UAAA,CAAW,MAAM,IAAI,CAAA,CAAA;AACjC,QAAA,MAAA,CAAO,GAAG,CAAE,CAAA,CAAA,CAAA;AAAA,OACP,MAAA;AAEL,QAAA,MAAA,CAAO,GAAG,CAAE,CAAA,CAAA,CAAA;AAAA,OACd;AAAA,KACF,CAAA;AAKA,IAAA,MAAM,YAAY,MAAM;AACtB,MAAA,OAAA,CAAQ,KAAQ,GAAA,IAAA,CAAA;AAChB,MAAY,WAAA,CAAA,UAAA,CAAW,MAAM,QAAQ,CAAA,CAAA;AACrC,MAAA,MAAA,CAAO,GAAG,CAAE,CAAA,CAAA,CAAA;AAAA,KACd,CAAA;AAKA,IAAM,MAAA,EAAE,CAAE,EAAA,GAAI,eAAgB,EAAA,CAAA;AAE9B,IAAM,MAAA,QAAA,GAAW,aAAc,CAAA,QAAA,CAAS,IAAI,CAAA,CAAA;AAE5C,IAAA,KAAA;AAAA,MACE,MAAM,KAAM,CAAA,OAAA;AAAA,MACZ,CAAC,GAAQ,KAAA;AACP,QAAA,QAAA,CAAS,KAAQ,GAAA,GAAA,CAAA;AAAA,OACnB;AAAA,KACF,CAAA;AAGA,IAAa,QAAA,CAAA;AAAA,MACX,SAAW,EAAA,SAAA;AAAA,KACZ,CAAA,CAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;"}
+{"version":3,"file":"Show.vue2.mjs","sources":["../../../src/layout/Show.vue"],"sourcesContent":["<script lang=\"ts\">\nconst delayTime = 200\n</script>\n<script setup lang=\"ts\">\n/**\n * 详情/新增/编辑组件\n */\nimport { computed, inject, useSlots, watch, h, resolveComponent } from \"vue\";\nimport { useRoute, useRouter } from \"vue-router\";\nimport { useScrollLock, useWindowScroll } from \"@vueuse/core\";\nimport { LeftOutlined } from \"@ant-design/icons-vue\";\nimport { useNavTabsStore, useSettingsStore } from \"@ditari/store\";\n\nimport { storeToRefs } from \"pinia\";\n\nconst props = defineProps({\n  \"close\": { type: Boolean, required: false, default: false },\n  \"loading\": { type: Boolean, required: false, default: false }\n});\n\nconst router = useRouter();\nconst route = useRoute();\nconst slots = useSlots();\n\nconst navTabStore = useNavTabsStore();\nconst settingsStore = useSettingsStore();\n\nconst showConfig = inject(\"showConfig\") as any;\nconst collapsedStatus = computed(() => settingsStore.getCollapsed);\nconst btnRender = () => {\n  if (!showConfig) {\n    return h(LeftOutlined);\n  } else {\n    return h(resolveComponent(showConfig.backBtn));\n  }\n};\n\nconst { refresh } = storeToRefs(settingsStore);\n\nconst showLoading = computed(() => props.loading);\n\nconst contentStyle = {\n  padding: `10px 10px ${slots.footer ? \"70px\" : \"10px\"} 10px`\n};\n\n/**\n * 点击返回\n */\nconst onBack = () => {\n  if (props.close) {\n    // 返回关闭标签\n    navTabStore.deleteTabs(route.path);\n    router.go(-1);\n  } else {\n    // 不关闭标签\n    router.go(-1);\n  }\n};\n\n/**\n * 对外暴露方法 调用后关闭标签 并且出发List组件刷新动作\n */\nconst onRefresh = () => {\n  refresh.value = true;\n  navTabStore.deleteTabs(route.fullPath);\n  router.go(-1);\n};\n\n/**\n * 监听屏幕滚动，滚动大于0的时候给a-page-header组件添加阴影\n */\nconst { y } = useWindowScroll();\n// 锁定屏幕\nconst isLocked = useScrollLock(document.body);\n\nwatch(\n  () => props.loading,\n  (val) => {\n    isLocked.value = val;\n  }\n);\n\n\ndefineExpose({\n  closePage: onRefresh\n});\n</script>\n<template>\n  <div class=\"ditari-show-layout\">\n    <a-spin\n      tip=\"正在处理...\"\n      :spinning=\"showLoading\"\n      :delay=\"delayTime\"\n      size=\"large\"\n    >\n      <a-page-header\n        class=\"ditari-page-header\"\n        :class=\"{ active: y > 0 }\"\n        :ghost=\"false\"\n        @back=\"onBack\"\n      >\n        <template #backIcon>\n          <btn-render />\n        </template>\n        <template #title>{{ $route.meta.title }} </template>\n        <template #subTitle>\n          <slot name=\"subTitle\"></slot>\n        </template>\n        <template #extra>\n          <slot name=\"extra\"></slot>\n        </template>\n      </a-page-header>\n      <div class=\"ditari-show-content\" :style=\"contentStyle\">\n        <slot></slot>\n      </div>\n      <div\n        v-if=\"$slots.footer\"\n        class=\"ditari-show-footer\"\n        :style=\"{ left: collapsedStatus ? '80px' : '200px' }\"\n      >\n        <slot name=\"footer\"></slot>\n      </div>\n    </a-spin>\n  </div>\n</template>\n<style lang=\"scss\"></style>\n"],"names":[],"mappings":";;;;;;;;AACA,MAAM,SAAY,GAAA,GAAA,CAAA;;;;;;;;;AAmBlB,IAAA,MAAM,SAAS,SAAU,EAAA,CAAA;AACzB,IAAA,MAAM,QAAQ,QAAS,EAAA,CAAA;AACvB,IAAA,MAAM,QAAQ,QAAS,EAAA,CAAA;AAEvB,IAAA,MAAM,cAAc,eAAgB,EAAA,CAAA;AACpC,IAAA,MAAM,gBAAgB,gBAAiB,EAAA,CAAA;AAEvC,IAAM,MAAA,UAAA,GAAa,OAAO,YAAY,CAAA,CAAA;AACtC,IAAA,MAAM,eAAkB,GAAA,QAAA,CAAS,MAAM,aAAA,CAAc,YAAY,CAAA,CAAA;AACjE,IAAA,MAAM,YAAY,MAAM;AACtB,MAAA,IAAI,CAAC,UAAY,EAAA;AACf,QAAA,OAAO,EAAE,YAAY,CAAA,CAAA;AAAA,OAChB,MAAA;AACL,QAAA,OAAO,CAAE,CAAA,gBAAA,CAAiB,UAAW,CAAA,OAAO,CAAC,CAAA,CAAA;AAAA,OAC/C;AAAA,KACF,CAAA;AAEA,IAAA,MAAM,EAAE,OAAA,EAAY,GAAA,WAAA,CAAY,aAAa,CAAA,CAAA;AAE7C,IAAA,MAAM,WAAc,GAAA,QAAA,CAAS,MAAM,KAAA,CAAM,OAAO,CAAA,CAAA;AAEhD,IAAA,MAAM,YAAe,GAAA;AAAA,MACnB,OAAS,EAAA,CAAA,UAAA,EAAa,KAAM,CAAA,MAAA,GAAS,SAAS,MAAM,CAAA,KAAA,CAAA;AAAA,KACtD,CAAA;AAKA,IAAA,MAAM,SAAS,MAAM;AACnB,MAAA,IAAI,MAAM,KAAO,EAAA;AAEf,QAAY,WAAA,CAAA,UAAA,CAAW,MAAM,IAAI,CAAA,CAAA;AACjC,QAAA,MAAA,CAAO,GAAG,CAAE,CAAA,CAAA,CAAA;AAAA,OACP,MAAA;AAEL,QAAA,MAAA,CAAO,GAAG,CAAE,CAAA,CAAA,CAAA;AAAA,OACd;AAAA,KACF,CAAA;AAKA,IAAA,MAAM,YAAY,MAAM;AACtB,MAAA,OAAA,CAAQ,KAAQ,GAAA,IAAA,CAAA;AAChB,MAAY,WAAA,CAAA,UAAA,CAAW,MAAM,QAAQ,CAAA,CAAA;AACrC,MAAA,MAAA,CAAO,GAAG,CAAE,CAAA,CAAA,CAAA;AAAA,KACd,CAAA;AAKA,IAAM,MAAA,EAAE,CAAE,EAAA,GAAI,eAAgB,EAAA,CAAA;AAE9B,IAAM,MAAA,QAAA,GAAW,aAAc,CAAA,QAAA,CAAS,IAAI,CAAA,CAAA;AAE5C,IAAA,KAAA;AAAA,MACE,MAAM,KAAM,CAAA,OAAA;AAAA,MACZ,CAAC,GAAQ,KAAA;AACP,QAAA,QAAA,CAAS,KAAQ,GAAA,GAAA,CAAA;AAAA,OACnB;AAAA,KACF,CAAA;AAGA,IAAa,QAAA,CAAA;AAAA,MACX,SAAW,EAAA,SAAA;AAAA,KACZ,CAAA,CAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;"}

package/example/src/main.ts

@@ -1,6 +1,7 @@
 import { createApp } from "vue";
 import Antd from "ant-design-vue";
 import "ant-design-vue/dist/antd.css";
+import * as Icons from "@ant-design/icons-vue";
 import App from "./App.vue";
 import router from "./router";
 import ui from "../../../bsui/src/index";
@@ -12,4 +13,10 @@ app.use(Antd);
 app.use(router);
 app.use(ui, { menuIcon: { componentName: "nativeHtml", prop: "type" } } as any);
 
+//注册UI自带的图标
+const icons: any = Icons;
+for (const i in icons) {
+  app.component(i, icons[i]);
+}
+
 app.mount("#app");

package/example/src/views/table/Add.vue

@@ -2,8 +2,6 @@
 import { onActivated, ref } from "vue";
 import { useRoute } from "vue-router";
 
-import { useDeclareData } from "../../store";
-
 const columns = [
   {
     title: "商品编码"
@@ -22,17 +20,8 @@ const columns = [
   }
 ];
 const route = useRoute();
-const store = useDeclareData();
 const loading = ref(false);
 
-onActivated(() => {
-  if (route.path.includes("form")) {
-    store.data = store.exportDeclarationData;
-  } else {
-    store.data = store.importDeclarationData;
-  }
-});
-
 const formState = ref({
   originCountry: ""
 });
@@ -44,148 +33,6 @@ export default {
 </script>
 <template>
   <d-show-layout :loading="loading">
-
-    <a-card>
-      <template #title>
-        <span class="title">申报人信息</span>
-      </template>
-      <a-form :colon="false" :label-col="{ style: { width: '120px' } }">
-        <d-grid class-name="ditari-bsui-grid-form" :fill="true" grid="repeat(2, 50%)">
-          <d-grid-item>
-            <a-form-item label="申报人姓名">
-              <a-input />
-            </a-form-item>
-          </d-grid-item>
-          <d-grid-item>
-            <a-form-item label="申报人证件号">
-              {{ formState.originCountry }}
-              <a-input v-model:value="formState.originCountry" v-trim />
-            </a-form-item>
-          </d-grid-item>
-          <d-grid-item>
-            <a-button type="primary" block>选择申报人</a-button>
-          </d-grid-item>
-        </d-grid>
-      </a-form>
-    </a-card>
-    <a-card>
-      <template #title>
-        <span class="title">基本信息</span>
-      </template>
-      <a-form :colon="false" :label-col="{ style: { width: '150px' } }">
-        <d-grid class-name="ditari-bsui-grid-form">
-          <d-grid-item>
-            <a-form-item label="进出口标志"> </a-form-item>
-          </d-grid-item>
-          <d-grid-item>
-            <a-form-item label="业务模式"> </a-form-item>
-          </d-grid-item>
-          <d-grid-item>
-            <a-form-item label="运输方式"> </a-form-item>
-          </d-grid-item>
-          <d-grid-item>
-            <a-form-item label="总金额(元)"> </a-form-item>
-          </d-grid-item>
-          <d-grid-item>
-            <a-form-item label="总毛重(KG)"> </a-form-item>
-          </d-grid-item>
-          <d-grid-item>
-            <a-form-item label="总净重(KG)"> </a-form-item>
-          </d-grid-item>
-          <d-grid-item>
-            <a-form-item label="币制"> </a-form-item>
-          </d-grid-item>
-          <d-grid-item>
-            <a-form-item label="件数"> </a-form-item>
-          </d-grid-item>
-          <d-grid-item>
-            <a-form-item label="贸易国别"> </a-form-item>
-          </d-grid-item>
-          <d-grid-item>
-            <a-form-item label="运输工具航次(班)号"> </a-form-item>
-          </d-grid-item>
-          <d-grid-item>
-            <a-form-item label="运输工具号"> </a-form-item>
-          </d-grid-item>
-          <d-grid-item>
-            <a-form-item label="提运单号"> </a-form-item>
-          </d-grid-item>
-          <d-grid-item>
-            <a-form-item label="是否涉及证书预备案"> </a-form-item>
-          </d-grid-item>
-          <d-grid-item>
-            <a-form-item label="证书类型"> </a-form-item>
-          </d-grid-item>
-          <d-grid-item>
-            <a-form-item label="证书预备案编号"> </a-form-item>
-          </d-grid-item>
-        </d-grid>
-      </a-form>
-    </a-card>
-<!--    <a-card v-for="item in 3">-->
-<!--      <template #title>-->
-<!--        <span class="title">商品信息</span>-->
-<!--      </template>-->
-<!--      <d-table-->
-<!--        row-key="id"-->
-<!--        bordered-->
-<!--        :height="150"-->
-<!--        :columns="columns"-->
-<!--        :data="[{}]"-->
-<!--      ></d-table>-->
-<!--      <a-form :colon="false" :label-col="{ style: { width: '150px' } }">-->
-<!--        <d-grid class-name="ditari-bsui-grid-form">-->
-<!--          <d-grid-item>-->
-<!--            <a-form-item label="商品编码"> </a-form-item>-->
-<!--          </d-grid-item>-->
-<!--          <d-grid-item>-->
-<!--            <a-form-item label="商品名称"> </a-form-item>-->
-<!--          </d-grid-item>-->
-<!--          <d-grid-item>-->
-<!--            <a-form-item label="规格型号"> </a-form-item>-->
-<!--          </d-grid-item>-->
-<!--          <d-grid-item>-->
-<!--            <a-form-item label="申报计量单位"> </a-form-item>-->
-<!--          </d-grid-item>-->
-<!--          <d-grid-item>-->
-<!--            <a-form-item label="第一计量单位"> </a-form-item>-->
-<!--          </d-grid-item>-->
-<!--          <d-grid-item>-->
-<!--            <a-form-item label="第二计量单位"> </a-form-item>-->
-<!--          </d-grid-item>-->
-<!--          <d-grid-item>-->
-<!--            <a-form-item label="申报数量(千克)"> </a-form-item>-->
-<!--          </d-grid-item>-->
-<!--          <d-grid-item>-->
-<!--            <a-form-item label="第一数量"> </a-form-item>-->
-<!--          </d-grid-item>-->
-<!--          <d-grid-item>-->
-<!--            <a-form-item label="第二数量"> </a-form-item>-->
-<!--          </d-grid-item>-->
-<!--          <d-grid-item>-->
-<!--            <a-form-item label="毛重(KG)"> </a-form-item>-->
-<!--          </d-grid-item>-->
-<!--          <d-grid-item>-->
-<!--            <a-form-item label="净重(KG)"> </a-form-item>-->
-<!--          </d-grid-item>-->
-<!--          <d-grid-item>-->
-<!--            <a-form-item label="产销国"> </a-form-item>-->
-<!--          </d-grid-item>-->
-<!--          <d-grid-item>-->
-<!--            <a-form-item label="申报单价(元)"> </a-form-item>-->
-<!--          </d-grid-item>-->
-<!--          <d-grid-item>-->
-<!--            <a-form-item label="申报总价(元)"> </a-form-item>-->
-<!--          </d-grid-item>-->
-<!--          <d-grid-item>-->
-<!--            <a-form-item label="存储条件"> </a-form-item>-->
-<!--          </d-grid-item>-->
-<!--          <d-grid-item>-->
-<!--            <a-form-item label="用途"> </a-form-item>-->
-<!--          </d-grid-item>-->
-<!--        </d-grid>-->
-<!--      </a-form>-->
-<!--    </a-card>-->
     <template #footer>
       <a-space>
         <a-button type="primary" @click="loading = true">暂存</a-button>
@@ -201,5 +48,4 @@ export default {
   font-weight: bold;
   color: #2589ff;
 }
-
 </style>

package/example/src/views/table/List.vue

@@ -263,10 +263,10 @@ const onQuery = () => {
 
 const queryParams = ref({ from: "", to: "" });
 
-const format = ref("YYYY-MM-DD");
 setTimeout(() => {
-  format.value = "YYYY";
-}, 5000);
+  queryParams.value.from = "2023-02-04";
+  queryParams.value.to = "2023-05-06";
+}, 3000);
 </script>
 <script lang="ts">
 export default {
@@ -279,13 +279,7 @@ export default {
       <d-query-form :value="formState" :scheme="scheme" @query="onQuery">
       </d-query-form>
       {{ queryParams }}
-      <d-range-picker
-        v-model:value="queryParams"
-        :format="format"
-        :value-format="format"
-        :field="['from', 'to']"
-        picker="year"
-      />
+      <d-range-picker v-model:value="queryParams" :field="['from', 'to']" />
     </template>
     <template #table="{ height }">
       <d-table

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ditari/bsui",
-  "version": "1.1.35",
+  "version": "1.1.37",
   "description": "",
   "keywords": [],
   "author": "",

package/src/date/RangePicker.tsx

@@ -25,7 +25,6 @@ export default defineComponent({
   emits: ["update:value"],
   setup(props, { emit, attrs }) {
     const dates = ref<string[]>([]);
-    const modelValue: any = ref(props.value);
 
     //内部model
     const internalModel = ref<{ [name: string]: unknown }>(props?.value || {});
@@ -45,11 +44,23 @@ export default defineComponent({
     };
 
     watchEffect(() => {
+      const value: any = props.value;
       props.field.forEach((key, index) => {
-        if (modelValue[key] === "") {
+        if (value[key] === "") {
           dates.value && (dates.value[index] = "");
         } else {
-          dates.value && (dates.value[index] = modelValue.value[key]);
+          dates.value && (dates.value[index] = value[key]);
+        }
+      });
+    });
+
+    watchEffect(() => {
+      const value: any = props.value;
+      props.field.forEach((key, index) => {
+        if (value[key] === "") {
+          dates.value && (dates.value[index] = "");
+        } else {
+          dates.value && (dates.value[index] = value[key]);
         }
       });
     });

package/src/layout/FuckMain.vue

@@ -2,7 +2,7 @@
 /**
  * FUCK MAIN 入口文件
  */
-import { computed, provide } from "vue";
+import { computed } from "vue";
 import { MenuFoldOutlined, MenuUnfoldOutlined } from "@ant-design/icons-vue";
 import { useKeepAliveStore, useSettingsStore } from "@ditari/store";
 
@@ -11,15 +11,6 @@ import DNavTabs from "./NavTabs.vue";
 // 菜单组件
 import Menu from "../menu/Menu";
 
-const props = withDefaults(
-  defineProps<{
-    showConfig: any;
-  }>(),
-  {
-    showConfig: { backBtn: "LeftOutlined" } as any
-  }
-);
-
 // 缓存store
 const store = useKeepAliveStore();
 // 缓存的names
@@ -28,9 +19,6 @@ const keepAliveNames = computed(() => store.get);
 const settingsStore = useSettingsStore();
 const { switchCollapsed } = settingsStore;
 const collapsedStatus = computed(() => settingsStore.getCollapsed);
-
-// 注入show组件的配置文件
-provide("showConfig", props.showConfig);
 </script>
 <template>
   <a-layout class="ditari-layout">
@@ -67,25 +55,6 @@ provide("showConfig", props.showConfig);
         <div class="ditari-user-menu">
           <slot name="operation"></slot>
         </div>
-        <!--        <div class="ditari-layout-header">-->
-        <!--          <div class="ditari-layout-header-left">-->
-        <!--            <div class="ditari-side-collapsed" @click="switchCollapsed">-->
-        <!--              <menu-unfold-outlined-->
-        <!--                v-if="collapsedStatus"-->
-        <!--                class="trigger"-->
-        <!--                style="font-size: 16px; font-weight: bold; cursor: pointer"-->
-        <!--              />-->
-        <!--              <menu-fold-outlined-->
-        <!--                v-else-->
-        <!--                style="font-size: 16px; font-weight: bold; cursor: pointer"-->
-        <!--              />-->
-        <!--            </div>-->
-        <!--            -->
-        <!--          </div>-->
-        <!--          <div class="ditari-user-menu">-->
-        <!--            <slot name="operation"></slot>-->
-        <!--          </div>-->
-        <!--        </div>-->
       </div>
       <a-layout-content
         style="margin-top: 42px"

package/src/layout/List.vue

@@ -11,7 +11,7 @@ import {
   nextTick,
   watchEffect
 } from "vue";
-import { useElementSize } from "@vueuse/core";
+import { useElementSize, useResizeObserver } from "@vueuse/core";
 import { useSettingsStore } from "@ditari/store";
 import { storeToRefs } from "pinia";
 import { useRoute } from "vue-router";
@@ -95,6 +95,10 @@ watchEffect(() => {
   calcHeight();
 });
 
+useResizeObserver(document.body, () => {
+  calcHeight();
+});
+
 // 动态计算高度
 function calcHeight() {
   show.value = false;

package/src/layout/Show.vue

@@ -31,7 +31,7 @@ const navTabStore = useNavTabsStore();
 const settingsStore = useSettingsStore();
 
 const showConfig = inject("showConfig") as any;
-
+const collapsedStatus = computed(() => settingsStore.getCollapsed);
 const btnRender = () => {
   if (!showConfig) {
     return h(LeftOutlined);
@@ -118,7 +118,11 @@ defineExpose({
       <div class="ditari-show-content" :style="contentStyle">
         <slot></slot>
       </div>
-      <div v-if="$slots.footer" class="ditari-show-footer">
+      <div
+        v-if="$slots.footer"
+        class="ditari-show-footer"
+        :style="{ left: collapsedStatus ? '80px' : '200px' }"
+      >
         <slot name="footer"></slot>
       </div>
     </a-spin>