@dt-frames/ui 2.0.17 → 2.0.18

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

@@ -16,7 +16,7 @@ export declare const BasicProps: {
         default: () => {};
     };
     layout: {
-        type: PropType<"vertical" | "inline" | "horizontal">;
+        type: PropType<"inline" | "horizontal" | "vertical">;
         default: string;
     };
     labelWidth: {
@@ -41,8 +41,8 @@ export declare const BasicProps: {
     };
     rowProps: {
         type: PropType<Partial<import("vue").ExtractPropTypes<{
-            align: PropType<"middle" | "top" | "bottom" | "stretch">;
-            justify: PropType<"center" | "space-around" | "space-between" | "end" | "start">;
+            align: PropType<"bottom" | "top" | "stretch" | "middle">;
+            justify: PropType<"space-around" | "space-between" | "center" | "end" | "start">;
             prefixCls: StringConstructor;
             gutter: {
                 type: PropType<import("ant-design-vue/lib/grid/Row").Gutter | [import("ant-design-vue/lib/grid/Row").Gutter, import("ant-design-vue/lib/grid/Row").Gutter]>;

package/es/components/form/src/types/items.type.d.ts

@@ -383,12 +383,20 @@ export declare type Divider = {
 export declare type InputWithDialog = Input & {
     openDialog?: (model: Recordable) => void;
 };
+export declare type FieldNames = {
+    fileId?: string;
+    fileName?: string;
+    filePath?: string;
+    fileSize?: string;
+    fileType?: string;
+};
 export declare type Upload = {
     uploadUrl?: string;
     downloadUrl?: string;
     buttonText?: string;
     preIcon?: string;
     data?: object | ((file: UploadFile) => object);
+    fieldNames?: FieldNames;
     filename?: string;
     accept?: string[];
     customRequest?: (params: UploadRequestOption) => void;

package/es/components/modal/index.js

@@ -3,7 +3,7 @@ import { reactive, ref, getCurrentInstance, watchEffect, unref, nextTick, onUnmo
 import { Tooltip, Spin } from "ant-design-vue/es";
 import "ant-design-vue/es/spin/style";
 import { omit } from "lodash-es";
-import { Modal } from "ant-design-vue";
+import { Modal as Modal$1 } from "ant-design-vue";
 import "ant-design-vue/es/modal/style";
 import "ant-design-vue/es/tooltip/style";
 import { DtFormButtons } from "../form";
@@ -318,16 +318,25 @@ const _sfc_main$3 = {
         ...props,
         destroyOnClose: true,
         onCancel,
+        centered: true,
         getContainer: getPopupContainer()
       };
       if (!propsData?.visible)
         return null;
-      return createVNode(Modal, propsData, _isSlot(_slot = extendSlots(slots)) ? _slot : {
+      return createVNode(Modal$1, propsData, _isSlot(_slot = extendSlots(slots)) ? _slot : {
         default: () => [_slot]
       });
     };
   }
 };
+const _export_sfc = (sfc, props) => {
+  const target = sfc.__vccOpts || sfc;
+  for (const [key, val] of props) {
+    target[key] = val;
+  }
+  return target;
+};
+const Modal = /* @__PURE__ */ _export_sfc(_sfc_main$3, [["__file", "D:/dt/dt-frame-front/dt-frames/frames/packages/ui/src/components/modal/src/components/Modal.vue"]]);
 const _sfc_main$2 = /* @__PURE__ */ defineComponent({
   __name: "CloseIcon",
   props: {
@@ -386,7 +395,7 @@ const _sfc_main$2 = /* @__PURE__ */ defineComponent({
             ]),
             _: 1
           }, 8, ["title"]))
-        ], 64)) : createCommentVNode("", true),
+        ], 64)) : createCommentVNode("v-if", true),
         createElementVNode("i", {
           class: "i mdi:close h-14 w-10 pr-4",
           onClick: handleCancel
@@ -395,6 +404,7 @@ const _sfc_main$2 = /* @__PURE__ */ defineComponent({
     };
   }
 });
