@maketribe/ms-app 4.0.2 → 4.0.4

package/dist/esm/{index-Dum31xvp.js → index-B5WnSJ0l.js}

@@ -2,7 +2,7 @@ var __defProp = Object.defineProperty;
 var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
 var __publicField = (obj, key, value) => __defNormalProp(obj, typeof key !== "symbol" ? key + "" : key, value);
 var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l, _m, _n, _o, _p, _q, _r, _s, _t, _u, _v, _w, _x, _y, _z, _A, _B, _C, _D, _E, _F, _G, _H, _I, _J, _K, _L, _M, _N, _O, _P, _Q, _R, _S, _T, _U, _V, _W, _X, _Y, _Z, __, _$, _aa, _ba, _ca, _da, _ea, _fa, _ga, _ha, _ia, _ja;
-import { defineAsyncComponent, reactive, ref, getCurrentInstance, inject, computed, unref, provide, defineComponent, createVNode, renderSlot, isVNode, watch, isRef, onBeforeUnmount, resolveComponent, openBlock, createBlock, withCtx, createTextVNode, createElementVNode, createElementBlock, Fragment, renderList, createCommentVNode, normalizeClass, normalizeStyle, onMounted, h, shallowReactive, withModifiers, watchEffect, onUnmounted, readonly, useSlots, toRaw, mergeProps, nextTick, resolveDirective, withDirectives, toDisplayString, Suspense, resolveDynamicComponent, shallowRef, Teleport, pushScopeId, popScopeId, Transition, render, toHandlers, TransitionGroup, vShow, onBeforeUpdate, withKeys, vModelText, normalizeProps, guardReactiveProps, KeepAlive } from "vue";
+import { defineAsyncComponent, reactive, ref, getCurrentInstance, inject, computed, unref, provide, defineComponent, createVNode, renderSlot, isVNode, watch, isRef, onBeforeUnmount, resolveComponent, openBlock, createBlock, withCtx, createTextVNode, createElementVNode, createElementBlock, Fragment, renderList, createCommentVNode, normalizeClass, normalizeStyle, withDirectives, resolveDirective, onMounted, h, shallowReactive, withModifiers, watchEffect, onUnmounted, readonly, useSlots, toRaw, mergeProps, nextTick, createSlots, toDisplayString, Suspense, resolveDynamicComponent, shallowRef, Teleport, pushScopeId, popScopeId, Transition, render, toHandlers, TransitionGroup, vShow, onBeforeUpdate, withKeys, vModelText, normalizeProps, guardReactiveProps, onErrorCaptured, KeepAlive } from "vue";
 import { Components, Operator, DataTable as DataTable$1, DataForm as DataForm$1, ComponentsCombine, isWhereFilter, Dialoger, Messager, FormColumn, DataTree, RefreshButton, AddButton, TableHeaderItem as TableHeaderItem$1, FilterColumn, TableColumn, TableActionColumn, DataFormType, ActionButton, EditButton, DeleteButton, TableSelectCacheColumn, LoadingManager, FormDetailColumn, TableHeaderButton, Notificationer, SkeletonMessageSender, SkeletonDialoger } from "@maketribe/dm";
 import { ElInput, ElInputNumber, ElConfigProvider, ElButton, ElSelect, ElOption, ElPagination, ElDatePicker, useFormItem as useFormItem$1, ElPopover, ElScrollbar, ElTooltip, ElForm, ElFormItem, ElCollapse, ElCollapseItem, useFormDisabled, ElCard, ElTableColumn, ElTable, ElEmpty, ElTag, ElTree, ElMessageBox, ElIcon, ElMessage, ElImage, ElTabs, ElTabPane, ElRow, ElCol, ElLoading, ElDialog, ElAlert, ElProgress, ElCheckbox, ElNotification, ElUpload, ElDrawer, ElButtonGroup, ElBadge } from "element-plus";
 import { Disposable, Event, createDisposable, md5, buildProps, withInstall, aesEncrypt, aesDecrypt, fileSelect, base64ToBlob, postTraverse, makeInstaller } from "@maketribe/utils";
