@airpower/web 0.0.30 → 0.0.33

package/dist/airpower.web.js

@@ -1,4 +1,7 @@
-import { defineComponent, computed, createBlock, openBlock, unref, mergeProps, toHandlers, withCtx, createElementBlock, Fragment, renderList, createTextVNode, ref } from "vue";
+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);
+import { defineComponent, computed, createBlock, openBlock, unref, mergeProps, toHandlers, withCtx, createElementBlock, Fragment, renderList, ref } from "vue";
 import { AirDecorator, getFieldConfig, AirClassTransformer, CoreConfig, AirI18n, QueryPageRequest, QueryPageResponse, Page, AbstractHttp, HttpResponse, AbstractEntityService } from "@airpower/core";
 export * from "@airpower/core";
 import { ElTable, ElTableColumn, ElMessageBox, ElMessage } from "element-plus";
@@ -34,15 +37,24 @@ function getTableConfigList(target, keyList) {
   });
 }
 const _sfc_main = /* @__PURE__ */ defineComponent({
-  __name: "Table",
+  __name: "WebTable",
   props: {
+    /**
+     * ### 表格列配置
+     */
     columns: {
       type: Array
     },
+    /**
+     * ### 表格数据
+     */
     data: {
       type: Array,
       required: true
     },
+    /**
+     * ### 表格实体类
+     */
     clazz: {
       type: Function,
       required: true
@@ -55,10 +67,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
         return props.columns;
       }
       const instance = AirClassTransformer.newInstance(props.clazz);
-      console.warn("[table]: instance", instance);
-      const list = getTableConfigList(instance, []);
-      console.warn("[table]: list:", list);
-      return list;
+      return getTableConfigList(instance, []);
     });
     return (_ctx, _cache) => {
       return openBlock(), createBlock(unref(ElTable), mergeProps({
@@ -67,16 +76,11 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
       }, _ctx.$attrs, toHandlers(_ctx.$attrs)), {
         default: withCtx(() => [
           (openBlock(true), createElementBlock(Fragment, null, renderList(tableColumns.value, (item) => {
-            return openBlock(), createElementBlock(Fragment, {
-              key: item.key
-            }, [
-              !item.key ? (openBlock(), createElementBlock(Fragment, { key: 0 }, [
-                createTextVNode(" 这不可能 ")
-              ], 64)) : (openBlock(), createBlock(unref(ElTableColumn), mergeProps({
-                key: 1,
-                ref_for: true
-              }, item), null, 16))
-            ], 64);
+            return openBlock(), createBlock(unref(ElTableColumn), mergeProps({
+              key: item.key,
+              prop: item.key,
+              ref_for: true
+            }, item), null, 16, ["prop"]);
           }), 128))
         ]),
         _: 1
@@ -84,7 +88,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     };
   }
 });
