@maketribe/ms-app 3.0.11 → 3.0.12

package/dist/style/src/components/data-filter-popover.scss

@@ -2,8 +2,8 @@
   &__footer {
     display: flex;
     justify-content: space-between;
-    border-top: var(--ps-border);
-    padding-top: var(--ps-spacing-middle);
-    margin-top: var(--ps-spacing-large);
+    border-top: var(--mk-border);
+    padding-top: var(--mk-spacing-middle);
+    margin-top: var(--mk-spacing-large);
   }
 }

package/dist/style/src/index.scss

@@ -2,3 +2,12 @@
 @use "./components/index.scss" as *;
 @use "./layouts" as *;
 @use "./page/index.scss" as *;
+
+:root {
+  --mk-spacing-small: 5px;
+  --mk-spacing-middle: 10px;
+  --mk-spacing-large: 15px;
+
+  --mk-border-color: #cccccc;
+  --mk-border: 1px solid var(--mk-border-color);
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@maketribe/ms-app",
-  "version": "3.0.11",
+  "version": "3.0.12",
   "description": "",
   "main": "dist/cjs",
   "files": [
@@ -20,10 +20,10 @@
     "vue": "^3.3.4",
     "vue-codemirror": "^6.1.1",
     "vue-router": "^4.2.4",
-    "@maketribe/dm": "^3.0.7",
-    "@maketribe/utils": "^1.1.2",
-    "@maketribe/request": "^1.1.8",
-    "@maketribe/locale": "^1.0.5"
+    "@maketribe/dm": "^3.0.8",
+    "@maketribe/locale": "^1.0.5",
+    "@maketribe/request": "^1.1.10",
+    "@maketribe/utils": "^1.1.3"
   },
   "scripts": {
     "build": "npm run clean && npm run build:js && npm run build:type && npm run build:style",

package/src/components/material-list/material-group-form-popover.vue

@@ -12,7 +12,9 @@
     </template>
 
     <div>
-      <MKDataForm :data-form="materialGroupForm" v-loading="loading" />
+      <MKDataForm :data-form="materialGroupForm" v-loading="loading">
+        <MKForm :data-form="materialGroupForm" />
+      </MKDataForm>
       <div
         style="
           display: flex;
@@ -36,7 +38,7 @@
 <script setup lang="ts">
 import { Ref, computed, ref, unref } from "vue";
 import { ElMessage } from "element-plus";
-import { MKDataForm } from "../data-model/data-form";
+import { MKDataForm, MKForm } from "../data-model/data-form";
 import { MaterialGroupForm, MaterialMan } from "../../dataview/material";
 
 const props = defineProps({

package/src/components/material-list/material-group.vue

@@ -21,9 +21,8 @@
           :auto-load="false"
           :data-table="materialGroupTree"
           highlight-current
-          @nodeClick="handleNodeClick"
         >
-          <MKTree :data-tree="materialGroupTree">
+          <MKTree :data-tree="materialGroupTree" @nodeClick="handleNodeClick">
             <template #node-tools="{ data }">
               <div class="mk-material-group__tools" @click.stop>
                 <ElTooltip content="添加">
@@ -32,7 +31,9 @@
                       :material-man="materialMan"
                       :material-group-form="materialGroupForm"
                     >
-                      <ElIcon @click="handleAddClick(data)"><Plus /></ElIcon>
+                      <ElIcon @click="handleAddClick(data.data)">
+                        <Plus />
+                      </ElIcon>
                     </MaterialGroupFromPopper>
                   </span>
                 </ElTooltip>
@@ -42,13 +43,17 @@
                       :material-man="materialMan"
                       :material-group-form="materialGroupForm"
                     >
-                      <ElIcon @click="handleEditClick(data)"><Edit /></ElIcon>
+                      <ElIcon @click="handleEditClick(data.data)">
+                        <Edit />
+                      </ElIcon>
                     </MaterialGroupFromPopper>
                   </span>
                 </ElTooltip>
                 <ElTooltip content="删除">
                   <span class="mk-material-group__tools-item">
-                    <ElIcon @click="handleDeleteClick(data)"><Delete /></ElIcon>
+                    <ElIcon @click="handleDeleteClick(data.data)">
+                      <Delete />
+                    </ElIcon>
                   </span>
                 </ElTooltip>
               </div>
@@ -74,6 +79,7 @@ import { MKDataTable, MKTree } from "../data-model/data-table";
 
 import { useI18n } from "../../composables";
 import MaterialGroupFromPopper from "./material-group-form-popover.vue";
+import { DataTreeNode } from "@maketribe/dm";
 
 const props = defineProps({
   materialMan: {
@@ -92,9 +98,9 @@ const materialGroupTree = computed(() => props.materialMan.materialGroupTree);
 
 const loading = computed(() => props.materialMan.materialGroupTree.loading);
 
-const handleNodeClick = (item: MaterialGroupNode) => {
+const handleNodeClick = (item: DataTreeNode<MaterialGroupNode>) => {
   if (!item.children.length) {
-    props.materialMan.setCurrentMaterialGroupId(item);
+    props.materialMan.setCurrentMaterialGroup(item.data);
   }
 };
 

package/src/core/tabs/Tabs.ts

@@ -93,18 +93,23 @@ export class Tabs extends Disposable {
   }
 
   switchTab(tab: Tab | null) {
-    if (!tab) {
-      this.setCurrentTab(null);
-      return;
-    }
+    // TODO 暂时用不到Tab
+    
+    this.setCurrentTab(tab);
+    return;
 
-    let _tab = this._tabs.find((item) => item.getID() === tab.getID());
+    // if (!tab) {
+    //   this.setCurrentTab(null);
+    //   return;
+    // }
 
-    if (!_tab) {
-      this.setTabs([...this.getTabs(), tab]);
-    }
+    // let _tab = this._tabs.find((item) => item.getID() === tab.getID());
 
-    this.setCurrentTab(tab);
+    // if (!_tab) {
+    //   this.setTabs([...this.getTabs(), tab]);
+    // }
+
+    // this.setCurrentTab(tab);
   }
 
   findTabByID(id: Tab["id"]) {

package/src/dataview/material/MaterialMan.ts

@@ -167,7 +167,7 @@ export class MaterialMan {
     );
   }
 
-  setCurrentMaterialGroupId(materialGroup: MaterialGroupNode | null) {
+  setCurrentMaterialGroup(materialGroup: MaterialGroupNode | null) {
     this.materialGroupTree.setCurrentNode(
       materialGroup
         ? this.materialGroupTree.findDataTreeNode(materialGroup)

package/src/dataview/member/MemberTable.tsx

@@ -15,6 +15,7 @@ import { Event } from "@maketribe/utils";
 import { defineDataTable } from "../../define-data-table";
 import { Member, MemberForm, MemberResult } from "./MemberForm";
 import { R } from "@maketribe/request";
+import { MSAppClient } from "../../core";
 
 export type MemberTableItem = Omit<Member, "password" | "confirmPassword">;
 
@@ -95,6 +96,15 @@ export class MemberTable extends DataTable<MemberResult, MemberTableItem> {
       new TableActionColumn({
         width: "200px",
         buttons: [
+          new ActionButton({
+            label: "test",
+            handler: () => {
+              MSAppClient.instance!.vueRouter.push({
+                name: "dv/ms-role/single/list/dialog",
+                query: { id: "8" },
+              });
+            },
+          }),
           new ActionButton({
             label: "激活用户",
             handler: async (row) => {

package/src/dataview/menu/MenuTable.ts

@@ -6,6 +6,7 @@ import {
 } from "@maketribe/dm";
 import { defineDataTable } from "../../define-data-table";
 import type { MenuItem, MenuResult } from "./MenuForm";
+import { DVQueryable } from "@maketribe/request";
 
 export class MenuTable<T extends MenuItem = MenuItem> extends DataTable<
   MenuResult,

package/src/page/index/dv/ms-member/index.vue

@@ -13,6 +13,7 @@
 
 <script setup lang="ts">
 import { computed, reactive, ref } from "vue";
+import { onBeforeRouteLeave } from "vue-router";
 import { ElButton, ElDialog } from "element-plus";
 import { DataModelDefines } from "../../../../core";
 import { MemberTable } from "../../../../dataview";
@@ -35,4 +36,8 @@ memberTable.activeMemberEvent.on(async (member) => {
 const handleActiveMemberConfirm = async () => {
   memberTable.approveMember();
 };
+
+onBeforeRouteLeave(() => {
+  console.log("aaafdsa");
+});
 </script>