@@ -153,84 +153,84 @@ class DataTableComponents extends Components {
       name: "MKColumnAction",
       title: "操作",
       component: defineAsyncComponent(
-        async () => import("./index-hxtDa_tq.js")
+        async () => import("./index-BibfPxyE.js")
       )
     });
     this.registerComponent({
       name: "MKColumnText",
       title: "文本",
       component: defineAsyncComponent(
-        async () => import("./index-CrGyN4bm.js")
+        async () => import("./index-pCgDKrHr.js")
       )
     });
     this.registerComponent({
       name: "MKColumnObjectMappingText",
       title: "对象映射文本",
       component: defineAsyncComponent(
-        async () => import("./index-C0i3n5Hu.js")
+        async () => import("./index-CkrS77t9.js")
       )
     });
     this.registerComponent({
       name: "MKColumnImage",
       title: "图片",
       component: defineAsyncComponent(
-        async () => import("./index-us02rfFp.js")
+        async () => import("./index-CYqfkhll.js")
       )
     });
     this.registerComponent({
       name: "MKColumnSelect",
       title: "行选择",
       component: defineAsyncComponent(
-        async () => import("./index-40hRlNvx.js")
+        async () => import("./index-6pAFW8Vh.js")
       )
     });
     this.registerComponent({
       name: "MKColumnJson",
       title: "JSON",
       component: defineAsyncComponent(
-        async () => import("./index-BIgutj3A.js")
+        async () => import("./index-CrnR0ENO.js")
       )
     });
     this.registerComponent({
       name: "MKColumnDate",
       title: "日期时间",
       component: defineAsyncComponent(
-        async () => import("./index-DJGMjPB9.js")
+        async () => import("./index-D30VkiUw.js")
       )
     });
     this.registerComponent({
       name: "MKColumnSwitch",
       title: "开关",
       component: defineAsyncComponent(
-        async () => import("./index-BmCIBx6p.js")
+        async () => import("./index-DQ858uj-.js")
       )
     });
     this.registerComponent({
       name: "MKColumnTag",
       title: "标签",
       component: defineAsyncComponent(
-        async () => import("./index-DgNzfAbG.js")
+        async () => import("./index-CbofgtMb.js")
       )
     });
     this.registerComponent({
       name: "MKColumnLink",
       title: "链接",
       component: defineAsyncComponent(
-        async () => import("./index-Ss6jaMiD.js")
+        async () => import("./index-Dx_DWZka.js")
       )
     });
     this.registerComponent({
       name: "MKColumnSort",
       title: "拖拽排序",
       component: defineAsyncComponent(
-        async () => import("./index-PEg2TZWA.js")
+        async () => import("./index-CH7WN-BC.js")
       )
     });
     this.registerComponent({
       name: "MKColumnIcon",
       title: "图标",
       component: defineAsyncComponent(
-        async () => import("./index-CQpOTEvB.js")
+        async () => import("./index-WAZn782k.js")
       )
     });
   }
@@ -256,14 +256,14 @@ class DataTableHeaderComponents extends Components {
       name: "MKBatchOpt",
       title: "批量操作",
       component: defineAsyncComponent(
-        async () => import("./index-sRMYMeLU.js")
+        async () => import("./index-D8AhTxEQ.js")
       )
     });
     this.registerComponent({
       name: "MKTableFilter",
       title: "筛选",
       component: defineAsyncComponent(
-        async () => import("./index-gM_MzZ4F.js")
+        async () => import("./index-DdH6OCKp.js")
       )
     });
   }