-class WebConfig {
+class WebAccessToken {
   /**
    * ### 获取AccessToken
    */
@@ -356,8 +360,12 @@ function useTableTree(entityClass, serviceClass, option = {}) {
   });
 }
 class WebHttp extends AbstractHttp {
-  getAccessToken() {
-    return WebConfig.getAccessToken();
+  constructor() {
+    super(...arguments);
+    /**
+     * ### 加载状态
+     */
+    __publicField(this, "loading", ref(false));
   }
   async request(body) {
     const axiosConfig = {};
@@ -386,12 +394,42 @@ class WebHttp extends AbstractHttp {
       return response;
     }
   }
+  /**
+   * # 获取AccessToken
+   */
+  getAccessToken() {
+    return WebAccessToken.getAccessToken();
+  }
+  startLoading() {
+    this.loading.value = true;
+  }
+  stopLoading() {
+    this.loading.value = false;
+  }
 }
 class AbstractWebService extends AbstractEntityService {
+  constructor() {
+    super(...arguments);
+    /**
+     * ### 是否正在加载中
+     */
+    __publicField(this, "loading", ref(false));
+  }
+  /**
+   * ### 创建一个 `Service` 对象
+   * @param loading 加载状态
+   */
+  static createWithLoading(loading) {
+    const service = super.create();
+    service.loading = loading;
+    return service;
+  }
   createHttp(url) {
-    return WebHttp.create(url, (error) => {
+    const http = WebHttp.create(url, (error) => {
       ElMessage.error(error.message);
     });
+    http.loading = this.loading;
+    return http;
   }
   showSuccess(successMessage) {
     ElMessage.success(successMessage);
@@ -403,7 +441,7 @@ class AbstractWebService extends AbstractEntityService {
 export {
   AbstractWebService,
   Table,
-  WebConfig,
+  WebAccessToken,
   WebHttp,
   WebI18n,
   _sfc_main as WebTable,

package/dist/components/index.d.ts

@@ -1,2 +1,2 @@
-import { default as WebTable } from './Table.vue';
+import { default as WebTable } from './WebTable.vue';
 export { WebTable, };

package/dist/decorator/{Table.d.ts → @table/Table.d.ts}

@@ -1,5 +1,5 @@
 import { AirDecoratorTarget } from '@airpower/core';
-import { ITableFieldConfig } from './config';
+import { ITableFieldConfig } from './ITableFieldConfig';
 /**
  * ### 为属性标记是表格字段
  * @param config 表格列的配置

package/dist/decorator/{config/table → @table}/index.d.ts

@@ -1,3 +1,4 @@
 export * from './IElementTableColumn';
 export * from './ITableFieldConfig';
+export * from './Table';
 export * from './TableType';

package/dist/decorator/index.d.ts

@@ -1,2 +1 @@
-export * from './config';
-export * from './Table';
+export * from './@table';

package/dist/{config/WebConfig.d.ts → helper/WebAccessToken.d.ts}

@@ -1,8 +1,8 @@
 /**
- * # 全局配置
+ * # 身份令牌工具类
  * @author Hamm.cn
  */
-export declare class WebConfig {
+export declare class WebAccessToken {
     /**
      * ### 获取AccessToken
      */

package/dist/helper/index.d.ts

@@ -0,0 +1,2 @@
+export * from './WebAccessToken';
+export * from './WebI18n';

package/dist/http/WebHttp.d.ts

@@ -4,6 +4,15 @@ import { AbstractHttp, HttpResponse } from '@airpower/core';
  * @author Hamm.cn
  */
 export declare class WebHttp extends AbstractHttp {
-    getAccessToken(): string;
-    request(body?: unknown): Promise<HttpResponse>;
+    /**
+     * ### 加载状态
+     */
+    loading: import('vue').Ref<boolean, boolean>;
+    protected request(body?: unknown): Promise<HttpResponse>;
+    /**
+     * # 获取AccessToken
+     */
+    protected getAccessToken(): string;
+    protected startLoading(): void;
+    protected stopLoading(): void;
 }

package/dist/index.d.ts

@@ -1,6 +1,6 @@
 export * from './components';
-export * from './config';
 export * from './decorator';
+export * from './helper';
 export * from './hooks';
 export * from './http';
 export * from './service';

package/dist/service/AbstractWebService.d.ts

@@ -1,4 +1,6 @@
 import { AbstractHttp, AirEntity, AbstractEntityService } from '@airpower/core';
+import { ClassConstructor } from 'airpower';
+import { Ref } from 'vue';
 /**
  * # 实体 `API` 服务超类
  * 包含了常用的增删改查等方法
@@ -7,7 +9,16 @@ import { AbstractHttp, AirEntity, AbstractEntityService } from '@airpower/core';
  * @author Hamm.cn
  */
 export declare abstract class AbstractWebService<E extends AirEntity> extends AbstractEntityService<E> {
-    createHttp(url: string): AbstractHttp;
+    /**
+     * ### 是否正在加载中
+     */
+    loading: Ref<boolean, boolean>;
+    /**
+     * ### 创建一个 `Service` 对象
+     * @param loading 加载状态
+     */
+    static createWithLoading<S extends AbstractWebService<E>, E extends AirEntity>(this: ClassConstructor<S>, loading: Ref<boolean>): S;
+    protected createHttp(url: string): AbstractHttp;
     protected showSuccess(successMessage: string): void;
     protected showError(errorMessage: string): void;
 }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@airpower/web",
   "type": "module",
-  "version": "0.0.30",
+  "version": "0.0.33",
   "description": "AirPower-Web",
   "author": {
     "name": "Hamm",
@@ -36,15 +36,15 @@
     "preview": "vite preview"
   },
   "dependencies": {
-    "@airpower/core": "^0.1.5",
+    "@airpower/core": "^0.1.9",
     "axios": "^1.8.4",
     "element-plus": "^2.9.7",
-    "vue": "^3.4.27"
+    "vue": "^3.5.13"
   },
   "peerDependencies": {
     "axios": "^1.8.4",
     "element-plus": "^2.9.7",
-    "vue": "^3.4.27"
+    "vue": "^3.5.13"
   },
   "devDependencies": {
     "@antfu/eslint-config": "^4.11.0",

package/dist/config/index.d.ts

@@ -1,2 +0,0 @@
-export * from './WebConfig';
-export * from './WebI18n';

package/dist/decorator/config/index.d.ts

@@ -1 +0,0 @@
-export * from './table';