@dt-frames/ui 1.0.27 → 1.0.28

package/es/index.js

@@ -2,7 +2,7 @@ import { defineComponent, resolveComponent, openBlock, createBlock, computed, un
 import { isString, isArray as isArray$1, isObject, isFunction, error, useTimeoutFn, useAttrs, useSlots, dispatchResize, BAR_MAP, off, renderThumbStyle, on, useAppStore, addResizeListener, removeResizeListener, windowResizeFn, isNumber, isBoolean, isNull, DtCache, CacheKey, deepMerge, http, getDynamicProps, getDictValueByCode, formatNumber, isVnode, getPopupContainer, isNullAndUnDef, useMessage, isEmpty, useTheme, useMenu, useHeader, useGo, Pages, localeList, changeLocale, Theme, MenuMode, MenuType, useThemeStore, ContentMode, useMultipleTab, copyText, MenuSplitTye, isUrl, openWindow, RouteReuseStore, menuList2Map, useApp } from "@dt-frames/core";
 import { InputSearch, Tooltip, Modal as Modal$1, RadioGroup, RadioButton, InputGroup, Input, Button, Select, TreeSelect, Radio, Checkbox, AutoComplete, Cascader, DatePicker, InputNumber, Switch, TimePicker, Slider, Rate, Divider, Col, Form, FormItem, Row, Popover, Spin, Dropdown, Menu, MenuItem, CheckboxGroup, Table, Upload, Image, MenuDivider, Tree, Empty, BackTop, Breadcrumb, Avatar, Drawer, SubMenu, LayoutHeader, LayoutSider, Tabs, TabPane, LayoutFooter, LayoutContent, ConfigProvider, Layout } from "ant-design-vue";
 import { isEqual, omit, cloneDeep, upperFirst, set, uniqBy, difference, get, trim } from "lodash-es";
-import { tryOnUnmounted, isFunction as isFunction$1, useFullscreen, useDebounceFn, useThrottleFn } from "@vueuse/core";
+import { tryOnUnmounted, isFunction as isFunction$1, useDebounceFn, useFullscreen, useThrottleFn } from "@vueuse/core";
 import dayjs from "dayjs";
 import Sortablejs from "sortablejs";
 import * as xlsx from "xlsx";
@@ -5338,9 +5338,13 @@ const _sfc_main$I = /* @__PURE__ */ defineComponent({
   },
   setup(__props) {
     const props = __props;
+    const actionBtns = ref([]);
     watch(() => props.btns, (btns) => {
-      btns.map((it) => {
-        it.ifShow = isBoolean(it.ifShow) ? it.ifShow : isFunction(it.ifShow) ? it.ifShow(props.record) : true;
+      actionBtns.value = [...btns].map((it) => {
+        return {
+          ...it,
+          ifShow: isBoolean(it.ifShow) ? it.ifShow : isFunction(it.ifShow) ? it.ifShow(props.record) : true
+        };
       });
     }, {
       immediate: true
@@ -5388,7 +5392,7 @@ const _sfc_main$I = /* @__PURE__ */ defineComponent({
         overlay: withCtx(() => [
           createVNode(unref(Menu), { class: "dt-action-select" }, {
             default: withCtx(() => [
-              (openBlock(true), createElementBlock(Fragment, null, renderList(props.btns, (item) => {
+              (openBlock(true), createElementBlock(Fragment, null, renderList(actionBtns.value, (item) => {
                 return withDirectives((openBlock(), createElementBlock("span", null, [
                   item.ifShow ? (openBlock(), createBlock(unref(MenuItem), {
                     key: 0,
@@ -5542,22 +5546,18 @@ function handleActionColumn(propsRef, columns) {
     });
   }
 }
-function useColumns(propsRef, getPaginationRef) {
+function useColumns(propsRef, getPaginationRef, tableElRef) {
   const columnsRef = ref(unref(propsRef).columns);
   let cacheColumns = unref(propsRef).columns;
   const getColumnsRef = computed(() => {
     const columns = cloneDeep(unref(columnsRef));
     if (!columns)
       return [];
-    const { ellipsis, resizable, minWidth = 50, maxWidth = 700 } = unref(propsRef);
+    const { ellipsis } = unref(propsRef);
     columns.forEach((it, index) => {
+      var _a;
+      it.class = `${(_a = it.class) != null ? _a : ""} __column`;
       const { slots } = it;
-      it.width = it.width || (index === columns.length - 1 ? 119.9 : 120);
-      if (Reflect.has(it, "resizable") ? !!it.resizable : resizable) {
-        it.resizable = true;
-        it.minWidth = it.minWidth || minWidth;
-        it.maxWidth = it.maxWidth || maxWidth;
-      }
       if (it.sorter) {
         it.sorter = {
           multiple: Number(it.sorter)
@@ -5583,10 +5583,41 @@ function useColumns(propsRef, getPaginationRef) {
     const ifShow = column.ifShow;
     return isBoolean(ifShow) ? ifShow : isFunction(ifShow) ? ifShow(column) : true;
   }
+  function addResize() {
+    const { resizable, minWidth = 50, maxWidth = 700 } = unref(propsRef);
+    useDebounceFn(() => {
+      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++) {
+        allWidth += (_b = els[i].offsetWidth) != null ? _b : 0;
+      }
+      let columnAllWidth = 0, noWidthNum = 0;
+      columnsRef.value.forEach((it) => {
+        if (it.ifShow) {
+          if (it.width) {
+            columnAllWidth += parseInt(`${it.width}`);
+          } else {
+            noWidthNum++;
+          }
+        }
+      });
+      let avgWidth = (allWidth - columnAllWidth) / noWidthNum;
+      columnsRef.value.forEach((it) => {
+        it.width = it.width || avgWidth - 1;
+        if (Reflect.has(it, "resizable") ? !!it.resizable : resizable) {
+          it.resizable = true;
+          it.minWidth = it.minWidth || minWidth;
+          it.maxWidth = it.maxWidth || maxWidth;
+        }
+      });
+    }, 100)();
+  }
   watch(() => unref(propsRef).columns, (columns) => {
     var _a;
     columnsRef.value = columns;
     cacheColumns = (_a = columns.filter((it) => !it.flag)) != null ? _a : [];
+    nextTick(() => addResize());
   });
   function getColumns(opt) {
     const { ignoreIndex, ignoreAction, sort } = opt || {};
@@ -5656,7 +5687,7 @@ const _hoisted_1$r = /* @__PURE__ */ createElementVNode("span", null, "\u5217\u6
 const _hoisted_2$i = /* @__PURE__ */ createTextVNode(" \u5217\u5C55\u793A ");
 const _hoisted_3$b = /* @__PURE__ */ createTextVNode(" \u5E8F\u5217\u53F7 ");
 const _hoisted_4$8 = /* @__PURE__ */ createTextVNode(" \u590D\u9009\u6846 ");
-const _hoisted_5$5 = /* @__PURE__ */ createTextVNode("\u91CD\u7F6E");
+const _hoisted_5$4 = /* @__PURE__ */ createTextVNode("\u91CD\u7F6E");
 const _hoisted_6$2 = {
   size: 16,
   className: "drag-icon"
@@ -5894,7 +5925,7 @@ const _sfc_main$H = /* @__PURE__ */ defineComponent({
                   onClick: reset
                 }, {
                   default: withCtx(() => [
-                    _hoisted_5$5
+                    _hoisted_5$4
                   ]),
                   _: 1
                 })
@@ -6375,7 +6406,7 @@ const _hoisted_4$5 = {
   key: 0,
   class: "dt-table-header-actions__right"
 };
-const _hoisted_5$4 = {
+const _hoisted_5$3 = {
   key: 0,
   style: { "margin": "5px" }
 };
@@ -6395,7 +6426,7 @@ function _sfc_render$1(_ctx, _cache, $props, $setup, $data, $options) {
         }, null, 8, ["setting", "onColumnsChange"])
       ])) : createCommentVNode("", true)
     ]),
-    _ctx.$slots.headerTop ? (openBlock(), createElementBlock("div", _hoisted_5$4, [
+    _ctx.$slots.headerTop ? (openBlock(), createElementBlock("div", _hoisted_5$3, [
       renderSlot(_ctx.$slots, "headerTop")
     ])) : createCommentVNode("", true)
   ]);
@@ -6432,9 +6463,10 @@ function useTableScroll(propsRef, tableElRef, columnsRef, rowSelectionRef) {
   watch(() => propsRef.value.dataSource, (v) => {
     debounceRedoHeight();
   }, {
+    deep: true,
     flush: "post"
   });
-  windowResizeFn(calcTableHeight, 280);
+  windowResizeFn(calcTableHeight, 10);
   function redoHeight() {
     nextTick(() => {
       calcTableHeight();
@@ -6684,7 +6716,7 @@ const _sfc_main$A = defineComponent({
       setColumns,
       setCacheColumnsByField,
       getCacheColumns
-    } = useColumns(getProps, getPaginationInfo);
+    } = useColumns(getProps, getPaginationInfo, tableElRef);
     const {
       getRowSelectionRef,
       clearSelectedRowKeys,
@@ -6841,14 +6873,14 @@ function useDownload(exportUrl, exportName) {
       case "all":
         http.exportFile(exportUrl, {
           fields: setDownloadAllHeaders(columns),
-          tableName: exportName,
+          tableName: unref(exportName),
           fileType: "xlsx",
           searchDTO
-        }, `${exportName}.xlsx`);
+        }, `${unref(exportName)}.xlsx`);
         break;
       case "current":
       case "select":
-        handleDownloadPage(excelData, exportName);
+        handleDownloadPage(excelData, unref(exportName));
         break;
     }
   }
@@ -7122,6 +7154,9 @@ const _sfc_main$z = /* @__PURE__ */ defineComponent({
   __name: "dialog",
   props: {
     ...basicProps,
+    title: {
+      type: Object
+    },
     ...{
       onRegister: { type: Function },
       formProps: {
@@ -7135,7 +7170,7 @@ const _sfc_main$z = /* @__PURE__ */ defineComponent({
   },
   setup(__props) {
     const props = __props;
-    const [registerDialog, { closeModal }] = useModal({
+    const [registerDialog, { closeModal, setModalProps }] = useModal({
       ...omit(toRaw(props), [
         "curd",
         "formProps",
@@ -7189,19 +7224,23 @@ function useCurd(curdOpt) {
     closeModal
   }] = useModalOut();
   const {
-    confirm
+    confirm,
+    message
   } = useMessage();
+  const actType = ref(null);
+  const title = computed(() => unref(actType) + unref(curdOpt.title));
   const DtCurdModal = () => {
     return h(createVNode("div", {
       "class": "curdModal"
     }, [createVNode(_sfc_main$z, mergeProps(curdOpt, {
+      "title": title,
       "formsVal": formsVal,
       "formProps": curdOpt.formProps,
       "onRegister": register
     }), null)]));
   };
   function add() {
-    curdOpt.title = `\u65B0\u589E${curdOpt.title}`;
+    actType.value = "\u65B0\u589E";
     formsVal.value = null;
     openModal();
   }
@@ -7232,7 +7271,7 @@ function useCurd(curdOpt) {
       primaryKey = "id",
       curd
     } = curdOpt;
-    curdOpt.title = `\u7F16\u8F91${curdOpt.title}`;
+    actType.value = "\u7F16\u8F91";
     curd.onQueryById(row[primaryKey]).then((rsp) => {
       formsVal.value = rsp;
       nextTick(() => dispatchResize());
@@ -7240,6 +7279,10 @@ function useCurd(curdOpt) {
     openModal();
   }
   function dels(ids = []) {
+    if (!ids.length) {
+      message.error("\u6682\u65E0\u9009\u4E2D\u7684\u6570\u636E!");
+      return;
+    }
     const {
       curd
     } = curdOpt;
@@ -7318,6 +7361,10 @@ const _sfc_main$y = /* @__PURE__ */ defineComponent({
   }
 });
 const basicUploadProps = {
+  uploadText: {
+    type: String,
+    default: "\u6587\u4EF6\u4E0A\u4F20"
+  },
   showTemplateDownload: {
     type: Boolean,
     default: false
@@ -7807,9 +7854,8 @@ var sparkMd5 = { exports: {} };
 })(sparkMd5);
 const _hoisted_1$j = { class: "dt-file" };
 const _hoisted_2$b = { class: "file-header" };
-const _hoisted_3$6 = /* @__PURE__ */ createTextVNode(" \u6587\u4EF6\u4E0A\u4F20 ");
-const _hoisted_4$4 = /* @__PURE__ */ createTextVNode(" \u6A21\u677F\u4E0B\u8F7D ");
-const _hoisted_5$3 = { class: "file-type-tips ant-alert-info" };
+const _hoisted_3$6 = /* @__PURE__ */ createTextVNode(" \u6A21\u677F\u4E0B\u8F7D ");
+const _hoisted_4$4 = { class: "file-type-tips ant-alert-info" };
 const _sfc_main$x = /* @__PURE__ */ defineComponent({
   __name: "upload",
   props: basicUploadProps,
@@ -7940,7 +7986,7 @@ const _sfc_main$x = /* @__PURE__ */ defineComponent({
                     withDirectives(createElementVNode("span", null, null, 512), [
                       [_directive_icon, "ic:baseline-file-upload"]
                     ]),
-                    _hoisted_3$6
+                    createTextVNode(" " + toDisplayString(_ctx.uploadText), 1)
                   ]),
                   _: 1
                 })
@@ -7956,14 +8002,14 @@ const _sfc_main$x = /* @__PURE__ */ defineComponent({
                 withDirectives(createElementVNode("span", null, null, 512), [
                   [_directive_icon, "ic:baseline-file-download"]
                 ]),
-                _hoisted_4$4
+                _hoisted_3$6
               ]),
               _: 1
             }, 8, ["onClick"])) : createCommentVNode("", true)
           ]),
           renderSlot(_ctx.$slots, "default")
         ]),
-        createElementVNode("div", _hoisted_5$3, [
+        createElementVNode("div", _hoisted_4$4, [
           withDirectives(createElementVNode("span", null, null, 512), [
             [_directive_icon, "ant-design:info-circle-outlined"]
           ]),

package/es/theme/theme.less

@@ -38,6 +38,8 @@
                 flex-direction: column;
                 padding: 12px;
                 background: @page-bg-color;
+                max-height: 100%;
+                overflow: hidden;
                 .basic-form--search{
                     background: #fff;
                     padding: 15px 30px 0;

package/es/theme/transition.less

@@ -39,6 +39,12 @@
       opacity: 0;
     }
 }
+
+.fade-leave-active {
+  position: absolute;
+  left: 0;
+  top: 0;
+}
   
 .fade-enter-active,
 .fade-leave-active {

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@dt-frames/ui",
-	"version": "1.0.27",
+	"version": "1.0.28",
 	"keywords": [
 		"ui",
 		"dt-ui"
@@ -10,7 +10,7 @@
 		"registry": "https://registry.npmjs.org/"
 	},
 	"scripts": {
-		"dev": "yarn build -w",
+		"dev": "vite dev",
 		"build": "vite build"
 	},
 	"exports": {