+const CloseIcon = /* @__PURE__ */ _export_sfc(_sfc_main$2, [["__file", "D:/dt/dt-frame-front/dt-frames/frames/packages/ui/src/components/modal/src/components/CloseIcon.vue"]]);
 const _sfc_main$1 = /* @__PURE__ */ defineComponent({
   __name: "ModalFooter",
   props: {
@@ -448,6 +458,7 @@ const _sfc_main$1 = /* @__PURE__ */ defineComponent({
     };
   }
 });
+const ModalFooter = /* @__PURE__ */ _export_sfc(_sfc_main$1, [["__file", "D:/dt/dt-frame-front/dt-frames/frames/packages/ui/src/components/modal/src/components/ModalFooter.vue"]]);
 function useFullScreen(wrapClassName) {
   const fullScreenRef = ref(false);
   const getWrapClassName = computed(() => {
@@ -556,7 +567,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     });
     return (_ctx, _cache) => {
       const _component_ASpin = Spin;
-      return openBlock(), createBlock(_sfc_main$3, mergeProps(unref(getBindValue), { onCancel: handleCancel }), createSlots({
+      return openBlock(), createBlock(Modal, mergeProps(unref(getBindValue), { onCancel: handleCancel }), createSlots({
         default: withCtx(() => [
           createVNode(_component_ASpin, {
             spinning: unref(getBindValue).loading,
@@ -573,7 +584,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
         !_ctx.$slots.closeIcon ? {
           name: "closeIcon",
           fn: withCtx(() => [
-            createVNode(_sfc_main$2, {
+            createVNode(CloseIcon, {
               canFullscreen: unref(getBindValue).canFullscreen,
               fullScreen: unref(fullScreenRef),
               onCancel: handleCancel,
@@ -592,7 +603,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
         !_ctx.$slots.footer ? {
           name: "footer",
           fn: withCtx(() => [
-            createVNode(_sfc_main$1, {
+            createVNode(ModalFooter, {
               authPrefix: unref(getBindValue).authPrefix,
               buttons: propsRef.value?.footer,
               showSave: unref(getBindValue).showOkBtn,
@@ -626,8 +637,9 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     };
   }
 });
+const index = /* @__PURE__ */ _export_sfc(_sfc_main, [["__file", "D:/dt/dt-frame-front/dt-frames/frames/packages/ui/src/components/modal/src/index.vue"]]);
 export {
-  _sfc_main as DtModal,
+  index as DtModal,
   basicProps,
   useModal,
   useModalOut

package/es/components/modal/index.less

@@ -28,6 +28,7 @@
 
 
 .dt-modal{
+    overflow: hidden;
 	.ant-modal {
 		padding: 0;
 	}
@@ -38,15 +39,6 @@
 
     &:not(.fullscreen-modal) {
         .ant-modal {
-            padding: 0;
-            position: absolute;
-            left: 0;
-            top: 0;
-            right: 0;
-            bottom: 0;
-            margin: 0 auto;
-            display: flex;
-            align-items: center;
             .ant-modal-body{
                 max-height: calc(100vh - 160px );
                 min-height: 200px;

package/es/components/source/index.js

@@ -190,13 +190,21 @@ function useSource(props) {
         dataSource.value.splice(0, dataSource.value.length, ...result);
         return;
       }
-      const { records, total, size, current } = result;
+      const { records, total, size, current, pageDTO } = result;
       dataSource.value.splice(0, dataSource.value.length, ...records);
-      pagination.value = {
-        current,
-        pageSize: size || appConf?.ui?.table?.defaultPageSize,
-        total
-      };
+      if (pageDTO) {
+        pagination.value = {
+          current: pageDTO.pageNo + 1,
+          pageSize: pageDTO.pageSize || appConf?.ui?.table?.defaultPageSize,
+          total: pageDTO.totalCount
+        };
+      } else {
+        pagination.value = {
+          current,
+          pageSize: size || appConf?.ui?.table?.defaultPageSize,
+          total: 100
+        };
+      }
     } catch (err) {
       console.error(`\u5206\u9875\u67E5\u8BE2\u9519\u8BEF\uFF1A${err}`);
     } finally {
@@ -300,7 +308,7 @@ function useSource(props) {
         }
       }
     } catch (err) {
-      console.log("Err:" + err);
+      console.log("Err:", err);
     } finally {
     }
   }