@dt-frames/ui 1.0.50 → 1.0.52

package/es/index.js

@@ -3761,14 +3761,20 @@ function useFormEvents({
       console.error("\u6240\u6709\u7684\u5143\u7D20\u90FD\u5FC5\u987B\u8BBE\u7F6Ename\u5C5E\u6027");
       return;
     }
+    let schema = [];
     updateItems.forEach((it) => {
+      let isMerge = false;
       unref(getSchema).forEach((val) => {
         if (val.name === it.name) {
-          deepMerge(val, it);
+          const newSchema = deepMerge(val, it);
+          schema.push(newSchema);
+          isMerge = true;
         }
       });
+      if (!isMerge)
+        schema.push(it);
     });
-    schemaRef.value = uniqBy(updateItems, "name");
+    schemaRef.value = uniqBy(schema, "name");
   }
   function resetSchema(data) {
     let updateItems = [];
@@ -5645,7 +5651,7 @@ function useColumns(propsRef, getPaginationRef, tableElRef) {
       var _a, _b;
       let els = (_a = unref(tableElRef)) == null ? void 0 : _a.$el.querySelectorAll(".__column");
       let allWidth = 0;
-      for (let i = 0; i < els.length; i++) {
+      for (let i = 0; i < (els == null ? void 0 : els.length); i++) {
         allWidth += (_b = els[i].offsetWidth) != null ? _b : 0;
       }
       let columnAllWidth = 0, noWidthNum = 0;
@@ -5818,7 +5824,7 @@ const _sfc_main$G = /* @__PURE__ */ defineComponent({
               columns.splice(oldIndex, 1);
             }
             plainSortOptions.value = columns;
-            setColumns(columns);
+            setColumns(columns.map((col) => col.value).filter((value) => state.checkedList.includes(value)));
           }
         });
         sortableOrder = sortable.toArray();
@@ -6940,7 +6946,7 @@ function useDownload(exportUrl, exportName) {
   };
 }
 function useSource(opt) {
-  var _a, _b, _c, _d;
+  var _a, _b, _c, _d, _e, _f;
   const { t } = useI18n("UI");
   const loading = {
     onSearch: ref(false),
@@ -6967,7 +6973,7 @@ function useSource(opt) {
   const { appConf } = useAppStore();
   const pagination = ref({
     current: ((_b = (_a = appConf == null ? void 0 : appConf.ui) == null ? void 0 : _a.table) == null ? void 0 : _b.defaultPageNo) || 1,
-    pageSize: ((_d = (_c = appConf == null ? void 0 : appConf.ui) == null ? void 0 : _c.table) == null ? void 0 : _d.defaultPageSize) || 10,
+    pageSize: ((_d = (_c = appConf == null ? void 0 : appConf.ui) == null ? void 0 : _c.table) == null ? void 0 : _d.defaultPageSize) || 20,
     total: 0
   });
   const dataSource = ref([]);
@@ -6975,7 +6981,7 @@ function useSource(opt) {
     entityDTO: {},
     pageDTO: {
       pageNo: 0,
-      pageSize: 10
+      pageSize: (_f = (_e = appConf == null ? void 0 : appConf.ui) == null ? void 0 : _e.table) == null ? void 0 : _f.defaultPageSize
     },
     orderDTOs: []
   });
@@ -7016,7 +7022,7 @@ function useSource(opt) {
     const { fetch } = useFetch(queryPage, baseUrl);
     loading.onQuerypage.value = true;
     fetch(toRaw(baseData)).then((rsp) => {
-      var _a2, _b2, _c2;
+      var _a2, _b2, _c2, _d2, _e2;
       if (isArray$1(rsp)) {
         dataSource.value.splice(0, dataSource.value.length, ...rsp);
         return;
@@ -7025,8 +7031,8 @@ function useSource(opt) {
       dataSource.value.splice(0, dataSource.value.length, ...records);
       pagination.value = {
         current: ((_a2 = pageDTO == null ? void 0 : pageDTO.pageNo) != null ? _a2 : 0) + 1,
-        pageSize: (_b2 = pageDTO == null ? void 0 : pageDTO.pageSize) != null ? _b2 : 10,
-        total: (_c2 = pageDTO == null ? void 0 : pageDTO.totalCount) != null ? _c2 : 0
+        pageSize: (_d2 = pageDTO == null ? void 0 : pageDTO.pageSize) != null ? _d2 : (_c2 = (_b2 = appConf == null ? void 0 : appConf.ui) == null ? void 0 : _b2.table) == null ? void 0 : _c2.defaultPageSize,
+        total: (_e2 = pageDTO == null ? void 0 : pageDTO.totalCount) != null ? _e2 : 0
       };
     }).finally(() => {
       loading.onSearch.value = false;
@@ -8957,11 +8963,13 @@ const _sfc_main$h = /* @__PURE__ */ defineComponent({
     const menuList = ref([]);
     const router = useRouter();
     const filter2 = ref("");
+    const visible = ref(false);
     const { getShowSearch, getIsZH } = useHeader();
     const isUseDef = computed(() => {
       return isBoolean(getShowSearch.value);
     });
     function visibleChange(e) {
+      visible.value = e;
       if (e) {
         filterMenu();
       } else {
@@ -8971,25 +8979,28 @@ const _sfc_main$h = /* @__PURE__ */ defineComponent({
     function filterMenu() {
       menuList.value = getFilterMenu(filter2.value, true);
     }
-    function navigation(url) {
+    function goPage(url) {
       router.push(url);
+      visible.value = false;
       setTimeout(() => {
         filter2.value = "";
         menuList.value = [];
-      });
+      }, 500);
     }
     return (_ctx, _cache) => {
       return unref(isUseDef) ? (openBlock(), createElementBlock("div", _hoisted_1$6, [
         createVNode(unref(Popover), {
           placement: "bottom",
           overlayClassName: "menu_search__popover",
-          trigger: "focus",
+          trigger: "click",
+          visible: visible.value,
+          "onUpdate:visible": _cache[1] || (_cache[1] = ($event) => visible.value = $event),
           onVisibleChange: visibleChange
         }, {
           content: withCtx(() => [
             (openBlock(true), createElementBlock(Fragment, null, renderList(menuList.value, (menu) => {
               return openBlock(), createElementBlock("p", {
-                onClick: ($event) => navigation(menu.url)
+                onClick: ($event) => goPage(menu.url)
               }, toDisplayString(unref(getIsZH) ? menu.label : menu.enLabel), 9, _hoisted_2$3);
             }), 256)),
             !menuList.value.length ? (openBlock(), createElementBlock("div", _hoisted_3$1, [
@@ -9008,7 +9019,7 @@ const _sfc_main$h = /* @__PURE__ */ defineComponent({
             }, null, 8, ["value", "placeholder"])
           ]),
           _: 1
-        })
+        }, 8, ["visible"])
       ])) : (openBlock(), createBlock(unref(getShowSearch), { key: 1 }));
     };
   }

package/es/theme/header/components/user-info.d.ts

@@ -14,8 +14,10 @@ declare const _sfc_main: import("vue").DefineComponent<{}, {
         router?: {
             useHashRoute?: boolean;
             unRequireAuthPage?: string[];
+            whiteUrls?: string[];
             useAuthRoute?: boolean;
             strictRoute?: false;
+            defaultRedictPath?: string;
             virtualRoute?: ({
                 component: import("vue").FunctionalComponent<any, any> | {
                     new (...args: any[]): any;
@@ -7805,6 +7807,7 @@ declare const _sfc_main: import("vue").DefineComponent<{}, {
         locales?: {
             show?: boolean;
             defaultLocale?: import("@dt-frames/core").Language | "navigator";
+            message?: (lang: import("@dt-frames/core").Language) => Promise<import("@dt-frames/core").Recordable<any>>;
         };
         ui?: {
             global?: {
@@ -7857,6 +7860,7 @@ declare const _sfc_main: import("vue").DefineComponent<{}, {
             params?: string | import("@dt-frames/core").Recordable<any>;
             listName?: string;
             label?: string | ((item: import("@dt-frames/core").Recordable<any>) => string);
+            enLabel?: string | ((item: import("@dt-frames/core").Recordable<any>) => string);
             value?: string;
             numberToString?: boolean;
             setOptions?: (list: any[]) => any[];

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@dt-frames/ui",
-	"version": "1.0.50",
+	"version": "1.0.52",
 	"keywords": [
 		"ui",
 		"dt-ui"

package/es/components/upload/index.d.ts

@@ -1,2 +0,0 @@
-import DtUpload from "./src/upload";
-export { DtUpload };

package/es/components/upload/index.less

@@ -1,37 +0,0 @@
-.dt-file {
-    display: flex;
-    flex-direction: column;
-    td.orange{
-        color: orange;
-    }
-}
-
-.file-header{
-    display: flex;
-    flex-direction: row;
-    justify-content: space-between;
-    &>div{
-        display: flex;
-        flex-direction: row;
-        button{
-            margin-right: 10px;
-        }
-    }
-}
-
-.file-type-tips{
-    line-height: 24px;
-    padding: 5px 10px;
-    font-size: 12px;
-    display: flex;
-    margin: 10px 0;
-    border: 1px dashed @primary-color;
-    cursor: inherit;
-    span i{
-        color: @primary-color;
-        margin-right: 7px;
-    }
-    i{
-        color: #666;
-    }
-}

package/es/components/upload/src/helper.d.ts

@@ -1,5 +0,0 @@
-import { Ref } from "vue";
-export declare function useHelpers(acceptRef: Ref<string[]>, helpTextRef: Ref<string | boolean>, maxNumberRef: Ref<number>, maxSizeRef: Ref<number>): {
-    getStringAccept: import("vue").ComputedRef<string>;
-    getHelpText: import("vue").ComputedRef<string | boolean>;
-};

package/es/components/upload/src/props.d.ts

@@ -1,47 +0,0 @@
-import { Fn } from "@vueuse/core";
-import { PropType } from "vue";
-export declare type FileType = {
-    fileName: String;
-    [key: string]: any;
-};
-export declare const basicUploadProps: {
-    uploadText: {
-        type: StringConstructor;
-        default: string;
-    };
-    showTemplateDownload: {
-        type: BooleanConstructor;
-        default: boolean;
-    };
-    templateDownload: {
-        type: PropType<Fn>;
-        default: () => void;
-    };
-    helpText: {
-        type: PropType<string | boolean>;
-        default: string;
-    };
-    multiple: {
-        type: PropType<boolean>;
-        default: boolean;
-    };
-    accept: {
-        type: PropType<string[]>;
-        default: () => any[];
-    };
-    maxSize: {
-        type: PropType<number>;
-    };
-    maxNumber: {
-        type: PropType<number>;
-        default: number;
-    };
-    defaultFiles: {
-        type: PropType<FileType[]>;
-        default: any[];
-    };
-    showView: {
-        type: BooleanConstructor;
-        default: boolean;
-    };
-};