yuang-framework-ui-common 1.0.61 → 1.0.63

package/lib/config/httpConfig.ts

@@ -10,6 +10,7 @@ import { alertMessageBox } from '../utils/messageBoxUtils';
 
 import { application } from '../config/applicationConfig';
 import { getSsoLoginUrl, clearSsoAccessToken, setSsoAccessToken } from '../utils/ssoUtils';
+import { getIsDebug, setIsDebug } from '../utils/htmlUtils';
 
 import { clearGateway, initGateway } from '../config/gatewayConfig';
 
@@ -51,7 +52,9 @@ http.interceptors.response.use(async (res: any) => {
         showErrorMessage(messageMap.responseSturctError);
         return Promise.reject(new Error(messageMap.responseSturctError));
     }
-    debugger
+    if(getIsDebug()) {
+        debugger
+    }
     if (res?.data?.statusCode !== 200) {
         // 登录过期处理
         if (res?.data?.statusCode === 401) {

package/lib/interface/framework/frameworkBase.ts

@@ -0,0 +1,63 @@
+/**
+ * 接口统一返回结果
+ */
+export interface FrameworkJsonResult<T> {
+  /** 状态码 */
+  statusCode: number;
+  /** 状态信息 */
+  message?: string;
+  /** 返回数据 */
+  data?: T;
+}
+
+/**
+ * 分页查询统一结果
+ */
+export interface FrameworkPageResult<T> {
+  /** 返回数据 */
+  records: T[];
+  /** 总数量 */
+  totalCount: number;
+}
+
+/**
+ * 基础属性
+ */
+export interface FrameworkBase {
+  /** 用户id */
+  id?: string;
+  /** 父母id */
+  parentId?: string;
+  /** 应用id */
+  uimsApplicationId?: string;
+  sequence?: number;
+  remark?: string;
+  createUserAccount?: string;
+  createUserName?: string;
+  /** 创建时间 */
+  createTime?: string;
+  lastUpdateUserAccount?: string;
+  lastUpdateUserName?: string;
+
+  lastUpdateTime?: Date;
+}
+/**
+ * 基础查询基本参数
+ */
+export interface FrameworkBaseQueryParam {
+  /** 第几页 */
+  currentPage?: number;
+  /** 每页多少条 */
+  pageSize?: number;
+  // /** 排序字段 */
+  // sort?: string;
+  // /** 排序方式, asc升序, desc降序 */
+  // order?: string;
+  queryFor?: string;
+  levelNum?: number;
+
+  /** 应用id */
+  uimsApplicationId?: string;
+  /** 上级id */
+  parentId?: string;
+}

package/lib/interface/framework/frameworkConfig.ts

@@ -0,0 +1,45 @@
+import type { FrameworkBase, FrameworkBaseQueryParam } from './frameworkBase';
+
+/**
+ * 配置
+ */
+export interface FrameworkConfig extends FrameworkBase {
+  frameworkGroupId?: string;
+  /** 配置名称 */
+  name?: string;
+  /** 配置代码 */
+  code?: string;
+  /** 配置状态 */
+  status?: number;
+  /** 配置类型 */
+  type?: string;
+  /** 配置选项 */
+  options?: string;
+  optionList?: Option[];
+  /** 配置占据的列数 */
+  colspan?: number;
+  /** 配置默认值 */
+  defaultValue?: string;
+  /** 配置是否必填 */
+  isRequired?: boolean;
+  /** 配置值 */
+  value?: string;
+  /** 配置描述 */
+  description?: string;
+}
+
+interface Option {
+  name: string;
+  value: any;
+}
+
+/**
+ * 配置搜索条件
+ */
+export interface FrameworkConfigQueryParam extends FrameworkBaseQueryParam {
+  /** 配置名称 */
+  nameForLike?: string;
+  codeForEqual?: string;
+  codeForLike?: string;
+  statusForEqual?: number;
+}

package/lib/interface/framework/frameworkGroup.ts

@@ -0,0 +1,19 @@
+import type { FrameworkBase, FrameworkBaseQueryParam } from './frameworkBase';
+
+/**
+ * 分组
+ */
+export interface FrameworkGroup extends FrameworkBase {
+  /** 分组名称 */
+  name?: string;
+  code?: string;
+  status?: number;
+}
+
+/**
+ * 分组搜索条件
+ */
+export interface FrameworkGroupQueryParam extends FrameworkBaseQueryParam {
+  /** 分组名称 */
+  nameForLike?: string;
+}

package/lib/interface/framework/frameworkLog.ts

@@ -0,0 +1,74 @@
+import type { FrameworkBase, FrameworkBaseQueryParam } from './frameworkBase';
+
+/**
+ * 日志
+ */
+export interface FrameworkLog extends FrameworkBase {
+  /** 应用名称 */
+  applicationName?: string;
+
+  /** 日志级别 */
+  level?: string;
+
+  /** 日志类型 */
+  type?: string;
+
+  levelType?: string;
+
+  /** 请求id */
+  requestId?: string;
+  /** 请求操作系统 */
+  requestOs?: string;
+
+  /**请求浏览器*/
+  requestBrowser?: string;
+  /**请求ip*/
+  requestIp?: string;
+  /** 请求位置 */
+  requestLocation?: string;
+
+  /** 请求网址 */
+  requestUrl?: string;
+  /** 请求内容类型 */
+  requestContentType?: string;
+  /** 请求方法 */
+  requestMethod?: string;
+
+  /** 请求头 */
+  requestHeaders?: string;
+  /** 请求参数 */
+  requestParam?: string;
+
+  /** 请求表单 */
+  requestForm?: string;
+
+  /** 请求体 */
+  requestBody?: string;
+
+  /** 请求结果 */
+  requestResult?: string;
+
+  /** 请求耗时 */
+  requestSpendTime?: number;
+  /** 堆栈跟踪 */
+  stackTrace?: string;
+  /** 内容 */
+  content?: string;
+
+  /** gateway访问令牌 */
+  gatewayAccessToken?: string;
+
+  /** sso访问令牌 */
+  ssoAccessToken?: string;
+}
+
+/**
+ * 日志搜索条件
+ */
+export interface FrameworkLogQueryParam extends FrameworkBaseQueryParam {
+  levelForEqual?: string;
+  typeForEqual?: string;
+  requestIdForLike?: string;
+
+  uimsApplicationCodeForEqual?: string;
+}

package/lib/interface/framework/frameworkTree.ts

@@ -0,0 +1,4 @@
+export interface FrameworkTree {
+  label: string;
+  children?: FrameworkTree[];
+}

package/lib/interface/uims/uimsApi.ts

@@ -0,0 +1,23 @@
+import type { FrameworkBase, FrameworkBaseQueryParam } from '../framework/frameworkBase';
+
+/**
+ * Api
+ */
+export interface UimsApi extends FrameworkBase {
+  /** Api名称 */
+  name?: string;
+  code?: string;
+  status?: number;
+  /** Api地址 */
+  url?: string;
+}
+
+/**
+ * Api搜索条件
+ */
+export interface UimsApiQueryParam extends FrameworkBaseQueryParam {
+  /** Api名称 */
+  nameForLike?: string;
+  /** Api地址 */
+  urlForLike?: string;
+}

package/lib/interface/uims/uimsApplication.ts

@@ -0,0 +1,39 @@
+import type { FrameworkBase, FrameworkBaseQueryParam } from '../framework/frameworkBase';
+
+/**
+ * 应用
+ */
+export interface UimsApplication extends FrameworkBase {
+  /** 应用名称 */
+  name?: string;
+  /** 应用名称 */
+  code?: string;
+  /** 应用设备 */
+  device?: string;
+  /** 应用状态 */
+  status?: number;
+  /** 过期时间 */
+  expiresTime?: Date;
+  /** 应用主页 */
+  homeUrl?: string;
+  /** 应用Api上下文路径 */
+  apiContextPath?: string;
+  /** 可信域名 */
+  trustDomain?: string;
+  /** IP白名单 */
+  ipWhiteList?: string;
+  /** 描述 */
+  description?: string;
+}
+
+/**
+ * 应用搜索条件
+ */
+export interface UimsApplicationQueryParam extends FrameworkBaseQueryParam {
+  /** 应用名称 */
+  nameForLike?: string;
+  codeForLike?: string;
+
+  /** 应用状态 */
+  statusForEqual?: number;
+}

package/lib/interface/uims/uimsMenu.ts

@@ -0,0 +1,35 @@
+import type { FrameworkBase, FrameworkBaseQueryParam } from '../framework/frameworkBase';
+
+/**
+ * 菜单
+ */
+export interface UimsMenu extends FrameworkBase {
+  /** 菜单名称 */
+  name?: string;
+  /** 菜单代码 */
+  code?: string;
+  /** 菜单状态 */
+  status?: number;
+  /** 菜单图标 */
+  icon?: string;
+  /** 菜单图片代码 */
+  imageCode?: string;
+  /** 菜单url */
+  url?: string;
+  /** 菜单目标 */
+  target?: string;
+  /** 子级菜单 */
+  children?: UimsMenu[];
+
+  isHasChildren?: boolean;
+}
+
+/**
+ * 菜单搜索条件
+ */
+export interface UimsMenuQueryParam extends FrameworkBaseQueryParam {
+  parentId?: string;
+  nameForLike?: string;
+  // codeForLike?: string;
+  urlForLike?: string;
+}

package/lib/interface/uims/uimsOrganization.ts

@@ -0,0 +1,29 @@
+import type { FrameworkBase, FrameworkBaseQueryParam } from '../framework/frameworkBase';
+
+/**
+ * 机构
+ */
+export interface UimsOrganization extends FrameworkBase {
+  /** 机构名称 */
+  name?: string;
+  /** 机构代码 */
+  code?: string;
+  /** 机构状态 */
+  status?: number;
+  /** 机构类型 */
+  type?: string;
+  /** 子级 */
+  children?: UimsOrganization[];
+
+  isHasChildren?: boolean;
+}
+
+/**
+ * 机构搜索条件
+ */
+export interface UimsOrganizationQueryParam extends FrameworkBaseQueryParam {
+  /** 机构名称 */
+  nameForLike?: string;
+  /** 机构代码 */
+  codeForLike?: string;
+}

package/lib/interface/uims/uimsRole.ts

@@ -0,0 +1,23 @@
+import type { FrameworkBase, FrameworkBaseQueryParam } from '../framework/frameworkBase';
+
+/**
+ * 角色
+ */
+export interface UimsRole extends FrameworkBase {
+  /** 角色代码 */
+  code?: string;
+  /** 角色名称 */
+  name?: string;
+
+  status?: number;
+}
+
+/**
+ * 角色搜索条件
+ */
+export interface UimsRoleQueryParam extends FrameworkBaseQueryParam {
+  /** 角色名称 */
+  nameForLike?: string;
+  /** 角色标识 */
+  codeForLike?: string;
+}

package/lib/interface/uims/uimsUser.ts

@@ -0,0 +1,41 @@
+import type { FrameworkBase, FrameworkBaseQueryParam } from '../framework/frameworkBase';
+
+/**
+ * 用户
+ */
+export interface UimsUser extends FrameworkBase {
+  /** 用户账号 */
+  account?: string;
+  /** 用户姓名 */
+  name?: string;
+  /** 用户性别 */
+  gender?: string;
+  status?: number;
+  /** 机构id */
+  organizationId?: string;
+  password?: string;
+  surePassword?: string;
+  rsaAesKey?: string;
+
+  isRecursiveOrganization?: Boolean;
+  mobile?: string;
+  email?: string;
+  birthday?: string;
+  idCard?: string;
+  address?: string;
+
+  avatarCode?: string;
+  avatarUrl?: string;
+}
+
+/**
+ * 用户搜索条件
+ */
+export interface UimsUserQueryParam extends FrameworkBaseQueryParam {
+  /** 用户姓名 */
+  nameForLike?: string;
+  /** 用户账号 */
+  accountForLike?: string;
+  /** 是否递归机构 */
+  isRecursiveOrganization?: boolean;
+}

package/lib/utils/htmlUtils.ts

@@ -1,4 +1,5 @@
 
+
 /**
  * 加载脚本
  * @param src
@@ -114,4 +115,22 @@ const getFileSize = (url: string) => {
 }
 
 
-export { loadScript, loadLink, loadIframe, getFileSize };
+/**
+ * 设置是否调试
+ * @param value
+ */
+const setIsDebug = (value: boolean) => {
+    localStorage.setItem('is-debug', value.toString());
+}
+
+/**
+ * 获取是否调试
+ */
+const getIsDebug = () => {
+    let value = localStorage.getItem('is-debug');
+    if(value == 'true') {
+        return true;
+    }
+    return false;
+}
+export { loadScript, loadLink, loadIframe, getFileSize, setIsDebug, getIsDebug };

package/lib/utils/urlUtils.ts

@@ -6,10 +6,20 @@
  * @returns {string|null}
  */
 const getParameter = (name: string, url?: string) : string => {
-    url = url || window.location.search;
+    if (typeof(url) == 'undefined') {
+        // 格式：?name=chenghui
+        url = window.location.search;
+    } else {
+        if (url.indexOf('?') != -1) {
+            // 格式：?name=chenghui
+            url = url.substring(url.indexOf('?'));
+        }
+    }
     var reg = new RegExp("(^|&)" + name + "=([^&]*)(&|$)");
     var r = url.substr(1).match(reg);
-    if (r != null) return decodeURIComponent(r[2]);
+    if (r != null) {
+        return decodeURIComponent(r[2]);
+    }
     return '';
 }
 
@@ -19,8 +29,15 @@ const getParameter = (name: string, url?: string) : string => {
  * @returns {map|null}
  */
 const getParameterMap = (url?: string): Map<string, string> => {
-    url = url || window.location.search;
-
+    if (typeof(url) == 'undefined') {
+        // 格式：?name=chenghui
+        url = window.location.search;
+    } else {
+        if (url.indexOf('?') != -1) {
+            // 格式：?name=chenghui
+            url = url.substring(url.indexOf('?'));
+        }
+    }
     let arrObj = url.split("?") as any;
     let params = Object.create(null);
     if (arrObj.length > 1) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "yuang-framework-ui-common",
-  "version": "1.0.61",
+  "version": "1.0.63",
   "private": false,
   "type": "module",
   "scripts": {

package/src/router/index.ts

@@ -49,6 +49,15 @@ const router = createRouter({
                 isSsoExcluded: true
             }
         },
+        {
+            path: '/utils/http-utils',
+            component: () => import('@/views/utils/http-utils.vue'),
+            meta: {
+                isSsoExcluded: true
+            }
+        },
+
+
 
         {
             path: '/example/table/index',

package/src/views/utils/gateway-utils.vue

@@ -10,7 +10,7 @@ import { ElMessage } from 'element-plus/es';
 
 const sendRequest = () => {
   // 测试
-  http.get("/framework-api/standard/framework-captcha/getSliderCaptcha", { params: {} }).then((res) => {
+  http.get("/framework-api/core/framework-captcha/getSliderCaptcha", { params: {} }).then((res) => {
     ElMessage.success('发送成功');
   });
 }

package/src/views/utils/http-utils.vue

@@ -0,0 +1,32 @@
+<template>
+<div>http</div>
+</template>
+
+<script setup lang="ts">
+import { onMounted, ref } from 'vue';
+import { ElLoading } from 'element-plus';
+
+import { http } from '../../../lib/config/httpConfig';
+
+
+onMounted(async () => {
+  const loading = ElLoading.service({
+    lock: true,
+    text: '加载中...'
+  });
+  try {
+    let res = await http.get('/framework-api/core/framework-attachment/closeEditInfo');
+
+    res = await http.get('/framework-api/core/framework-attachment/closeAddInfo');
+    loading.close();
+  }catch{
+    loading.close();
+  }
+
+})
+
+</script>
+
+<style scoped>
+
+</style>

package/src/views/utils/sso-utils.vue

@@ -3,10 +3,9 @@
 </template>
 
 <script setup lang="ts">
-import {onMounted, ref, getCurrentInstance} from 'vue';
+import {onMounted, ref} from 'vue';
 import {getSsoEncrypt} from '../../../lib/utils/ssoUtils';
 
-const {proxy} = getCurrentInstance() as any;
 
 let ssoEncrypt = ref('');