@maketribe/ms-app 4.0.5 → 4.0.6

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

@@ -3,7 +3,7 @@ var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { en
 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, 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 { 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, ImportButton, 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";
 import { useRoute, useRouter, createRouter, createWebHashHistory } from "vue-router";
@@ -153,84 +153,84 @@ class DataTableComponents extends Components {
       name: "MKColumnAction",
       title: "操作",
       component: defineAsyncComponent(
-        async () => import("./index-BibfPxyE.js")
+        async () => import("./index-BPHeG3XF.js")
       )
     });
     this.registerComponent({
       name: "MKColumnText",
       title: "文本",
       component: defineAsyncComponent(
-        async () => import("./index-pCgDKrHr.js")
+        async () => import("./index-DKM93Gqy.js")
       )
     });
     this.registerComponent({
       name: "MKColumnObjectMappingText",
       title: "对象映射文本",
       component: defineAsyncComponent(
-        async () => import("./index-CkrS77t9.js")
+        async () => import("./index-CTRi5PvY.js")
       )
     });
     this.registerComponent({
       name: "MKColumnImage",
       title: "图片",
       component: defineAsyncComponent(
-        async () => import("./index-CYqfkhll.js")
+        async () => import("./index-DPCvaFTh.js")
       )
     });
     this.registerComponent({
       name: "MKColumnSelect",
       title: "行选择",
       component: defineAsyncComponent(
-        async () => import("./index-6pAFW8Vh.js")
+        async () => import("./index-h6daMFWn.js")
       )
     });
     this.registerComponent({
       name: "MKColumnJson",
       title: "JSON",
       component: defineAsyncComponent(
-        async () => import("./index-CrnR0ENO.js")
+        async () => import("./index-CYKlok3_.js")
       )
     });
     this.registerComponent({
       name: "MKColumnDate",
       title: "日期时间",
       component: defineAsyncComponent(
-        async () => import("./index-D30VkiUw.js")
+        async () => import("./index-WLxyw7O5.js")
       )
     });
     this.registerComponent({
       name: "MKColumnSwitch",
       title: "开关",
       component: defineAsyncComponent(
-        async () => import("./index-DQ858uj-.js")
+        async () => import("./index-CJTWPJFm.js")
       )
     });
     this.registerComponent({
       name: "MKColumnTag",
       title: "标签",
       component: defineAsyncComponent(
-        async () => import("./index-CbofgtMb.js")
+        async () => import("./index-CbdFDg__.js")
       )
     });
     this.registerComponent({
       name: "MKColumnLink",
       title: "链接",
       component: defineAsyncComponent(
-        async () => import("./index-Dx_DWZka.js")
+        async () => import("./index-2pFwysqm.js")
       )
     });
     this.registerComponent({
       name: "MKColumnSort",
       title: "拖拽排序",
       component: defineAsyncComponent(
-        async () => import("./index-CH7WN-BC.js")
+        async () => import("./index-F12LkWIv.js")
       )
     });
     this.registerComponent({
       name: "MKColumnIcon",
       title: "图标",
       component: defineAsyncComponent(
-        async () => import("./index-WAZn782k.js")
+        async () => import("./index-ByIRfhQI.js")
       )
     });
   }
@@ -256,14 +256,14 @@ class DataTableHeaderComponents extends Components {
       name: "MKBatchOpt",
       title: "批量操作",
       component: defineAsyncComponent(
-        async () => import("./index-D8AhTxEQ.js")
+        async () => import("./index-B8aL3Kue.js")
       )
     });
     this.registerComponent({
       name: "MKTableFilter",
       title: "筛选",
       component: defineAsyncComponent(
-        async () => import("./index-DdH6OCKp.js")
+        async () => import("./index-CwjQligT.js")
       )
     });
   }
