@maketribe/ms-app 3.0.37 → 3.0.39

package/dist/cjs/core/UserInfo.d.ts

@@ -6,7 +6,7 @@ export interface MemberInfo {
     account: string;
     email: string;
     nickName: string;
-    avatarPath: string;
+    avatar: string;
     isSuper: string;
     errorCount: string;
     errorDatetime: string;

package/dist/cjs/core/UserInfo.js

@@ -13,6 +13,7 @@ class UserInfo {
   permissionPoints;
   constructor(msAppClient, payload, roles, permissionPoints) {
     this.id = payload.id;
+    this.avatar = payload.avatar;
     this.account = payload.account;
     this.email = payload.email;
     this.nickName = payload.nickName;
@@ -21,7 +22,7 @@ class UserInfo {
     this.roles = roles;
     this.permissionPoints = permissionPoints;
     try {
-      this.avatar = payload.avatarPath ? new URL(payload.avatarPath, msAppClient.origin).toString() : "";
+      this.avatar = payload.avatar ? payload.avatar.startsWith("http") ? payload.avatar : new URL(payload.avatar, msAppClient.origin).toString() : "";
     } catch (e) {
       this.avatar = "";
     }

package/dist/cjs/core/UserInfo.js.map

@@ -1 +1 @@
-{"version":3,"file":"UserInfo.js","sources":["../../../src/core/UserInfo.ts"],"sourcesContent":["import type { MSAppClient } from \"./MSAppClient\";\r\nimport { PermissionPoint } from \"./PermissionPointManager\";\r\nimport { Role } from \"../dataview/role/RoleForm\";\r\n\r\nexport interface MemberInfo {\r\n  id: number;\r\n  account: string;\r\n  email: string;\r\n  nickName: string;\r\n  avatarPath: string;\r\n  isSuper: string;\r\n  errorCount: string;\r\n  errorDatetime: string;\r\n  isLock: string;\r\n  unlockDatetime: string;\r\n}\r\n\r\nexport class UserInfo {\r\n  id: number;\r\n  account: string;\r\n  email: string;\r\n  nickName: string;\r\n  avatar: string;\r\n  isLocked: boolean;\r\n  isSuper: boolean;\r\n  payload: any;\r\n\r\n  roles: Role[];\r\n  permissionPoints: PermissionPoint[];\r\n\r\n  constructor(\r\n    msAppClient: MSAppClient,\r\n    payload: MemberInfo,\r\n    roles: Role[],\r\n    permissionPoints: PermissionPoint[]\r\n  ) {\r\n    this.id = payload.id;\r\n    this.account = payload.account;\r\n    this.email = payload.email;\r\n    this.nickName = payload.nickName;\r\n    this.isLocked = payload.isLock === \"1\";\r\n    this.isSuper = payload.isSuper === \"1\";\r\n    this.roles = roles;\r\n    this.permissionPoints = permissionPoints;\r\n\r\n    try {\r\n      this.avatar = payload.avatarPath\r\n        ? new URL(payload.avatarPath, msAppClient.origin).toString()\r\n        : \"\";\r\n    } catch (e) {\r\n      this.avatar = \"\";\r\n    }\r\n\r\n    this.payload = payload;\r\n  }\r\n\r\n  hasRole(name: Role[\"name\"]): boolean {\r\n    return !!this.roles.find((role) => role.name === name);\r\n  }\r\n\r\n  hasPermissionPoint(key: PermissionPoint[\"key\"]) {\r\n    return !!this.permissionPoints.find(\r\n      (permissionPoint) => permissionPoint.key === key\r\n    );\r\n  }\r\n}\r\n"],"names":[],"mappings":";;AAiBO,MAAM,QAAS,CAAA;AAAA,EACpB,EAAA,CAAA;AAAA,EACA,OAAA,CAAA;AAAA,EACA,KAAA,CAAA;AAAA,EACA,QAAA,CAAA;AAAA,EACA,MAAA,CAAA;AAAA,EACA,QAAA,CAAA;AAAA,EACA,OAAA,CAAA;AAAA,EACA,OAAA,CAAA;AAAA,EAEA,KAAA,CAAA;AAAA,EACA,gBAAA,CAAA;AAAA,EAEA,WACE,CAAA,WAAA,EACA,OACA,EAAA,KAAA,EACA,gBACA,EAAA;AACA,IAAA,IAAA,CAAK,KAAK,OAAQ,CAAA,EAAA,CAAA;AAClB,IAAA,IAAA,CAAK,UAAU,OAAQ,CAAA,OAAA,CAAA;AACvB,IAAA,IAAA,CAAK,QAAQ,OAAQ,CAAA,KAAA,CAAA;AACrB,IAAA,IAAA,CAAK,WAAW,OAAQ,CAAA,QAAA,CAAA;AACxB,IAAK,IAAA,CAAA,QAAA,GAAW,QAAQ,MAAW,KAAA,GAAA,CAAA;AACnC,IAAK,IAAA,CAAA,OAAA,GAAU,QAAQ,OAAY,KAAA,GAAA,CAAA;AACnC,IAAA,IAAA,CAAK,KAAQ,GAAA,KAAA,CAAA;AACb,IAAA,IAAA,CAAK,gBAAmB,GAAA,gBAAA,CAAA;AAExB,IAAI,IAAA;AACF,MAAK,IAAA,CAAA,MAAA,GAAS,OAAQ,CAAA,UAAA,GAClB,IAAI,GAAA,CAAI,OAAQ,CAAA,UAAA,EAAY,WAAY,CAAA,MAAM,CAAE,CAAA,QAAA,EAChD,GAAA,EAAA,CAAA;AAAA,aACG,CAAG,EAAA;AACV,MAAA,IAAA,CAAK,MAAS,GAAA,EAAA,CAAA;AAAA,KAChB;AAEA,IAAA,IAAA,CAAK,OAAU,GAAA,OAAA,CAAA;AAAA,GACjB;AAAA,EAEA,QAAQ,IAA6B,EAAA;AACnC,IAAO,OAAA,CAAC,CAAC,IAAK,CAAA,KAAA,CAAM,KAAK,CAAC,IAAA,KAAS,IAAK,CAAA,IAAA,KAAS,IAAI,CAAA,CAAA;AAAA,GACvD;AAAA,EAEA,mBAAmB,GAA6B,EAAA;AAC9C,IAAO,OAAA,CAAC,CAAC,IAAA,CAAK,gBAAiB,CAAA,IAAA;AAAA,MAC7B,CAAC,eAAoB,KAAA,eAAA,CAAgB,GAAQ,KAAA,GAAA;AAAA,KAC/C,CAAA;AAAA,GACF;AACF;;;;"}
+{"version":3,"file":"UserInfo.js","sources":["../../../src/core/UserInfo.ts"],"sourcesContent":["import type { MSAppClient } from \"./MSAppClient\";\r\nimport { PermissionPoint } from \"./PermissionPointManager\";\r\nimport { Role } from \"../dataview/role/RoleForm\";\r\n\r\nexport interface MemberInfo {\r\n  id: number;\r\n  account: string;\r\n  email: string;\r\n  nickName: string;\r\n  avatar: string;\r\n  isSuper: string;\r\n  errorCount: string;\r\n  errorDatetime: string;\r\n  isLock: string;\r\n  unlockDatetime: string;\r\n}\r\n\r\nexport class UserInfo {\r\n  id: number;\r\n  account: string;\r\n  email: string;\r\n  nickName: string;\r\n  avatar: string;\r\n  isLocked: boolean;\r\n  isSuper: boolean;\r\n  payload: any;\r\n\r\n  roles: Role[];\r\n  permissionPoints: PermissionPoint[];\r\n\r\n  constructor(\r\n    msAppClient: MSAppClient,\r\n    payload: MemberInfo,\r\n    roles: Role[],\r\n    permissionPoints: PermissionPoint[]\r\n  ) {\r\n    this.id = payload.id;\r\n    this.avatar = payload.avatar\r\n    this.account = payload.account;\r\n    this.email = payload.email;\r\n    this.nickName = payload.nickName;\r\n    this.isLocked = payload.isLock === \"1\";\r\n    this.isSuper = payload.isSuper === \"1\";\r\n    this.roles = roles;\r\n    this.permissionPoints = permissionPoints;\r\n    try {\r\n      this.avatar = payload.avatar\r\n        ? payload.avatar.startsWith(\"http\") ? payload.avatar : new URL(payload.avatar, msAppClient.origin).toString()\r\n        : \"\";\r\n    } catch (e) {\r\n      this.avatar = \"\";\r\n    }\r\n\r\n    this.payload = payload;\r\n  }\r\n\r\n  hasRole(name: Role[\"name\"]): boolean {\r\n    return !!this.roles.find((role) => role.name === name);\r\n  }\r\n\r\n  hasPermissionPoint(key: PermissionPoint[\"key\"]) {\r\n    return !!this.permissionPoints.find(\r\n      (permissionPoint) => permissionPoint.key === key\r\n    );\r\n  }\r\n}\r\n"],"names":[],"mappings":";;AAiBO,MAAM,QAAS,CAAA;AAAA,EACpB,EAAA,CAAA;AAAA,EACA,OAAA,CAAA;AAAA,EACA,KAAA,CAAA;AAAA,EACA,QAAA,CAAA;AAAA,EACA,MAAA,CAAA;AAAA,EACA,QAAA,CAAA;AAAA,EACA,OAAA,CAAA;AAAA,EACA,OAAA,CAAA;AAAA,EAEA,KAAA,CAAA;AAAA,EACA,gBAAA,CAAA;AAAA,EAEA,WACE,CAAA,WAAA,EACA,OACA,EAAA,KAAA,EACA,gBACA,EAAA;AACA,IAAA,IAAA,CAAK,KAAK,OAAQ,CAAA,EAAA,CAAA;AAClB,IAAA,IAAA,CAAK,SAAS,OAAQ,CAAA,MAAA,CAAA;AACtB,IAAA,IAAA,CAAK,UAAU,OAAQ,CAAA,OAAA,CAAA;AACvB,IAAA,IAAA,CAAK,QAAQ,OAAQ,CAAA,KAAA,CAAA;AACrB,IAAA,IAAA,CAAK,WAAW,OAAQ,CAAA,QAAA,CAAA;AACxB,IAAK,IAAA,CAAA,QAAA,GAAW,QAAQ,MAAW,KAAA,GAAA,CAAA;AACnC,IAAK,IAAA,CAAA,OAAA,GAAU,QAAQ,OAAY,KAAA,GAAA,CAAA;AACnC,IAAA,IAAA,CAAK,KAAQ,GAAA,KAAA,CAAA;AACb,IAAA,IAAA,CAAK,gBAAmB,GAAA,gBAAA,CAAA;AACxB,IAAI,IAAA;AACF,MAAA,IAAA,CAAK,SAAS,OAAQ,CAAA,MAAA,GAClB,QAAQ,MAAO,CAAA,UAAA,CAAW,MAAM,CAAI,GAAA,OAAA,CAAQ,MAAS,GAAA,IAAI,IAAI,OAAQ,CAAA,MAAA,EAAQ,YAAY,MAAM,CAAA,CAAE,UACjG,GAAA,EAAA,CAAA;AAAA,aACG,CAAG,EAAA;AACV,MAAA,IAAA,CAAK,MAAS,GAAA,EAAA,CAAA;AAAA,KAChB;AAEA,IAAA,IAAA,CAAK,OAAU,GAAA,OAAA,CAAA;AAAA,GACjB;AAAA,EAEA,QAAQ,IAA6B,EAAA;AACnC,IAAO,OAAA,CAAC,CAAC,IAAK,CAAA,KAAA,CAAM,KAAK,CAAC,IAAA,KAAS,IAAK,CAAA,IAAA,KAAS,IAAI,CAAA,CAAA;AAAA,GACvD;AAAA,EAEA,mBAAmB,GAA6B,EAAA;AAC9C,IAAO,OAAA,CAAC,CAAC,IAAA,CAAK,gBAAiB,CAAA,IAAA;AAAA,MAC7B,CAAC,eAAoB,KAAA,eAAA,CAAgB,GAAQ,KAAA,GAAA;AAAA,KAC/C,CAAA;AAAA,GACF;AACF;;;;"}

package/dist/cjs/dataview/menu/MenuTable.js

@@ -9,39 +9,6 @@ class MenuTable extends dm.DataTable {
   }
   async initialize() {
     await super.initialize();
-    this.classifySearch.setClassifySearchItems([
-      new dm.ClassifySearchItem({
-        name: "createdAt",
-        label: "\u5B66\u5E74",
-        defaultValue: (/* @__PURE__ */ new Date()).getFullYear() - 0,
-        options: [
-          { value: "", label: "\u5168\u90E8" },
-          { value: (/* @__PURE__ */ new Date()).getFullYear(), label: (/* @__PURE__ */ new Date()).getFullYear() },
-          { value: (/* @__PURE__ */ new Date()).getFullYear() - 1, label: (/* @__PURE__ */ new Date()).getFullYear() - 1 },
-          { value: (/* @__PURE__ */ new Date()).getFullYear() - 2, label: (/* @__PURE__ */ new Date()).getFullYear() - 2 }
-        ]
-      }),
-      new dm.ClassifySearchItem({
-        name: "isAdmit",
-        label: "\u5F55\u53D6\u72B6\u6001\uFF1A",
-        options: [
-          { value: "", label: "\u5168\u90E8" },
-          { value: "0", label: "\u5F85\u5B9A" },
-          { value: "1", label: "\u9884\u5F55\u53D6" },
-          { value: "2", label: "\u5DF2\u5F55\u53D6" }
-        ]
-      }),
-      new dm.ClassifySearchItem({
-        name: "isPass",
-        label: "\u901A\u8FC7\u72B6\u6001",
-        options: [
-          { value: "", label: "\u5168\u90E8" },
-          { value: "0", label: "\u5F85\u5B9A" },
-          { value: "1", label: "\u901A\u8FC7" },
-          { value: "2", label: "\u4E0D\u901A\u8FC7" }
-        ]
-      })
-    ]);
     this.setColumns([
       new dm.TableColumn({ name: "id", label: "\u7F16\u53F7", visible: false }),
       new dm.TableColumn({ name: "title", label: "\u83DC\u5355\u63CF\u8FF0" }),

package/dist/cjs/dataview/menu/MenuTable.js.map

@@ -1 +1 @@
-{"version":3,"file":"MenuTable.js","sources":["../../../../src/dataview/menu/MenuTable.ts"],"sourcesContent":["import {\r\n  DataTable,\r\n  DataTableOptions,\r\n  TableActionColumn,\r\n  TableColumn,\r\n  ClassifySearchItem\r\n} from \"@maketribe/dm\";\r\nimport { defineDataTable } from \"../../define-data-table\";\r\nimport type { MenuItem, MenuResult } from \"./MenuForm\";\r\nimport { DVQueryable } from \"@maketribe/request\";\r\n\r\nexport class MenuTable<T extends MenuItem = MenuItem> extends DataTable<\r\n  MenuResult,\r\n  T\r\n> {\r\n  constructor(options: Omit<DataTableOptions, \"name\"> = {}) {\r\n    super({ name: \"ms-menu\", ...options });\r\n  }\r\n\r\n  protected async initialize() {\r\n    await super.initialize();\r\n    this.classifySearch.setClassifySearchItems([\r\n      new ClassifySearchItem({\r\n        name: \"createdAt\",\r\n        label: \"学年\",\r\n        defaultValue: new Date().getFullYear() - 0,\r\n        options: [\r\n          { value: '', label: \"全部\" },\r\n          { value: new Date().getFullYear(), label: new Date().getFullYear() },\r\n          { value: new Date().getFullYear() - 1, label: new Date().getFullYear() - 1 },\r\n          { value: new Date().getFullYear() - 2, label: new Date().getFullYear() - 2 },\r\n        ],\r\n      }),\r\n      new ClassifySearchItem({\r\n        name: \"isAdmit\",\r\n        label: \"录取状态：\",\r\n        options: [\r\n          { value: '', label: \"全部\" },\r\n          { value: \"0\", label: \"待定\" },\r\n          { value: \"1\", label: \"预录取\" },\r\n          { value: \"2\", label: \"已录取\" },\r\n        ],\r\n      }),\r\n      new ClassifySearchItem({\r\n        name: \"isPass\",\r\n        label: \"通过状态\",\r\n        options: [\r\n          { value: '', label: \"全部\" },\r\n          { value: \"0\", label: \"待定\" },\r\n          { value: \"1\", label: \"通过\" },\r\n          { value: \"2\", label: \"不通过\" },\r\n        ],\r\n      }),\r\n    ]);\r\n    this.setColumns([\r\n      new TableColumn({ name: \"id\", label: \"编号\", visible: false }),\r\n      new TableColumn({ name: \"title\", label: \"菜单描述\" }),\r\n      new TableActionColumn(),\r\n    ]);\r\n  }\r\n\r\n  formatItem(item: MenuResult): T {\r\n    return {\r\n      id: item.id,\r\n      title: item.title || \"\",\r\n      iconName: item.iconName || \"\",\r\n      pid: item.pid || \"\",\r\n      routeId: item.routeId,\r\n    } as T;\r\n  }\r\n}\r\n\r\ndefineDataTable(MenuTable);\r\n"],"names":["DataTable","ClassifySearchItem","TableColumn","TableActionColumn","defineDataTable"],"mappings":"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"}
+{"version":3,"file":"MenuTable.js","sources":["../../../../src/dataview/menu/MenuTable.ts"],"sourcesContent":["import {\r\n  DataTable,\r\n  DataTableOptions,\r\n  TableActionColumn,\r\n  TableColumn,\r\n} from \"@maketribe/dm\";\r\nimport { defineDataTable } from \"../../define-data-table\";\r\nimport type { MenuItem, MenuResult } from \"./MenuForm\";\r\nimport { DVQueryable } from \"@maketribe/request\";\r\n\r\nexport class MenuTable<T extends MenuItem = MenuItem> extends DataTable<\r\n  MenuResult,\r\n  T\r\n> {\r\n  constructor(options: Omit<DataTableOptions, \"name\"> = {}) {\r\n    super({ name: \"ms-menu\", ...options });\r\n  }\r\n\r\n  protected async initialize() {\r\n    await super.initialize();\r\n\r\n    this.setColumns([\r\n      new TableColumn({ name: \"id\", label: \"编号\", visible: false }),\r\n      new TableColumn({ name: \"title\", label: \"菜单描述\" }),\r\n      new TableActionColumn(),\r\n    ]);\r\n  }\r\n\r\n  formatItem(item: MenuResult): T {\r\n    return {\r\n      id: item.id,\r\n      title: item.title || \"\",\r\n      iconName: item.iconName || \"\",\r\n      pid: item.pid || \"\",\r\n      routeId: item.routeId,\r\n    } as T;\r\n  }\r\n}\r\n\r\ndefineDataTable(MenuTable);\r\n"],"names":["DataTable","TableColumn","TableActionColumn","defineDataTable"],"mappings":";;;;;AAUO,MAAM,kBAAiDA,YAG5D,CAAA;AAAA,EACA,WAAA,CAAY,OAA0C,GAAA,EAAI,EAAA;AACxD,IAAA,KAAA,CAAM,EAAE,IAAA,EAAM,SAAW,EAAA,GAAG,SAAS,CAAA,CAAA;AAAA,GACvC;AAAA,EAEA,MAAgB,UAAa,GAAA;AAC3B,IAAA,MAAM,MAAM,UAAW,EAAA,CAAA;AAEvB,IAAA,IAAA,CAAK,UAAW,CAAA;AAAA,MACd,IAAIC,eAAY,EAAE,IAAA,EAAM,MAAM,KAAO,EAAA,cAAA,EAAM,OAAS,EAAA,KAAA,EAAO,CAAA;AAAA,MAC3D,IAAIA,cAAY,CAAA,EAAE,MAAM,OAAS,EAAA,KAAA,EAAO,4BAAQ,CAAA;AAAA,MAChD,IAAIC,oBAAkB,EAAA;AAAA,KACvB,CAAA,CAAA;AAAA,GACH;AAAA,EAEA,WAAW,IAAqB,EAAA;AAC9B,IAAO,OAAA;AAAA,MACL,IAAI,IAAK,CAAA,EAAA;AAAA,MACT,KAAA,EAAO,KAAK,KAAS,IAAA,EAAA;AAAA,MACrB,QAAA,EAAU,KAAK,QAAY,IAAA,EAAA;AAAA,MAC3B,GAAA,EAAK,KAAK,GAAO,IAAA,EAAA;AAAA,MACjB,SAAS,IAAK,CAAA,OAAA;AAAA,KAChB,CAAA;AAAA,GACF;AACF,CAAA;AAEAC,+BAAA,CAAgB,SAAS,CAAA;;;;"}

package/dist/esm/core/UserInfo.d.ts

@@ -6,7 +6,7 @@ export interface MemberInfo {
     account: string;
     email: string;
     nickName: string;
-    avatarPath: string;
+    avatar: string;
     isSuper: string;
     errorCount: string;
     errorDatetime: string;

package/dist/esm/core/UserInfo.js

@@ -11,6 +11,7 @@ class UserInfo {
   permissionPoints;
   constructor(msAppClient, payload, roles, permissionPoints) {
     this.id = payload.id;
+    this.avatar = payload.avatar;
     this.account = payload.account;
     this.email = payload.email;
     this.nickName = payload.nickName;
@@ -19,7 +20,7 @@ class UserInfo {
     this.roles = roles;
     this.permissionPoints = permissionPoints;
     try {
-      this.avatar = payload.avatarPath ? new URL(payload.avatarPath, msAppClient.origin).toString() : "";
+      this.avatar = payload.avatar ? payload.avatar.startsWith("http") ? payload.avatar : new URL(payload.avatar, msAppClient.origin).toString() : "";
     } catch (e) {
       this.avatar = "";
     }

package/dist/esm/core/UserInfo.js.map

@@ -1 +1 @@
-{"version":3,"file":"UserInfo.js","sources":["../../../src/core/UserInfo.ts"],"sourcesContent":["import type { MSAppClient } from \"./MSAppClient\";\r\nimport { PermissionPoint } from \"./PermissionPointManager\";\r\nimport { Role } from \"../dataview/role/RoleForm\";\r\n\r\nexport interface MemberInfo {\r\n  id: number;\r\n  account: string;\r\n  email: string;\r\n  nickName: string;\r\n  avatarPath: string;\r\n  isSuper: string;\r\n  errorCount: string;\r\n  errorDatetime: string;\r\n  isLock: string;\r\n  unlockDatetime: string;\r\n}\r\n\r\nexport class UserInfo {\r\n  id: number;\r\n  account: string;\r\n  email: string;\r\n  nickName: string;\r\n  avatar: string;\r\n  isLocked: boolean;\r\n  isSuper: boolean;\r\n  payload: any;\r\n\r\n  roles: Role[];\r\n  permissionPoints: PermissionPoint[];\r\n\r\n  constructor(\r\n    msAppClient: MSAppClient,\r\n    payload: MemberInfo,\r\n    roles: Role[],\r\n    permissionPoints: PermissionPoint[]\r\n  ) {\r\n    this.id = payload.id;\r\n    this.account = payload.account;\r\n    this.email = payload.email;\r\n    this.nickName = payload.nickName;\r\n    this.isLocked = payload.isLock === \"1\";\r\n    this.isSuper = payload.isSuper === \"1\";\r\n    this.roles = roles;\r\n    this.permissionPoints = permissionPoints;\r\n\r\n    try {\r\n      this.avatar = payload.avatarPath\r\n        ? new URL(payload.avatarPath, msAppClient.origin).toString()\r\n        : \"\";\r\n    } catch (e) {\r\n      this.avatar = \"\";\r\n    }\r\n\r\n    this.payload = payload;\r\n  }\r\n\r\n  hasRole(name: Role[\"name\"]): boolean {\r\n    return !!this.roles.find((role) => role.name === name);\r\n  }\r\n\r\n  hasPermissionPoint(key: PermissionPoint[\"key\"]) {\r\n    return !!this.permissionPoints.find(\r\n      (permissionPoint) => permissionPoint.key === key\r\n    );\r\n  }\r\n}\r\n"],"names":[],"mappings":"AAiBO,MAAM,QAAS,CAAA;AAAA,EACpB,EAAA,CAAA;AAAA,EACA,OAAA,CAAA;AAAA,EACA,KAAA,CAAA;AAAA,EACA,QAAA,CAAA;AAAA,EACA,MAAA,CAAA;AAAA,EACA,QAAA,CAAA;AAAA,EACA,OAAA,CAAA;AAAA,EACA,OAAA,CAAA;AAAA,EAEA,KAAA,CAAA;AAAA,EACA,gBAAA,CAAA;AAAA,EAEA,WACE,CAAA,WAAA,EACA,OACA,EAAA,KAAA,EACA,gBACA,EAAA;AACA,IAAA,IAAA,CAAK,KAAK,OAAQ,CAAA,EAAA,CAAA;AAClB,IAAA,IAAA,CAAK,UAAU,OAAQ,CAAA,OAAA,CAAA;AACvB,IAAA,IAAA,CAAK,QAAQ,OAAQ,CAAA,KAAA,CAAA;AACrB,IAAA,IAAA,CAAK,WAAW,OAAQ,CAAA,QAAA,CAAA;AACxB,IAAK,IAAA,CAAA,QAAA,GAAW,QAAQ,MAAW,KAAA,GAAA,CAAA;AACnC,IAAK,IAAA,CAAA,OAAA,GAAU,QAAQ,OAAY,KAAA,GAAA,CAAA;AACnC,IAAA,IAAA,CAAK,KAAQ,GAAA,KAAA,CAAA;AACb,IAAA,IAAA,CAAK,gBAAmB,GAAA,gBAAA,CAAA;AAExB,IAAI,IAAA;AACF,MAAK,IAAA,CAAA,MAAA,GAAS,OAAQ,CAAA,UAAA,GAClB,IAAI,GAAA,CAAI,OAAQ,CAAA,UAAA,EAAY,WAAY,CAAA,MAAM,CAAE,CAAA,QAAA,EAChD,GAAA,EAAA,CAAA;AAAA,aACG,CAAG,EAAA;AACV,MAAA,IAAA,CAAK,MAAS,GAAA,EAAA,CAAA;AAAA,KAChB;AAEA,IAAA,IAAA,CAAK,OAAU,GAAA,OAAA,CAAA;AAAA,GACjB;AAAA,EAEA,QAAQ,IAA6B,EAAA;AACnC,IAAO,OAAA,CAAC,CAAC,IAAK,CAAA,KAAA,CAAM,KAAK,CAAC,IAAA,KAAS,IAAK,CAAA,IAAA,KAAS,IAAI,CAAA,CAAA;AAAA,GACvD;AAAA,EAEA,mBAAmB,GAA6B,EAAA;AAC9C,IAAO,OAAA,CAAC,CAAC,IAAA,CAAK,gBAAiB,CAAA,IAAA;AAAA,MAC7B,CAAC,eAAoB,KAAA,eAAA,CAAgB,GAAQ,KAAA,GAAA;AAAA,KAC/C,CAAA;AAAA,GACF;AACF;;;;"}
+{"version":3,"file":"UserInfo.js","sources":["../../../src/core/UserInfo.ts"],"sourcesContent":["import type { MSAppClient } from \"./MSAppClient\";\r\nimport { PermissionPoint } from \"./PermissionPointManager\";\r\nimport { Role } from \"../dataview/role/RoleForm\";\r\n\r\nexport interface MemberInfo {\r\n  id: number;\r\n  account: string;\r\n  email: string;\r\n  nickName: string;\r\n  avatar: string;\r\n  isSuper: string;\r\n  errorCount: string;\r\n  errorDatetime: string;\r\n  isLock: string;\r\n  unlockDatetime: string;\r\n}\r\n\r\nexport class UserInfo {\r\n  id: number;\r\n  account: string;\r\n  email: string;\r\n  nickName: string;\r\n  avatar: string;\r\n  isLocked: boolean;\r\n  isSuper: boolean;\r\n  payload: any;\r\n\r\n  roles: Role[];\r\n  permissionPoints: PermissionPoint[];\r\n\r\n  constructor(\r\n    msAppClient: MSAppClient,\r\n    payload: MemberInfo,\r\n    roles: Role[],\r\n    permissionPoints: PermissionPoint[]\r\n  ) {\r\n    this.id = payload.id;\r\n    this.avatar = payload.avatar\r\n    this.account = payload.account;\r\n    this.email = payload.email;\r\n    this.nickName = payload.nickName;\r\n    this.isLocked = payload.isLock === \"1\";\r\n    this.isSuper = payload.isSuper === \"1\";\r\n    this.roles = roles;\r\n    this.permissionPoints = permissionPoints;\r\n    try {\r\n      this.avatar = payload.avatar\r\n        ? payload.avatar.startsWith(\"http\") ? payload.avatar : new URL(payload.avatar, msAppClient.origin).toString()\r\n        : \"\";\r\n    } catch (e) {\r\n      this.avatar = \"\";\r\n    }\r\n\r\n    this.payload = payload;\r\n  }\r\n\r\n  hasRole(name: Role[\"name\"]): boolean {\r\n    return !!this.roles.find((role) => role.name === name);\r\n  }\r\n\r\n  hasPermissionPoint(key: PermissionPoint[\"key\"]) {\r\n    return !!this.permissionPoints.find(\r\n      (permissionPoint) => permissionPoint.key === key\r\n    );\r\n  }\r\n}\r\n"],"names":[],"mappings":"AAiBO,MAAM,QAAS,CAAA;AAAA,EACpB,EAAA,CAAA;AAAA,EACA,OAAA,CAAA;AAAA,EACA,KAAA,CAAA;AAAA,EACA,QAAA,CAAA;AAAA,EACA,MAAA,CAAA;AAAA,EACA,QAAA,CAAA;AAAA,EACA,OAAA,CAAA;AAAA,EACA,OAAA,CAAA;AAAA,EAEA,KAAA,CAAA;AAAA,EACA,gBAAA,CAAA;AAAA,EAEA,WACE,CAAA,WAAA,EACA,OACA,EAAA,KAAA,EACA,gBACA,EAAA;AACA,IAAA,IAAA,CAAK,KAAK,OAAQ,CAAA,EAAA,CAAA;AAClB,IAAA,IAAA,CAAK,SAAS,OAAQ,CAAA,MAAA,CAAA;AACtB,IAAA,IAAA,CAAK,UAAU,OAAQ,CAAA,OAAA,CAAA;AACvB,IAAA,IAAA,CAAK,QAAQ,OAAQ,CAAA,KAAA,CAAA;AACrB,IAAA,IAAA,CAAK,WAAW,OAAQ,CAAA,QAAA,CAAA;AACxB,IAAK,IAAA,CAAA,QAAA,GAAW,QAAQ,MAAW,KAAA,GAAA,CAAA;AACnC,IAAK,IAAA,CAAA,OAAA,GAAU,QAAQ,OAAY,KAAA,GAAA,CAAA;AACnC,IAAA,IAAA,CAAK,KAAQ,GAAA,KAAA,CAAA;AACb,IAAA,IAAA,CAAK,gBAAmB,GAAA,gBAAA,CAAA;AACxB,IAAI,IAAA;AACF,MAAA,IAAA,CAAK,SAAS,OAAQ,CAAA,MAAA,GAClB,QAAQ,MAAO,CAAA,UAAA,CAAW,MAAM,CAAI,GAAA,OAAA,CAAQ,MAAS,GAAA,IAAI,IAAI,OAAQ,CAAA,MAAA,EAAQ,YAAY,MAAM,CAAA,CAAE,UACjG,GAAA,EAAA,CAAA;AAAA,aACG,CAAG,EAAA;AACV,MAAA,IAAA,CAAK,MAAS,GAAA,EAAA,CAAA;AAAA,KAChB;AAEA,IAAA,IAAA,CAAK,OAAU,GAAA,OAAA,CAAA;AAAA,GACjB;AAAA,EAEA,QAAQ,IAA6B,EAAA;AACnC,IAAO,OAAA,CAAC,CAAC,IAAK,CAAA,KAAA,CAAM,KAAK,CAAC,IAAA,KAAS,IAAK,CAAA,IAAA,KAAS,IAAI,CAAA,CAAA;AAAA,GACvD;AAAA,EAEA,mBAAmB,GAA6B,EAAA;AAC9C,IAAO,OAAA,CAAC,CAAC,IAAA,CAAK,gBAAiB,CAAA,IAAA;AAAA,MAC7B,CAAC,eAAoB,KAAA,eAAA,CAAgB,GAAQ,KAAA,GAAA;AAAA,KAC/C,CAAA;AAAA,GACF;AACF;;;;"}

package/dist/esm/dataview/menu/MenuTable.js

@@ -1,4 +1,4 @@
-import { DataTable, ClassifySearchItem, TableColumn, TableActionColumn } from '@maketribe/dm';
+import { DataTable, TableColumn, TableActionColumn } from '@maketribe/dm';
 import { defineDataTable } from '../../define-data-table.js';
 
 class MenuTable extends DataTable {
@@ -7,39 +7,6 @@ class MenuTable extends DataTable {
   }
   async initialize() {
     await super.initialize();
-    this.classifySearch.setClassifySearchItems([
-      new ClassifySearchItem({
-        name: "createdAt",
-        label: "\u5B66\u5E74",
-        defaultValue: (/* @__PURE__ */ new Date()).getFullYear() - 0,
-        options: [
-          { value: "", label: "\u5168\u90E8" },
-          { value: (/* @__PURE__ */ new Date()).getFullYear(), label: (/* @__PURE__ */ new Date()).getFullYear() },
-          { value: (/* @__PURE__ */ new Date()).getFullYear() - 1, label: (/* @__PURE__ */ new Date()).getFullYear() - 1 },
-          { value: (/* @__PURE__ */ new Date()).getFullYear() - 2, label: (/* @__PURE__ */ new Date()).getFullYear() - 2 }
-        ]
-      }),
-      new ClassifySearchItem({
-        name: "isAdmit",
-        label: "\u5F55\u53D6\u72B6\u6001\uFF1A",
-        options: [
-          { value: "", label: "\u5168\u90E8" },
-          { value: "0", label: "\u5F85\u5B9A" },
-          { value: "1", label: "\u9884\u5F55\u53D6" },
-          { value: "2", label: "\u5DF2\u5F55\u53D6" }
-        ]
-      }),
-      new ClassifySearchItem({
-        name: "isPass",
-        label: "\u901A\u8FC7\u72B6\u6001",
-        options: [
-          { value: "", label: "\u5168\u90E8" },
-          { value: "0", label: "\u5F85\u5B9A" },
-          { value: "1", label: "\u901A\u8FC7" },
-          { value: "2", label: "\u4E0D\u901A\u8FC7" }
-        ]
-      })
-    ]);
     this.setColumns([
       new TableColumn({ name: "id", label: "\u7F16\u53F7", visible: false }),
       new TableColumn({ name: "title", label: "\u83DC\u5355\u63CF\u8FF0" }),

package/dist/esm/dataview/menu/MenuTable.js.map

@@ -1 +1 @@
-{"version":3,"file":"MenuTable.js","sources":["../../../../src/dataview/menu/MenuTable.ts"],"sourcesContent":["import {\r\n  DataTable,\r\n  DataTableOptions,\r\n  TableActionColumn,\r\n  TableColumn,\r\n  ClassifySearchItem\r\n} from \"@maketribe/dm\";\r\nimport { defineDataTable } from \"../../define-data-table\";\r\nimport type { MenuItem, MenuResult } from \"./MenuForm\";\r\nimport { DVQueryable } from \"@maketribe/request\";\r\n\r\nexport class MenuTable<T extends MenuItem = MenuItem> extends DataTable<\r\n  MenuResult,\r\n  T\r\n> {\r\n  constructor(options: Omit<DataTableOptions, \"name\"> = {}) {\r\n    super({ name: \"ms-menu\", ...options });\r\n  }\r\n\r\n  protected async initialize() {\r\n    await super.initialize();\r\n    this.classifySearch.setClassifySearchItems([\r\n      new ClassifySearchItem({\r\n        name: \"createdAt\",\r\n        label: \"学年\",\r\n        defaultValue: new Date().getFullYear() - 0,\r\n        options: [\r\n          { value: '', label: \"全部\" },\r\n          { value: new Date().getFullYear(), label: new Date().getFullYear() },\r\n          { value: new Date().getFullYear() - 1, label: new Date().getFullYear() - 1 },\r\n          { value: new Date().getFullYear() - 2, label: new Date().getFullYear() - 2 },\r\n        ],\r\n      }),\r\n      new ClassifySearchItem({\r\n        name: \"isAdmit\",\r\n        label: \"录取状态：\",\r\n        options: [\r\n          { value: '', label: \"全部\" },\r\n          { value: \"0\", label: \"待定\" },\r\n          { value: \"1\", label: \"预录取\" },\r\n          { value: \"2\", label: \"已录取\" },\r\n        ],\r\n      }),\r\n      new ClassifySearchItem({\r\n        name: \"isPass\",\r\n        label: \"通过状态\",\r\n        options: [\r\n          { value: '', label: \"全部\" },\r\n          { value: \"0\", label: \"待定\" },\r\n          { value: \"1\", label: \"通过\" },\r\n          { value: \"2\", label: \"不通过\" },\r\n        ],\r\n      }),\r\n    ]);\r\n    this.setColumns([\r\n      new TableColumn({ name: \"id\", label: \"编号\", visible: false }),\r\n      new TableColumn({ name: \"title\", label: \"菜单描述\" }),\r\n      new TableActionColumn(),\r\n    ]);\r\n  }\r\n\r\n  formatItem(item: MenuResult): T {\r\n    return {\r\n      id: item.id,\r\n      title: item.title || \"\",\r\n      iconName: item.iconName || \"\",\r\n      pid: item.pid || \"\",\r\n      routeId: item.routeId,\r\n    } as T;\r\n  }\r\n}\r\n\r\ndefineDataTable(MenuTable);\r\n"],"names":[],"mappings":"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"}
+{"version":3,"file":"MenuTable.js","sources":["../../../../src/dataview/menu/MenuTable.ts"],"sourcesContent":["import {\r\n  DataTable,\r\n  DataTableOptions,\r\n  TableActionColumn,\r\n  TableColumn,\r\n} from \"@maketribe/dm\";\r\nimport { defineDataTable } from \"../../define-data-table\";\r\nimport type { MenuItem, MenuResult } from \"./MenuForm\";\r\nimport { DVQueryable } from \"@maketribe/request\";\r\n\r\nexport class MenuTable<T extends MenuItem = MenuItem> extends DataTable<\r\n  MenuResult,\r\n  T\r\n> {\r\n  constructor(options: Omit<DataTableOptions, \"name\"> = {}) {\r\n    super({ name: \"ms-menu\", ...options });\r\n  }\r\n\r\n  protected async initialize() {\r\n    await super.initialize();\r\n\r\n    this.setColumns([\r\n      new TableColumn({ name: \"id\", label: \"编号\", visible: false }),\r\n      new TableColumn({ name: \"title\", label: \"菜单描述\" }),\r\n      new TableActionColumn(),\r\n    ]);\r\n  }\r\n\r\n  formatItem(item: MenuResult): T {\r\n    return {\r\n      id: item.id,\r\n      title: item.title || \"\",\r\n      iconName: item.iconName || \"\",\r\n      pid: item.pid || \"\",\r\n      routeId: item.routeId,\r\n    } as T;\r\n  }\r\n}\r\n\r\ndefineDataTable(MenuTable);\r\n"],"names":[],"mappings":";;;AAUO,MAAM,kBAAiD,SAG5D,CAAA;AAAA,EACA,WAAA,CAAY,OAA0C,GAAA,EAAI,EAAA;AACxD,IAAA,KAAA,CAAM,EAAE,IAAA,EAAM,SAAW,EAAA,GAAG,SAAS,CAAA,CAAA;AAAA,GACvC;AAAA,EAEA,MAAgB,UAAa,GAAA;AAC3B,IAAA,MAAM,MAAM,UAAW,EAAA,CAAA;AAEvB,IAAA,IAAA,CAAK,UAAW,CAAA;AAAA,MACd,IAAI,YAAY,EAAE,IAAA,EAAM,MAAM,KAAO,EAAA,cAAA,EAAM,OAAS,EAAA,KAAA,EAAO,CAAA;AAAA,MAC3D,IAAI,WAAY,CAAA,EAAE,MAAM,OAAS,EAAA,KAAA,EAAO,4BAAQ,CAAA;AAAA,MAChD,IAAI,iBAAkB,EAAA;AAAA,KACvB,CAAA,CAAA;AAAA,GACH;AAAA,EAEA,WAAW,IAAqB,EAAA;AAC9B,IAAO,OAAA;AAAA,MACL,IAAI,IAAK,CAAA,EAAA;AAAA,MACT,KAAA,EAAO,KAAK,KAAS,IAAA,EAAA;AAAA,MACrB,QAAA,EAAU,KAAK,QAAY,IAAA,EAAA;AAAA,MAC3B,GAAA,EAAK,KAAK,GAAO,IAAA,EAAA;AAAA,MACjB,SAAS,IAAK,CAAA,OAAA;AAAA,KAChB,CAAA;AAAA,GACF;AACF,CAAA;AAEA,eAAA,CAAgB,SAAS,CAAA;;;;"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@maketribe/ms-app",
-  "version": "3.0.37",
+  "version": "3.0.39",
   "description": "",
   "main": "dist/cjs",
   "files": [
@@ -22,8 +22,8 @@
     "vue-router": "^4.2.4",
     "@maketribe/locale": "^1.0.5",
     "@maketribe/dm": "^3.0.13",
-    "@maketribe/utils": "^1.1.4",
-    "@maketribe/request": "^2.0.3"
+    "@maketribe/request": "^2.0.3",
+    "@maketribe/utils": "^1.1.4"
   },
   "scripts": {
     "build": "npm run clean && npm run build:js && npm run build:type && npm run build:style",

package/src/components/button/button-options.ts

@@ -1,22 +0,0 @@
-import { ExtractPropTypes } from "vue";
-import { Button } from "@maketribe/dm";
-import { buildProps } from "@maketribe/utils";
-
-export const buttonProps = buildProps({
-  button: {
-    type: Button,
-    required: true,
-  },
-  link: {
-    type: Boolean,
-    default: false,
-  },
-} as const);
-
-export type ButtonProps = ExtractPropTypes<typeof buttonProps>;
-
-export const buttonEmits = {
-  click: () => true,
-};
-
-export type ButtonEmits = typeof buttonEmits;

package/src/components/button/button.tsx

@@ -1,37 +0,0 @@
-import { ElButton } from "element-plus";
-import { defineComponent } from "vue";
-import MKSvgIcon from "../svg-icon";
-import { buttonEmits, buttonProps } from "./button-options";
-
-export default defineComponent({
-  name: "MKButton",
-  props: buttonProps,
-  emits: buttonEmits,
-  setup(props, { emit }) {
-    const handleClick = () => {
-      emit("click");
-    };
-
-    return () => {
-      const icon = props.button.icon ? (
-        <MKSvgIcon iconClass={props.button.icon} />
-      ) : null;
-
-      const text = props.button.label ? (
-        <span class="mk-button__text">{props.button.label}</span>
-      ) : null;
-
-      return (
-        <ElButton
-          class="mk-button"
-          onClick={handleClick}
-          type={props.button.type}
-          link={props.link}
-        >
-          {icon}
-          {text}
-        </ElButton>
-      );
-    };
-  },
-});

package/src/components/button/index.ts

@@ -1,7 +0,0 @@
-import Button from "./button";
-
-export const MKButton = Button;
-
-export default MKButton;
-
-export * from "./button-options";

package/src/components/column-components/column-action/column-action-options.ts

@@ -1,11 +0,0 @@
-import { ExtractPropTypes } from "vue";
-import { buildProps } from "@maketribe/utils";
-import { TableActionColumn } from "@maketribe/dm";
-import { columnProps } from "../../data-model/data-table/composables";
-
-export const columnActionProps = buildProps({
-  ...columnProps,
-  column: { type: TableActionColumn, required: true },
-} as const);
-
-export type ColumnActionProps = ExtractPropTypes<typeof columnActionProps>;

package/src/components/column-components/column-action/column-action.tsx

@@ -1,36 +0,0 @@
-import { computed, defineComponent, inject, unref } from "vue";
-import { ElButton } from "element-plus";
-
-import { columnActionProps } from "./column-action-options";
-import MKButton from "../../button";
-
-export type MKColumnActionButton = {
-  name?: string;
-  label?: string;
-  type?: InstanceType<typeof ElButton>["type"];
-  handler?: (row: any) => any;
-};
-
-export default defineComponent({
-  name: "MKColumnAction",
-  props: columnActionProps,
-  setup(props) {
-    const buttons = computed(() => {
-      return props.column.buttons;
-    });
-
-    return () => {
-      const buttonVnodes = unref(buttons)
-        .filter((button) => button.predicate(props.row))
-        .map((button) => (
-          <MKButton
-            button={button}
-            link
-            onClick={() => button.handler(props.row)}
-          />
-        ));
-
-      return <span class="mk-column-action">{buttonVnodes}</span>;
-    };
-  },
-});

package/src/components/column-components/column-action/index.ts

@@ -1,4 +0,0 @@
-import ColumnAction from "./column-action";
-
-export const MKColumnAction = ColumnAction;
-export default MKColumnAction;

package/src/components/column-components/column-date/column-date-options.ts

@@ -1,12 +0,0 @@
-import { ExtractPropTypes } from "vue";
-import { buildProps } from "@maketribe/utils";
-import { columnTextProps } from "../column-text";
-
-export const dateTypes = ["date", "year", "month", "datetime"] as const;
-
-export const columnDateProps = buildProps({
-  ...columnTextProps,
-  type: { default: "date", values: dateTypes },
-});
-
-export type ColumnDateProps = ExtractPropTypes<typeof columnDateProps>;

package/src/components/column-components/column-date/column-date.tsx

@@ -1,47 +0,0 @@
-import { isFunction } from "lodash-es";
-import { computed, defineComponent, unref } from "vue";
-import { dayjs } from "element-plus";
-
-import { useColumn } from "../../data-model/data-table/composables";
-import { MKColumnText } from "../column-text";
-import { columnDateProps } from "./column-date-options";
-
-export default defineComponent({
-  name: "MKColumnDate",
-  props: columnDateProps,
-  setup(props) {
-    const columnTextProps = computed(() => {
-      const { type, ...columnTextProps } = props;
-      return columnTextProps;
-    });
-
-    const type = computed(() => props.type);
-
-    const formatValue = (value: string) => {
-      const dayInstance = dayjs(value ?? null);
-
-      if (!dayInstance.isValid()) {
-        return;
-      }
-
-      switch (unref(type)) {
-        case "datetime":
-          return dayInstance.format("YYYY-MM-DD HH:mm:ss");
-        case "date":
-          return dayInstance.format("YYYY-MM-DD");
-        case "month":
-          return dayInstance.format("YYYY-MM");
-        case "year":
-          return dayInstance.format("YYYY");
-        default:
-          return props.formatValue(value);
-      }
-    };
-
-    return () => {
-      return (
-        <MKColumnText {...unref(columnTextProps)} formatValue={formatValue} />
-      );
-    };
-  },
-});

package/src/components/column-components/column-date/index.ts

@@ -1,6 +0,0 @@
-import ColumnDate from "./column-date";
-
-export const MKColumnDate = ColumnDate;
-export default MKColumnDate;
-
-export * from "./column-date-options";

package/src/components/column-components/column-image/column-image-options.ts

@@ -1,9 +0,0 @@
-import { ExtractPropTypes } from "vue";
-import { buildProps } from "@maketribe/utils";
-import { columnProps } from "../../data-model/data-table/composables";
-
-export const columnImageProps = buildProps({
-  ...columnProps,
-} as const);
-
-export type ColumnImageProps = ExtractPropTypes<typeof columnImageProps>;

package/src/components/column-components/column-image/column-image.tsx

@@ -1,20 +0,0 @@
-import { defineComponent, unref } from "vue";
-import { useColumn } from "../../data-model/data-table/composables";
-import { columnImageProps } from "./column-image-options";
-import MKImageView from "../../image-view";
-
-export default defineComponent({
-  name: "MKColumnImage",
-  props: columnImageProps,
-  setup(props) {
-    const { value } = useColumn(props);
-
-    return () => {
-      if (!unref(value)) {
-        return null;
-      }
-
-      return <MKImageView src={unref(value)} />;
-    };
-  },
-});

package/src/components/column-components/column-image/index.ts

@@ -1,4 +0,0 @@
-import ColumnImage from "./column-image";
-
-export const MKColumnImage = ColumnImage;
-export default MKColumnImage;

package/src/components/column-components/column-json/column-json-options.ts

@@ -1,13 +0,0 @@
-import { ExtractPropTypes } from "vue";
-import { buildProps } from "@maketribe/utils";
-import { columnProps } from "../../data-model/data-table/composables";
-
-export const columnJsonProps = buildProps({
-  ...columnProps,
-  buttonText: {
-    type: String,
-    default: "查看",
-  },
-} as const);
-
-export type ColumnJsonProps = ExtractPropTypes<typeof columnJsonProps>;

package/src/components/column-components/column-json/column-json.tsx

@@ -1,41 +0,0 @@
-import { Fragment, computed, defineComponent, ref, unref } from "vue";
-import { ElButton, ElDialog, ElScrollbar } from "element-plus";
-import { I18n } from "@maketribe/locale";
-import { useColumn } from "../../data-model/data-table/composables";
-import { columnJsonProps } from "./column-json-options";
-import { MKJsonEditor } from "../../json-editor";
-
-export default defineComponent({
-  name: "MKColumnJson",
-  props: columnJsonProps,
-  setup(props) {
-    const { value } = useColumn(props);
-
-    const isShowDialog = ref(false);
-
-    const buttonText = computed(() => props.buttonText);
-
-    const handleClick = () => {
-      isShowDialog.value = true;
-    };
-
-    return () => {
-      return (
-        <Fragment>
-          <ElButton onClick={handleClick}>{unref(buttonText)}</ElButton>
-
-          <ElDialog
-            class="mk-column-json__dialog"
-            appendToBody
-            modelValue={unref(isShowDialog)}
-            onUpdate:modelValue={(v: boolean) => (isShowDialog.value = v)}
-          >
-            <ElScrollbar height="100%">
-              <MKJsonEditor disabled modelValue={unref(value) as string} />
-            </ElScrollbar>
-          </ElDialog>
-        </Fragment>
-      );
-    };
-  },
-});

package/src/components/column-components/column-json/index.ts

@@ -1,8 +0,0 @@
-import { withInstall } from "@maketribe/utils";
-import ColumnJson from "./column-json";
-
-export const MKColumnJson = withInstall(ColumnJson);
-
-export default MKColumnJson;
-
-export * from "./column-json-options";

package/src/components/column-components/column-link/column-link-options.ts

@@ -1,34 +0,0 @@
-import { ExtractPropTypes } from "vue";
-import { buildProps } from "@maketribe/utils";
-import {
-  ColumnEventData,
-  columnProps,
-} from "../../data-model/data-table/composables";
-
-export const columnLinkProps = buildProps({
-  ...columnProps,
-  type: {
-    values: [
-      "",
-      "default",
-      "success",
-      "warning",
-      "info",
-      "text",
-      "primary",
-      "danger",
-    ],
-    default: "primary",
-  },
-  formatValue: {
-    type: Function,
-  },
-} as const);
-
-export type ColumnLinkProps = ExtractPropTypes<typeof columnLinkProps>;
-
-export const columnLinkEmits = {
-  click: (data: ColumnEventData) => true,
-};
-
-export type ColumnLinkEmits = typeof columnLinkEmits;

package/src/components/column-components/column-link/column-link.tsx

@@ -1,27 +0,0 @@
-import { ElButton } from "element-plus";
-import { defineComponent } from "vue";
-import { columnLinkEmits, columnLinkProps } from "./column-link-options";
-import MKColumnText from "../column-text";
-
-export default defineComponent({
-  name: "MKColumnLink",
-  props: columnLinkProps,
-  emits: columnLinkEmits,
-  setup(props, { emit }) {
-    const handleClick = () => {
-      emit("click", {
-        row: props.row,
-        index: props.index,
-        column: props.column,
-      });
-    };
-
-    return () => {
-      return (
-        <ElButton type={props.type} onClick={handleClick} link>
-          <MKColumnText {...props} />
-        </ElButton>
-      );
-    };
-  },
-});

package/src/components/column-components/column-link/index.ts

@@ -1,7 +0,0 @@
-import ColumnLink from "./column-link";
-
-export const MKColumnLink = ColumnLink;
-
-export default ColumnLink;
-
-export * from "./column-link-options";

package/src/components/column-components/column-object-mapping-text/column-object-mapping-text-options.ts

@@ -1,12 +0,0 @@
-import { ExtractPropTypes } from "vue";
-import { buildProps } from "@maketribe/utils";
-import { columnProps } from "../../data-model/data-table/composables";
-
-export const columnObjectMappingTextProps = buildProps({
-  ...columnProps,
-  mapping: { type: Object, required: true },
-} as const);
-
-export type ColumnObjectMappingTextProps = ExtractPropTypes<
-  typeof columnObjectMappingTextProps
->;

package/src/components/column-components/column-object-mapping-text/column-object-mapping-text.tsx

@@ -1,22 +0,0 @@
-import { defineComponent } from "vue";
-import { columnObjectMappingTextProps } from "./column-object-mapping-text-options";
-import ColumnText from "../column-text";
-
-export default defineComponent({
-  name: "MKColumnObjectMappingText",
-  props: columnObjectMappingTextProps,
-  setup(props) {
-    const formatValue = (value: any) => props.mapping[value] ?? value;
-
-    return () => {
-      return (
-        <ColumnText
-          row={props.row}
-          column={props.column}
-          index={props.index}
-          formatValue={formatValue}
-        />
-      );
-    };
-  },
-});