@@ -341,7 +341,7 @@ class DataFormComponents extends Components {
       name: "MKFormDetail",
       title: "明细",
       component: defineAsyncComponent(
-        () => import("./index-dyVqrVB3.js")
+        () => import("./index-ZmRbK5N3.js")
       )
     });
     this.registerComponent({
@@ -362,14 +362,14 @@ class DataFormComponents extends Components {
       name: "MKDataTreeSelect",
       title: "树选择器",
       component: defineAsyncComponent(
-        () => import("./index-D32Y2j9j.js")
+        () => import("./index-CGBy2JBa.js")
       )
     });
     this.registerComponent({
       name: "MKResourceSelectInput",
       title: "资源选择输入框",
       component: defineAsyncComponent(
-        () => import("./ResourceSelectInput-BV4JLs2Z.js")
+        () => import("./ResourceSelectInput-_DpkQhgI.js")
       )
     });
     this.registerComponent({
@@ -405,7 +405,7 @@ class DataFilterComponents extends Components {
       title: "下拉框",
       defaultOperator: Operator.IN,
       component: defineAsyncComponent(
-        () => import("./index-BmkkhAqz.js")
+        () => import("./index-BL1Thi0L.js")
       )
     });
     this.registerComponent({
@@ -413,7 +413,7 @@ class DataFilterComponents extends Components {
       title: "树形下拉框",
       defaultOperator: Operator.IN,
       component: defineAsyncComponent(
-        () => import("./index-D32Y2j9j.js")
+        () => import("./index-CGBy2JBa.js")
       )
     });
     this.registerComponent({
@@ -846,7 +846,7 @@ class Router extends Disposable {
                     vueRouter.addRoute("mk-ms-layout", {
                       name: defaultPageRoute.name,
                       path: defaultPageRoute.route || `/dv/${name}`,
-                      component: () => import("./normal-BYM_Qh87.js"),
+                      component: () => import("./normal-CPxIocMG.js"),
                       meta
                     });
                     break;
@@ -854,7 +854,7 @@ class Router extends Disposable {
                     vueRouter.addRoute("mk-ms-layout", {
                       name: defaultPageRoute.name,
                       path: defaultPageRoute.route || `/dv/${name}`,
-                      component: () => import("./dialog-u_uBgACo.js"),
+                      component: () => import("./dialog-DTdQYzsb.js"),
                       meta
                     });
                     break;
@@ -866,7 +866,7 @@ class Router extends Disposable {
                     vueRouter.addRoute("mk-ms-layout", {
                       name: defaultPageRoute.name,
                       path: defaultPageRoute.route || `/dv/${name}`,
-                      component: () => import("./dialog-B9x1BWVN.js"),
+                      component: () => import("./dialog-CrY554IQ.js"),
                       meta
                     });
                     break;
@@ -878,7 +878,7 @@ class Router extends Disposable {
                     vueRouter.addRoute("mk-ms-layout", {
                       name: defaultPageRoute.name,
                       path: defaultPageRoute.route || `/dv/${name}`,
-                      component: () => import("./dialog-TKihxlfv.js"),
+                      component: () => import("./dialog-CXKCj4dG.js"),
                       meta
                     });
                     break;
@@ -886,7 +886,7 @@ class Router extends Disposable {
                     vueRouter.addRoute("mk-ms-layout", {
                       name: defaultPageRoute.name,
                       path: defaultPageRoute.route || `/dv/${name}`,
-                      component: () => import("./normal-lbysXNk5.js"),
+                      component: () => import("./normal-GrSzV1bh.js"),
                       meta
                     });
                 }
@@ -896,7 +896,7 @@ class Router extends Disposable {
             vueRouter.addRoute("mk-ms-layout", {
               name: defaultPageRoute.name,
               path: defaultPageRoute.route || `/dv/${name}`,
-              component: () => import("./table-BcFdzeOC.js"),
+              component: () => import("./table-D7IlWlB-.js"),
               meta
             });
             break;
@@ -904,7 +904,7 @@ class Router extends Disposable {
             vueRouter.addRoute("mk-ms-layout", {
               name: defaultPageRoute.name,
               path: defaultPageRoute.route || `/dv/${name}/edit/:id?`,
-              component: () => import("./edit-uWpOC3Nq.js"),
+              component: () => import("./edit-CnW1vav_.js"),
               meta
             });
             break;
@@ -1846,7 +1846,7 @@ class PageManager {
     this.addNormalPage({
       name: "mk-ms-layout",
       path: "/",
-      component: () => import("./index-BtPosd_V.js")
+      component: () => import("./index-BMsQ9MZO.js")
     });
     this.addNormalPage({
       name: "login",
@@ -1854,7 +1854,7 @@ class PageManager {
       meta: {
         isAuthorization: false
       },
-      component: () => import("./index-BLR8H0G7.js")
+      component: () => import("./index-Cys5Stbp.js")
     });
     this.addNormalPage({
       name: "signup",
@@ -1862,7 +1862,7 @@ class PageManager {
       meta: {
         isAuthorization: false
       },
-      component: () => import("./index-DxdoerPE.js")
+      component: () => import("./index-SdxgZQLS.js")
     });
     this.afterInitdEvent.emit();
     this.msAppClientChangeEvent.on(({ msAppClient }) => {
@@ -1914,7 +1914,7 @@ class PageManager {
               this.addExtendsPage({
                 name: "notFound",
                 path: "/:pathMatch(.*)*",
-                component: () => import("./404-CGMBvWJC.js")
+                component: () => import("./404-D3_BuVvI.js")
               });
             }
             userSession.register(
@@ -3168,7 +3168,7 @@ const abstractSelectProps = buildProps({
   formatOptions: {
     type: Function,
     default: (item) => {
-      const value = item.value ?? item.id ?? item.name;
+      const value = item.value ?? item.id ?? item.code ?? item.name;
       const label = item.label ?? item.desc ?? item.title ?? item.name;
       return { value, label };
     }
@@ -3176,6 +3176,10 @@ const abstractSelectProps = buildProps({
   additional: {
     type: Boolean,
     default: true
+  },
+  queryMode: {
+    type: String,
+    default: "condition"
   }
 });
 const abstractSelectEmits = {
@@ -3194,15 +3198,15 @@ const AbstractSelect = defineComponent({
       }
     });
     const selections = computed(() => {
-      const _primaryKey = unref(primaryKey);
-      const _modelValue = unref(modelValue);
+      var _a2, _b2;
       if (props.objectValue) {
-        return props.multiple ? (_modelValue == null ? void 0 : _modelValue.map((item) => item[_primaryKey])) ?? [] : (_modelValue == null ? void 0 : _modelValue[_primaryKey]) ?? "";
+        return props.multiple ? ((_a2 = modelValue.value) == null ? void 0 : _a2.map((item) => item[primaryKey.value])) ?? [] : ((_b2 = modelValue.value) == null ? void 0 : _b2[primaryKey.value]) ?? "";
       }
-      return _modelValue;
+      return modelValue.value;
     });
     const innerSelections = ref(unref(modelValue));
     const selectRecords = ref([]);
+    const dataLoading = ref(true);
     const primaryKey = computed(
       () => {
         var _a2;
@@ -3210,19 +3214,19 @@ const AbstractSelect = defineComponent({
       }
     );
     const formatOptions = computed(() => {
-      let _formatOptions;
+      let value;
       if (props.labelFieldName) {
-        _formatOptions = (item) => {
+        value = (item) => {
           return {
             value: item[unref(primaryKey)],
             label: item[props.labelFieldName]
           };
         };
       } else {
-        _formatOptions = props.formatOptions;
+        value = props.formatOptions;
       }
       const innerFormatOptions = (item) => {
-        const options2 = _formatOptions(item);
+        const options2 = value(item);
         options2.data = item;
         if (Array.isArray(item.children)) {
           options2.children = item.children.map(innerFormatOptions);
@@ -3233,16 +3237,15 @@ const AbstractSelect = defineComponent({
     });
     const options = computed(() => {
       let options2 = [];
-      const _formatOptions = unref(formatOptions);
       if (props.dataTable) {
-        options2 = props.dataTable.getList().map((item) => _formatOptions.call(null, item));
+        options2 = props.dataTable.getList().map((item) => formatOptions.value.call(null, item));
       } else if (Array.isArray(props.options)) {
-        options2 = props.options.map((item) => _formatOptions.call(null, item));
+        options2 = props.options.map((item) => formatOptions.value.call(null, item));
       }
       const optionValues = options2.map((options3) => options3.value);
       let additionOptions = [];
       if (props.additional) {
-        additionOptions = unref(selectRecords).map(_formatOptions).filter(
+        additionOptions = unref(selectRecords).map(formatOptions.value).filter(
           (additionOption) => !optionValues.includes(additionOption.value)
         );
       }
@@ -3251,63 +3254,63 @@ const AbstractSelect = defineComponent({
     watch(
       modelValue,
       async (modelValue2) => {
-        let _values;
+        let values;
         if (props.objectValue) {
-          _values = props.multiple ? (modelValue2 == null ? void 0 : modelValue2.map((item) => item[unref(primaryKey)])) ?? [] : (modelValue2 == null ? void 0 : modelValue2[unref(primaryKey)]) ?? null;
+          values = props.multiple ? (modelValue2 == null ? void 0 : modelValue2.map((item) => item[unref(primaryKey)])) ?? [] : (modelValue2 == null ? void 0 : modelValue2[unref(primaryKey)]) ?? null;
         } else {
-          _values = modelValue2;
+          values = modelValue2;
         }
-        if (!isEqual(_values, unref(innerSelections))) {
-          innerSelections.value = _values;
+        if (!isEqual(values, unref(innerSelections))) {
+          innerSelections.value = values;
         }
       },
       { immediate: true }
     );
     const getSelectDataOptions = async () => {
-      const _primaryKey = unref(primaryKey);
-      const _selections = unref(innerSelections);
-      const recordIds = Array.isArray(_selections) ? _selections : _selections ? [_selections] : [];
+      const selections2 = unref(innerSelections);
+      const recordIds = Array.isArray(innerSelections) ? selections2 : selections2 ? [selections2] : [];
       if (props.dataTable) {
         const dataTable = props.dataTable;
         let existingRecords = unref(options).filter((option) => recordIds.includes(option.value)).map((item) => item.data);
         if (existingRecords.length !== recordIds.length) {
           const notExistingRecords = recordIds.filter(
-            (id) => !existingRecords.find((item) => item[_primaryKey] === id)
+            (id) => !existingRecords.find((item) => item[primaryKey.value] === id)
           );
-          const where = new Where();
-          where.addCondition(
-            unref(primaryKey),
-            "in",
-            `${notExistingRecords.join(",")}`
-          );
-          const response = await dataTable.dataViewRequest.allList({
-            data: { condition: where }
-          });
+          const loadParams = {};
+          if (props.queryMode == "condition") {
+            dataTable.useCondition((where) => {
+              if (props.multiple) {
+                where.clear().addCondition(unref(primaryKey), "in", `${notExistingRecords.join(",")}`);
+              } else {
+                where.clear().addCondition(unref(primaryKey), "=", notExistingRecords[0]);
+              }
+            });
+          } else {
+            loadParams[primaryKey.value] = props.multiple ? notExistingRecords : notExistingRecords[0];
+          }
+          const response = await dataTable.loadRequest(loadParams);
           if (response.data.code === 200) {
             existingRecords = [...existingRecords, ...response.data.data];
           }
         }
-        return recordIds.map((id) => existingRecords.find((item) => item[_primaryKey] === id)).filter(Boolean);
+        return recordIds.map((id) => existingRecords.find((item) => item[primaryKey.value] === id)).filter(Boolean);
       } else if (Array.isArray(props.options)) {
-        const _options = unref(options);
-        return _options.filter((option) => recordIds.includes(option.value)).map((item) => item.data);
+        return unref(options).filter((option) => recordIds.includes(option.value)).map((item) => item.data);
       }
       return [];
     };
-    watch(
-      innerSelections,
-      async (selections2) => {
-        selectRecords.value = await getSelectDataOptions();
-        if (modelValue.value !== selections2) {
-          if (props.objectValue) {
-            modelValue.value = props.multiple ? [...selectRecords.value] : selectRecords.value[0] ?? null;
-          } else {
-            modelValue.value = selections2;
-          }
+    watch(innerSelections, async (selections2) => {
+      dataLoading.value = true;
+      selectRecords.value = await getSelectDataOptions();
+      dataLoading.value = false;
+      if (modelValue.value !== selections2) {
+        if (props.objectValue) {
+          modelValue.value = props.multiple ? [...selectRecords.value] : selectRecords.value[0] ?? null;
+        } else {
+          modelValue.value = selections2;
         }
-      },
-      { immediate: true }
-    );
+      }
+    }, { immediate: true });
     const setSelections = (v) => {
       innerSelections.value = v;
     };
@@ -3316,7 +3319,8 @@ const AbstractSelect = defineComponent({
       selections,
       selectRecords,
       setSelections,
-      formatOptions
+      formatOptions,
+      dataLoading
     };
   },
   render() {
@@ -3326,7 +3330,8 @@ const AbstractSelect = defineComponent({
       selections: this.selections,
       selectRecords: this.selectRecords,
       setSelections: this.setSelections,
-      formatOptions: this.formatOptions
+      formatOptions: this.formatOptions,
+      dataLoading: this.dataLoading
     });
   }
 });
@@ -3527,10 +3532,8 @@ const DataTableSelect = /* @__PURE__ */ defineComponent({
       if (props.disabled) {
         return;
       }
-      const _dataTable = unref(dataTable);
-      const _selections = (_a2 = unref(abstractSelectInstance)) == null ? void 0 : _a2.selections;
-      const selections = props.multiple ? _selections ?? [] : _selections ? [_selections] : [];
-      _dataTable.setSelection(selections);
+      const selections = (_a2 = unref(abstractSelectInstance)) == null ? void 0 : _a2.selections;
+      dataTable.value.setSelection(props.multiple ? selections ?? [] : selections ? [selections] : []);
       const result = await Dialoger.dataTableSelectDialog(unref(dataTable));
       if (result.isConfirm) {
         (_b2 = unref(abstractSelectInstance)) == null ? void 0 : _b2.setSelections(props.multiple ? result.selections : result.selections[0]);
@@ -3539,7 +3542,7 @@ const DataTableSelect = /* @__PURE__ */ defineComponent({
     return () => {
       return createVNode("div", {
         "class": "mk-data-table-select",
-        "onMousedown": handleMousedown
+        "onClick": handleMousedown
       }, [createVNode(MKAbstractSelect, {
         "modelValue": unref(modelValue),
         "onUpdate:model-value": (v) => {
@@ -3551,21 +3554,23 @@ const DataTableSelect = /* @__PURE__ */ defineComponent({
         "multiple": props.multiple,
         "labelFieldName": props.labelFieldName,
         "primaryFieldName": props.primaryFieldName,
-        "formatOptions": props.formatOptions
+        "formatOptions": props.formatOptions,
+        "queryMode": props.queryMode
       }, {
         default: ({
           selectRecords,
-          formatOptions
+          formatOptions,
+          dataLoading
         }) => {
           const options = selectRecords.map(formatOptions);
-          return createVNode(ElSelect, {
+          return withDirectives(createVNode("div", null, [createVNode(ElSelect, {
             "disabled": props.disabled,
             "multiple": props.multiple,
             "suffixIcon": Grid,
             "popperClass": "mk-data-table-select__popper",
             "clearable": true,
             "modelValue": props.multiple ? options : options[0] ?? null
-          }, null);
+          }, null)]), [[resolveDirective("loading"), dataLoading]]);
         }
       })]);
     };
@@ -3644,7 +3649,6 @@ const DataSelect = /* @__PURE__ */ defineComponent({
             group.addCondition(fieldName, "like", `%${value}%`);
           }
         });
-        props.dataTable.dataFilter;
         await props.dataTable.load();
         return;
       }
@@ -3765,7 +3769,7 @@ const index$5 = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.definePrope
   default: MKCodeEditor
 }, Symbol.toStringTag, { value: "Module" }));
 const MKJsonEditor = withInstall(
-  defineAsyncComponent(() => import("./Editor-DOawxd-8.js"))
+  defineAsyncComponent(() => import("./Editor-DMU6Iped.js"))
 );
 const index$4 = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
   __proto__: null,
@@ -6537,7 +6541,7 @@ const _sfc_main$P = /* @__PURE__ */ defineComponent({
           createVNode(_component_el_page_header, {
             class: "bg-[#fff] p-[10px]",
             icon: null
-          }, {
+          }, createSlots({
             title: withCtx(() => [
               createElementVNode("div", _hoisted_2$t, [
                 renderSlot(_ctx.$slots, "back"),
@@ -6559,8 +6563,16 @@ const _sfc_main$P = /* @__PURE__ */ defineComponent({
             extra: withCtx(() => [
               renderSlot(_ctx.$slots, "extra")
             ]),
-            _: 3
-          })
+            _: 2
+          }, [
+            _ctx.$slots["header-content"] ? {
+              name: "default",
+              fn: withCtx(() => [
+                renderSlot(_ctx.$slots, "header-content")
+              ]),
+              key: "0"
+            } : void 0
+          ]), 1024)
         ]),
         renderSlot(_ctx.$slots, "body", {}, () => [
           createElementVNode("div", _hoisted_4$j, [
@@ -6851,9 +6863,9 @@ const useQueryParams = (dataTable) => {
               const query2 = {};
               if (pagination) {
                 Object.assign(query2, {
-                  ...route.query,
-                  currentPage: pagination.currentPage,
-                  pageSize: pagination.pageSize
+                  ...route.query
+                  // currentPage: pagination.currentPage,
+                  // pageSize: pagination.pageSize,
                 });
               }
               const hasParams = Reflect.ownKeys(params).filter(
@@ -7442,7 +7454,6 @@ const _sfc_main$N = /* @__PURE__ */ defineComponent({
   props: dataTableProps,
   setup(__props) {
     const props = __props;
-    useRouter();
     const dataTableEl = ref(null);
     const dataTable = computed(() => {
       if (props.dataTable instanceof DataTable$1) {
@@ -7532,7 +7543,7 @@ const _sfc_main$N = /* @__PURE__ */ defineComponent({
     };
   }
 });
-const DataTable = /* @__PURE__ */ _export_sfc(_sfc_main$N, [["__scopeId", "data-v-fa875463"]]);
+const DataTable = /* @__PURE__ */ _export_sfc(_sfc_main$N, [["__scopeId", "data-v-5865c4ac"]]);
 const tableTreeProps = buildProps({
   dataTree: {
     type: DataTree
@@ -8859,13 +8870,14 @@ const ImageEditPanelComponent = /* @__PURE__ */ defineComponent({
         }
       });
       let panel = createVNode(ElTabs, {
-        "style": "min-height: 520px",
+        "class": "h-full",
         "modelValue": activeTabName.value,
         "onUpdate:modelValue": ($event) => activeTabName.value = $event
       }, {
         default: () => [createVNode(ElTabPane, {
           "label": "本地选择",
-          "name": "l"
+          "name": "l",
+          "class": "h-full overflow-y-auto"
         }, {
           default: () => [createVNode(ElButton, {
             "icon": UploadFilled,
@@ -8877,12 +8889,13 @@ const ImageEditPanelComponent = /* @__PURE__ */ defineComponent({
           }), ImageView]
         }), createVNode(ElTabPane, {
           "label": "素材库选择",
-          "name": "m"
+          "name": "m",
+          "class": "h-full"
         }, {
           default: () => [unref(materialPanelVisible) ? createVNode(MKAsyncComponentView, null, {
             default: () => [createVNode(MKMaterialList, {
               "style": {
-                height: "520px"
+                height: "100%"
               },
               "selectable": true,
               "onSelect": handleMaterialSelect,
@@ -8891,7 +8904,8 @@ const ImageEditPanelComponent = /* @__PURE__ */ defineComponent({
           }) : null]
         }), createVNode(ElTabPane, {
           "label": "网络图片",
-          "name": "n"
+          "name": "n",
+          "class": "h-full overflow-y-auto"
         }, {
           default: () => [createVNode(ElInput, {
             "modelValue": attrs.src,
@@ -8904,7 +8918,8 @@ const ImageEditPanelComponent = /* @__PURE__ */ defineComponent({
       });
       if (selectState.value == "attrs") {
         panel = createVNode(ElRow, {
-          "gutter": 20
+          "gutter": 20,
+          "class": "h-full overflow-y-auto"
         }, {
           default: () => [createVNode(ElCol, {
             "span": 14
@@ -12013,7 +12028,7 @@ const markdownEditorProps = buildProps({
 const markdownEditorEmits = {
   "update:model-value": (modelValue) => true
 };
-const _MarkdownEditor = defineAsyncComponent(() => import("./Editor-BFuTvPav.js"));
+const _MarkdownEditor = defineAsyncComponent(() => import("./Editor-Bhig_S4J.js"));
 const MKMarkdownEditor = withInstall(_MarkdownEditor);
 const _hoisted_1$s = { class: "mk-rich-text-toolbar" };
 const _hoisted_2$n = { class: "mk-rich-text-editor__stage_warp" };
@@ -12109,28 +12124,32 @@ const Dialogs = /* @__PURE__ */ defineComponent({
     };
     return () => {
       const dialogs = unref(dialogInstances).map((dialogInstance) => {
-        var _a2;
-        return createVNode(ElDialog, {
-          "class": dialogInstance.class,
-          "width": dialogInstance.width,
-          "modelValue": dialogInstance.visible,
-          "onUpdate:model-value": (visible) => dialogInstance.visible = visible,
-          "onClose": () => handleClose(dialogInstance),
-          "title": isFunction(dialogInstance.header) ? (_a2 = dialogInstance.header) == null ? void 0 : _a2.call(dialogInstance) : dialogInstance.title || ""
-        }, {
-          default: () => dialogInstance.body(),
-          footer: () => {
-            var _a3;
-            return isFunction(dialogInstance.footer) ? (_a3 = dialogInstance.footer) == null ? void 0 : _a3.call(dialogInstance) : createVNode(Fragment, null, [createVNode(ElButton, {
-              "onClick": () => handleCancel(dialogInstance)
-            }, {
-              default: () => [dialogInstance.cancelButtonText ?? "取消"]
-            }), createVNode(ElButton, {
-              "type": "primary",
-              "onClick": () => handleConfirm(dialogInstance)
+        return createVNode(MKConfigProvider, null, {
+          default: () => {
+            var _a2;
+            return [createVNode(ElDialog, {
+              "class": dialogInstance.class,
+              "width": dialogInstance.width,
+              "modelValue": dialogInstance.visible,
+              "onUpdate:model-value": (visible) => dialogInstance.visible = visible,
+              "onClose": () => handleClose(dialogInstance),
+              "title": isFunction(dialogInstance.header) ? (_a2 = dialogInstance.header) == null ? void 0 : _a2.call(dialogInstance) : dialogInstance.title || ""
             }, {
-              default: () => [dialogInstance.confirmButtonText ?? "确认"]
-            })]);
+              default: () => dialogInstance.body(),
+              footer: () => {
+                var _a3;
+                return isFunction(dialogInstance.footer) ? (_a3 = dialogInstance.footer) == null ? void 0 : _a3.call(dialogInstance) : createVNode(Fragment, null, [createVNode(ElButton, {
+                  "onClick": () => handleCancel(dialogInstance)
+                }, {
+                  default: () => [dialogInstance.cancelButtonText ?? "取消"]
+                }), createVNode(ElButton, {
+                  "type": "primary",
+                  "onClick": () => handleConfirm(dialogInstance)
+                }, {
+                  default: () => [dialogInstance.confirmButtonText ?? "确认"]
+                })]);
+              }
+            })];
           }
         });
       });
@@ -15384,13 +15403,15 @@ const _MsMenuTree = class _MsMenuTree extends (_F = DataTree, _E = DATA_MODEL_NA
         }) => {
           const allowBindRoute = row.data.type === MenuType.Menu && row.data.urlType == MenuUrlType.Inner;
           const loading = ref(false);
-          return allowBindRoute ? createVNode("div", null, [row.data.routeTitle, createVNode(MKText, {
+          return allowBindRoute ? createVNode("div", {
+            "class": "flex items-center"
+          }, [row.data.routeTitle, row.data.targetUrl ? createVNode(MKText, {
             "copy": true
           }, {
             default: () => [createVNode("span", {
               "class": "color-[#4090ee]  font-[14px] mx-1"
             }, [row.data.targetUrl])]
-          }), createVNode(ElPopover, {
+          }) : null, createVNode(ElPopover, {
             "placement": "right",
             "width": "400",
             "trigger": "click"
@@ -16965,11 +16986,7 @@ class DepartmentTable extends DataTable$1 {
 }
 class DepartmentTree extends DataTree {
   constructor(options = {}) {
-    super({
-      name: "ms-dept",
-      ...options,
-      props: { label: "name", ...options.props }
-    });
+    super({ name: "ms-dept", ...options, props: { label: "name", ...options.props } });
   }
   async loadRequest(params) {
     const response = await super.loadRequest(params);
@@ -17697,41 +17714,41 @@ class MSAppClient {
     this.pageManager.addExtendsPage({
       name: "dv/ms-material/list",
       path: "/sys/materials",
-      component: () => import("./index-Cysh8rM8.js"),
+      component: () => import("./index-Bm_WLjtq.js"),
       meta: { name: "ms-material" }
     });
     this.pageManager.addExtendsPage({
       name: "dv/ms-role/single/list/dialog",
       path: "/sys/roles",
-      component: () => import("./index-CEdBWrqr.js"),
+      component: () => import("./index-CaT1yBkN.js"),
       meta: { name: "ms-role" }
     });
     this.pageManager.addExtendsPage({
       name: "dv/ms-role/permission",
       path: "/sys/roles/:id/permission",
-      component: () => import("./PermissionManage-B27OtbZ4.js")
+      component: () => import("./PermissionManage-D8GnoFjV.js")
     });
     this.pageManager.addExtendsPage({
       name: "dv/local-log/single/tree/dialog",
       path: "/log/local",
-      component: () => import("./index-Dx45vSXF.js"),
+      component: () => import("./index-BR74s8xj.js"),
       meta: { name: "local-log" }
     });
     this.pageManager.addExtendsPage({
       name: "dv/ms-menu/list",
       path: "/sys/menus",
-      component: () => import("./index-CkxCpEYV.js"),
+      component: () => import("./index-BO9igopw.js"),
       meta: { name: "ms-menu" }
     });
     this.pageManager.addExtendsPage({
       name: "icons/list",
       path: "/sys/icons",
-      component: () => import("./index-Bp-zi0tQ.js")
+      component: () => import("./index-D5tBMykg.js")
     });
     this.pageManager.addExtendsPage({
       name: "dv/ms-todo/single/list/dialog",
       path: "/dv/todo",
-      component: () => import("./index-IwN_2M4P.js")
+      component: () => import("./index-DBYf3N_H.js")
     });
     for (let internalModule of internalModules) {
       for (let item of internalModule.normalPages) {
@@ -17923,6 +17940,7 @@ class DialogerImpl extends SkeletonDialoger {
       const dialogInstance = this.customRender({
         class: "mk-data-table-select-dialog",
         width: "80%",
+        title: dataTable.title ?? "选择",
         body: () => {
           return createVNode("div", {
             "class": "mk-data-table-select-dialog__main"
@@ -21178,11 +21196,13 @@ const _hoisted_3 = { class: "main-container" };
 const _hoisted_4 = { class: "main" };
 const _hoisted_5 = { class: "main-content" };
 const _sfc_main = /* @__PURE__ */ defineComponent({
-  ...{
-    name: "Layout"
-  },
+  ...{ name: "Layout" },
   __name: "index",
   setup(__props) {
+    const pageErrorInfo = ref("");
+    onErrorCaptured((err, instance, info) => {
+      pageErrorInfo.value = info == "setup function" ? err.message : "";
+    });
     const routeInfo = useRoute();
     const settingsStore = useSettingsStore();
     const keepAliveStore = useKeepAliveStore();
@@ -21205,6 +21225,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     watch(
       () => routeInfo.path,
       () => {
+        pageErrorInfo.value = "";
         if (settingsStore.mode === "mobile") {
           settingsStore.$patch((state) => {
             state.settings.menu.subMenuCollapse = true;
@@ -21253,8 +21274,8 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
       return `${actualWidth}px`;
     });
     return (_ctx, _cache) => {
+      const _component_el_result = resolveComponent("el-result");
       const _component_RouterView = resolveComponent("RouterView");
-      resolveComponent("MKSvgIcon");
       return openBlock(), createBlock(unref(SystemProvider), null, {
         default: withCtx(() => [
           createElementVNode("div", {
@@ -21292,7 +21313,12 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
                               (openBlock(), createBlock(KeepAlive, {
                                 include: unref(keepAliveStore).list
                               }, [
-                                !unref(isLink) ? (openBlock(), createBlock(unref(MKAsyncComponentView), {
+                                unref(pageErrorInfo) ? (openBlock(), createBlock(_component_el_result, {
+                                  key: 0,
+                                  icon: "error",
+                                  title: "系统提示",
+                                  "sub-title": unref(pageErrorInfo)
+                                }, null, 8, ["sub-title"])) : !unref(isLink) ? (openBlock(), createBlock(unref(MKAsyncComponentView), {
                                   component: Component,
                                   key: route.fullPath
                                 }, null, 8, ["component"])) : createCommentVNode("", true)
@@ -21321,7 +21347,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     };
   }
 });
-const Layout$1 = /* @__PURE__ */ _export_sfc(_sfc_main, [["__scopeId", "data-v-dad334ee"]]);
+const Layout$1 = /* @__PURE__ */ _export_sfc(_sfc_main, [["__scopeId", "data-v-7f84212b"]]);
 const Layout = /* @__PURE__ */ defineComponent({
   name: "MKLayout",
   setup() {
@@ -21772,4 +21798,4 @@ export {
   MsRouteTable as y,
   useSingleView as z
 };
-//# sourceMappingURL=index-Dum31xvp.js.map
+//# sourceMappingURL=index-B5WnSJ0l.js.map