@@ -341,7 +341,7 @@ class DataFormComponents extends Components {
       name: "MKFormDetail",
       title: "明细",
       component: defineAsyncComponent(
-        () => import("./index-ZmRbK5N3.js")
+        () => import("./index-CVaZhbrt.js")
       )
     });
     this.registerComponent({
@@ -362,14 +362,14 @@ class DataFormComponents extends Components {
       name: "MKDataTreeSelect",
       title: "树选择器",
       component: defineAsyncComponent(
-        () => import("./index-CGBy2JBa.js")
+        () => import("./index-ZQ5HXYu-.js")
       )
     });
     this.registerComponent({
       name: "MKResourceSelectInput",
       title: "资源选择输入框",
       component: defineAsyncComponent(
-        () => import("./ResourceSelectInput-_DpkQhgI.js")
+        () => import("./ResourceSelectInput-CjXsiqiz.js")
       )
     });
     this.registerComponent({
@@ -405,7 +405,7 @@ class DataFilterComponents extends Components {
       title: "下拉框",
       defaultOperator: Operator.IN,
       component: defineAsyncComponent(
-        () => import("./index-BL1Thi0L.js")
+        () => import("./index-B8-Y4w0f.js")
       )
     });
     this.registerComponent({
@@ -413,7 +413,7 @@ class DataFilterComponents extends Components {
       title: "树形下拉框",
       defaultOperator: Operator.IN,
       component: defineAsyncComponent(
-        () => import("./index-CGBy2JBa.js")
+        () => import("./index-ZQ5HXYu-.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-CPxIocMG.js"),
+                      component: () => import("./normal-BvjBOII6.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-DTdQYzsb.js"),
+                      component: () => import("./dialog-CQI0i1d0.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-CrY554IQ.js"),
+                      component: () => import("./dialog-B04NdHgr.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-CXKCj4dG.js"),
+                      component: () => import("./dialog-bsXsyUsQ.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-GrSzV1bh.js"),
+                      component: () => import("./normal-DBiWp2b-.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-D7IlWlB-.js"),
+              component: () => import("./table-DLLgRjrD.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-CnW1vav_.js"),
+              component: () => import("./edit-CPwZ59Jr.js"),
               meta
             });
             break;
@@ -1846,7 +1846,7 @@ class PageManager {
     this.addNormalPage({
       name: "mk-ms-layout",
       path: "/",
-      component: () => import("./index-BMsQ9MZO.js")
+      component: () => import("./index-C2Va1j4N.js")
     });
     this.addNormalPage({
       name: "login",
@@ -1854,7 +1854,7 @@ class PageManager {
       meta: {
         isAuthorization: false
       },
-      component: () => import("./index-Cys5Stbp.js")
+      component: () => import("./index-Dio8D0Tq.js")
     });
     this.addNormalPage({
       name: "signup",
@@ -1862,7 +1862,7 @@ class PageManager {
       meta: {
         isAuthorization: false
       },
-      component: () => import("./index-SdxgZQLS.js")
+      component: () => import("./index-CemgHtIt.js")
     });
     this.afterInitdEvent.emit();
     this.msAppClientChangeEvent.on(({ msAppClient }) => {
@@ -1914,7 +1914,7 @@ class PageManager {
               this.addExtendsPage({
                 name: "notFound",
                 path: "/:pathMatch(.*)*",
-                component: () => import("./404-D3_BuVvI.js")
+                component: () => import("./404-BCUj5YUa.js")
               });
             }
             userSession.register(
@@ -3268,7 +3268,7 @@ const AbstractSelect = defineComponent({
     );
     const getSelectDataOptions = async () => {
       const selections2 = unref(innerSelections);
-      const recordIds = Array.isArray(innerSelections) ? selections2 : selections2 ? [selections2] : [];
+      const recordIds = Array.isArray(selections2) ? selections2 : selections2 ? [selections2] : [];
       if (props.dataTable) {
         const dataTable = props.dataTable;
         let existingRecords = unref(options).filter((option) => recordIds.includes(option.value)).map((item) => item.data);
@@ -3276,19 +3276,23 @@ const AbstractSelect = defineComponent({
           const notExistingRecords = recordIds.filter(
             (id) => !existingRecords.find((item) => item[primaryKey.value] === id)
           );
+          let where = void 0;
           const loadParams = {};
-          if (props.queryMode == "condition") {
-            dataTable.useCondition((where) => {
+          if (notExistingRecords.length > 0) {
+            if (props.queryMode == "condition") {
+              where = new 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];
+            } else {
+              loadParams[primaryKey.value] = props.multiple ? notExistingRecords : notExistingRecords[0];
+            }
           }
-          const response = await dataTable.loadRequest(loadParams);
+          const response = await dataTable.dataViewRequest.allList({
+            data: { condition: where, ...loadParams }
+          });
           if (response.data.code === 200) {
             existingRecords = [...existingRecords, ...response.data.data];
           }
@@ -3300,15 +3304,19 @@ const AbstractSelect = defineComponent({
       return [];
     };
     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;
+      try {
+        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;
+          }
         }
+      } catch (error) {
+        console.error(error);
       }
     }, { immediate: true });
     const setSelections = (v) => {
@@ -3638,11 +3646,10 @@ const DataSelect = /* @__PURE__ */ defineComponent({
     }, {
       immediate: true
     });
+    let beforeFilterValue = "";
     const filterMethod = debounce(async (value) => {
-      if (props.dataTable) {
-        if (!props.filterFieldNames.length) {
-          return null;
-        }
+      if (props.dataTable && props.filterFieldNames.length && beforeFilterValue !== value) {
+        beforeFilterValue = value;
         props.dataTable.useCondition((group) => {
           group.clear();
           for (let fieldName of props.filterFieldNames) {
@@ -3650,7 +3657,6 @@ const DataSelect = /* @__PURE__ */ defineComponent({
           }
         });
         await props.dataTable.load();
-        return;
       }
     }, 500);
     return () => {
@@ -3769,7 +3775,7 @@ const index$5 = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.definePrope
   default: MKCodeEditor
 }, Symbol.toStringTag, { value: "Module" }));
 const MKJsonEditor = withInstall(
-  defineAsyncComponent(() => import("./Editor-DMU6Iped.js"))
+  defineAsyncComponent(() => import("./Editor-NFfLaHhM.js"))
 );
 const index$4 = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
   __proto__: null,
@@ -12028,7 +12034,7 @@ const markdownEditorProps = buildProps({
 const markdownEditorEmits = {
   "update:model-value": (modelValue) => true
 };
-const _MarkdownEditor = defineAsyncComponent(() => import("./Editor-Bhig_S4J.js"));
+const _MarkdownEditor = defineAsyncComponent(() => import("./Editor-BhorMhPb.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" };
@@ -16093,7 +16099,7 @@ const _MsMemberForm = class _MsMemberForm extends (_J = DataForm$1, _I = DATA_MO
           multiple: true,
           objectValue: true,
           labelFieldName: "desc",
-          // filterable: true,
+          filterable: false,
           filterFieldNames: ["desc", "name"],
           dataTable: new MsRoleTable()
         }
@@ -16214,7 +16220,7 @@ const _MsMemberTable = class _MsMemberTable extends (_L = DataTable$1, _K = DATA
     await super.initialize();
     await this.initActiveMemberForm();
     const isSuperAdmin = ((_c2 = (_b2 = (_a2 = MSAppClient.instance) == null ? void 0 : _a2.userSession) == null ? void 0 : _b2.userInfo) == null ? void 0 : _c2.isSuper) ?? false;
-    this.header.rightArea = [new RefreshButton(), new AddButton(), new TableHeaderItem$1({
+    this.header.rightArea = [new RefreshButton(), new AddButton(), new ImportButton(), new TableHeaderItem$1({
       componentInfo: "MKBatchOpt",
       predicate: () => isSuperAdmin
     })];
@@ -17714,41 +17720,41 @@ class MSAppClient {
     this.pageManager.addExtendsPage({
       name: "dv/ms-material/list",
       path: "/sys/materials",
-      component: () => import("./index-Bm_WLjtq.js"),
+      component: () => import("./index-D-BesRUH.js"),
       meta: { name: "ms-material" }
     });
     this.pageManager.addExtendsPage({
       name: "dv/ms-role/single/list/dialog",
       path: "/sys/roles",
-      component: () => import("./index-CaT1yBkN.js"),
+      component: () => import("./index-C85hv5o7.js"),
       meta: { name: "ms-role" }
     });
     this.pageManager.addExtendsPage({
       name: "dv/ms-role/permission",
       path: "/sys/roles/:id/permission",
-      component: () => import("./PermissionManage-D8GnoFjV.js")
+      component: () => import("./PermissionManage-pzSnDe5Q.js")
     });
     this.pageManager.addExtendsPage({
       name: "dv/local-log/single/tree/dialog",
       path: "/log/local",
-      component: () => import("./index-BR74s8xj.js"),
+      component: () => import("./index-CdohVE27.js"),
       meta: { name: "local-log" }
     });
     this.pageManager.addExtendsPage({
       name: "dv/ms-menu/list",
       path: "/sys/menus",
-      component: () => import("./index-BO9igopw.js"),
+      component: () => import("./index-CfdSdEHe.js"),
       meta: { name: "ms-menu" }
     });
     this.pageManager.addExtendsPage({
       name: "icons/list",
       path: "/sys/icons",
-      component: () => import("./index-D5tBMykg.js")
+      component: () => import("./index-CPuuc1dC.js")
     });
     this.pageManager.addExtendsPage({
       name: "dv/ms-todo/single/list/dialog",
       path: "/dv/todo",
-      component: () => import("./index-DBYf3N_H.js")
+      component: () => import("./index-D8WZ9z10.js")
     });
     for (let internalModule of internalModules) {
       for (let item of internalModule.normalPages) {
@@ -21798,4 +21804,4 @@ export {
   MsRouteTable as y,
   useSingleView as z
 };
-//# sourceMappingURL=index-B5WnSJ0l.js.map
+//# sourceMappingURL=index-BX_Mkhla.js.map