@uxda/appkit 4.2.82 → 4.2.84

package/src/user/api/endpoints.ts

@@ -1,17 +1,17 @@
-import { HttpEndpoints } from '../../shared/http'
-
-const endpointsList: HttpEndpoints = {}
-
-const endpoints = Object.fromEntries(
-  Object.entries(endpointsList).map(([name, def]) => [name, def.path])
-)
-
-const translates = Object.fromEntries(
-  Object.entries(endpointsList).map(([, def]) => [def.path, def.translate])
-)
-
-const transforms = Object.fromEntries(
-  Object.entries(endpointsList).map(([, def]) => [def.path, def.transform])
-)
-
-export { endpoints, translates, transforms }
+import { HttpEndpoints } from '../../shared/http'
+
+const endpointsList: HttpEndpoints = {}
+
+const endpoints = Object.fromEntries(
+  Object.entries(endpointsList).map(([name, def]) => [name, def.path])
+)
+
+const translates = Object.fromEntries(
+  Object.entries(endpointsList).map(([, def]) => [def.path, def.translate])
+)
+
+const transforms = Object.fromEntries(
+  Object.entries(endpointsList).map(([, def]) => [def.path, def.transform])
+)
+
+export { endpoints, translates, transforms }

package/src/user/api/index.ts

@@ -1,111 +1,117 @@
-import Taro, { request as TaroRequest, showToast } from '@tarojs/taro'
-import { HttpRequestConfig, PagingData, PagingParams, ResponseRaw, createHttp } from '../../shared'
-import { translates, transforms } from './endpoints'
-import { useAppKitOptions } from '../../Appkit'
-import { useLogger, generateUniqueId } from '../../shared/composables/useLogger'
-
-const logger = useLogger()
-/**
- * 小程序端 Http
- * 使用 Taro.request 实现
- */
-const vendor = {
-  async request<T>(config: HttpRequestConfig) {
-    return new Promise<ResponseRaw<T>>((resolve, reject) => {
-      const header = {
-        ...config.headers,
-        traceId: generateUniqueId('appkit'),
-      }
-      const startTime = new Date().getTime()
-
-      TaroRequest({
-        url: config.url,
-        method: config.method,
-        header,
-        data: config.data,
-      })
-        .then(({ data }) => {
-          // 记录阿里日志
-          const endTime = new Date().getTime()
-          logger.info({
-            send: JSON.stringify({ url: config.url, data: config.data }),
-            receive: JSON.stringify(data),
-            traceId: header.traceId,
-            duration: endTime - startTime,
-          })
-
-          if (data.success) {
-            resolve({
-              status: +data.code,
-              message: data.msg,
-              data: data.result as T,
-            })
-          } else if (data.code !== '401') {
-            showToast({
-              title: data.msg,
-              icon: 'none',
-            })
-          }
-        })
-        .catch((e: any) => {
-          reject(e)
-        })
-    })
-  },
-}
-
-function useHttp() {
-  const appkitOptions = useAppKitOptions()
-  const headers: any = {
-    Token: appkitOptions.tempToken() || appkitOptions.token(),
-    Appcode: appkitOptions.app(),
-    cookie: `tid=${appkitOptions.tenant()}`,
-    gray: appkitOptions.gray ? appkitOptions.gray() : '0',
-  }
-
-  /**
-   * 传入配置获取 Http instanse
-   */
-  const $http = createHttp({
-    vendor,
-    baseUrl: appkitOptions.baseUrl(),
-    headers,
-    interceptors: [
-      (raw) => {
-        if (raw.status == 401) {
-          appkitOptions[401]()
-          return true
-        }
-        return false
-      },
-      (raw) => {
-        if (raw.status > 500 && raw.status != 51015 && raw.status != 51014) {
-          showToast({
-            title: raw.message,
-            icon: 'none',
-          })
-          return true
-        }
-        return false
-      },
-    ],
-    paging: {
-      translate: (params: PagingParams) => ({
-        pageNum: params.page,
-        pageSize: params.pageSize,
-      }),
-      transform(data: any): PagingData {
-        return {
-          totalPages: data.pages,
-        }
-      },
-    },
-    translates,
-    transforms,
-  })
-  return $http
-}
-
-export { useHttp }
-
-export * from './endpoints'
+import Taro, { request as TaroRequest, showToast } from '@tarojs/taro'
+import { HttpRequestConfig, PagingData, PagingParams, ResponseRaw, createHttp } from '../../shared'
+import { translates, transforms } from './endpoints'
+import { useAppKitOptions } from '../../Appkit'
+import { useLogger, generateUniqueId } from '../../shared/composables/useLogger'
+
+const logger = useLogger()
+/**
+ * 小程序端 Http
+ * 使用 Taro.request 实现
+ */
+const vendor = {
+  async request<T>(config: HttpRequestConfig) {
+    return new Promise<ResponseRaw<T>>((resolve, reject) => {
+      const header = {
+        ...config.headers,
+        traceId: generateUniqueId('appkit'),
+      }
+      const startTime = new Date().getTime()
+
+      TaroRequest({
+        url: config.url,
+        method: config.method,
+        header,
+        data: config.data,
+      })
+        .then(({ data }) => {
+          // 记录阿里日志
+          const endTime = new Date().getTime()
+          logger.info({
+            send: JSON.stringify({ url: config.url, data: config.data }),
+            receive: JSON.stringify(data),
+            traceId: header.traceId,
+            duration: endTime - startTime,
+          })
+
+          if (data.success) {
+            resolve({
+              status: +data.code,
+              message: data.msg,
+              data: data.result as T,
+            })
+          } else if (data.code !== '401') {
+            showToast({
+              title: data.msg,
+              icon: 'none',
+            })
+          }
+        })
+        .catch((e: any) => {
+          reject(e)
+        })
+    })
+  },
+}
+
+function useHttp() {
+  const appkitOptions = useAppKitOptions()
+  const headers: any = {
+    Token: appkitOptions.tempToken() || appkitOptions.token(),
+    Appcode: appkitOptions.app(),
+    cookie: `tid=${appkitOptions.tenant()}`,
+    gray: appkitOptions.gray ? appkitOptions.gray() : '0',
+  }
+
+  /**
+   * 传入配置获取 Http instanse
+   */
+  const $http = createHttp({
+    vendor,
+    baseUrl: appkitOptions.baseUrl(),
+    headers,
+    interceptors: [
+      (raw) => {
+        if (raw.status == 401) {
+          appkitOptions[401]()
+          return true
+        }
+        return false
+      },
+      (raw) => {
+        if (raw.status > 500 && raw.status != 51015 && raw.status != 51014) {
+          showToast({
+            title: raw.message,
+            icon: 'none',
+          })
+          return true
+        }
+        return false
+      },
+    ],
+    paging: {
+      translate: (params: PagingParams) => ({
+        pageNum: params.page,
+        pageSize: params.pageSize || 10,
+      }),
+      transform(data: any): PagingData {
+        const totalRecords = +data.total || 0,
+          pageSize = +data.pageSize || 10,
+          total = data.pages || Math.ceil(totalRecords / pageSize),
+          isLastPage = data.pages === data.pageNum
+        return {
+          total,
+          totalRecords,
+          isLastPage,
+        }
+      },
+    },
+    translates,
+    transforms,
+  })
+  return $http
+}
+
+export { useHttp }
+
+export * from './endpoints'

package/src/user/components/LoginSetting.vue

@@ -1,114 +1,114 @@
-<template>
-  <div class="login-setting" :style="style" v-if="show && showLoginRule">
-    <img
-      class="login-setting-img"
-      src="https://cdn.ddjf.com/static/images/nutshell/empty-permission.png"
-    />
-    <div class="login-setting-text">
-      {{ loginRuleTip }}
-    </div>
-  </div>
-</template>
-
-<script lang="ts" setup>
-import { computed, ref, onMounted } from 'vue'
-import { useHttp } from '../api'
-import { useAppKitOptions } from '../../Appkit'
-import { useSafeArea } from '../../shared/composables'
-import { useDidShow } from '@tarojs/taro'
-import debounce from 'lodash-es/debounce'
-
-const props = withDefaults(
-  defineProps<{
-    app: string
-    withTabbar?: boolean
-    withNavbar?: boolean
-    show?: boolean
-  }>(),
-  {
-    app: '',
-    withTabbar: false,
-    withNavbar: false,
-    show: true,
-  }
-)
-
-const safeArea = useSafeArea()
-const showLoginRule = ref<boolean>(false)
-const loginRuleTip = ref('')
-
-const style = computed(() => {
-  let str = ''
-  if (props.withTabbar) {
-    str += `bottom: ${safeArea.menuRect.bottom + 5}px;`
-  }
-  if (props.withNavbar) {
-    str += `top: ${safeArea.nav + safeArea.status + 5}px;`
-  }
-  return str
-})
-
-onMounted(() => {
-  checkLoginTimeRule()
-})
-useDidShow(() => {
-  checkLoginTimeRule()
-})
-
-// 检验登录时间
-const checkLoginTimeRule = debounce(() => {
-  const appkitOptions = useAppKitOptions()
-
-  const $http = useHttp()
-  $http
-    .post('/cas/sysUser/checkLoginTimeRule', {
-      appCode: props.app || appkitOptions.app(),
-      tenantId: appkitOptions.tenant(),
-      device: 'mini',
-    })
-    .then((result: any) => {
-      if (result === true) {
-        showLoginRule.value = false
-        loginRuleTip.value = ''
-        emits('show', loginRuleTip.value)
-        return
-      } else if (result.status) {
-        showLoginRule.value = true
-        loginRuleTip.value = result.message
-        emits('show', loginRuleTip.value)
-      }
-    })
-}, 100)
-
-// 父组件事件
-const emits = defineEmits(['show'])
-</script>
-
-<style lang="scss">
-.login-setting {
-  position: fixed;
-  z-index: 4;
-  left: 12px;
-  top: 10px;
-  bottom: 10px;
-  align-items: center;
-  width: calc(100% - 24px);
-  background: #ffffff;
-  border-radius: 5px;
-  display: flex;
-  flex-direction: column;
-  &-img {
-    margin-top: 50%;
-    height: 111px;
-    width: 198px;
-  }
-  &-text {
-    margin-top: 10px;
-    color: #353535;
-    opacity: 0.4;
-    font-size: 12px;
-    padding: 0 30px;
-    text-align: center;
-  }
-}
-</style>
+<template>
+  <div class="login-setting" :style="style" v-if="show && showLoginRule">
+    <img
+      class="login-setting-img"
+      src="https://cdn.ddjf.com/static/images/nutshell/empty-permission.png"
+    />
+    <div class="login-setting-text">
+      {{ loginRuleTip }}
+    </div>
+  </div>
+</template>
+
+<script lang="ts" setup>
+import { computed, ref, onMounted } from 'vue'
+import { useHttp } from '../api'
+import { useAppKitOptions } from '../../Appkit'
+import { useSafeArea } from '../../shared/composables'
+import { useDidShow } from '@tarojs/taro'
+import debounce from 'lodash-es/debounce'
+
+const props = withDefaults(
+  defineProps<{
+    app: string
+    withTabbar?: boolean
+    withNavbar?: boolean
+    show?: boolean
+  }>(),
+  {
+    app: '',
+    withTabbar: false,
+    withNavbar: false,
+    show: true,
+  }
+)
+
+const safeArea = useSafeArea()
+const showLoginRule = ref<boolean>(false)
+const loginRuleTip = ref('')
+
+const style = computed(() => {
+  let str = ''
+  if (props.withTabbar) {
+    str += `bottom: ${safeArea.menuRect.bottom + 5}px;`
+  }
+  if (props.withNavbar) {
+    str += `top: ${safeArea.nav + safeArea.status + 5}px;`
+  }
+  return str
+})
+
+onMounted(() => {
+  checkLoginTimeRule()
+})
+useDidShow(() => {
+  checkLoginTimeRule()
+})
+
+// 检验登录时间
+const checkLoginTimeRule = debounce(() => {
+  const appkitOptions = useAppKitOptions()
+
+  const $http = useHttp()
+  $http
+    .post('/cas/sysUser/checkLoginTimeRule', {
+      appCode: props.app || appkitOptions.app(),
+      tenantId: appkitOptions.tenant(),
+      device: 'mini',
+    })
+    .then((result: any) => {
+      if (result === true) {
+        showLoginRule.value = false
+        loginRuleTip.value = ''
+        emits('show', loginRuleTip.value)
+        return
+      } else if (result.status) {
+        showLoginRule.value = true
+        loginRuleTip.value = result.message
+        emits('show', loginRuleTip.value)
+      }
+    })
+}, 100)
+
+// 父组件事件
+const emits = defineEmits(['show'])
+</script>
+
+<style lang="scss">
+.login-setting {
+  position: fixed;
+  z-index: 4;
+  left: 12px;
+  top: 10px;
+  bottom: 10px;
+  align-items: center;
+  width: calc(100% - 24px);
+  background: #ffffff;
+  border-radius: 5px;
+  display: flex;
+  flex-direction: column;
+  &-img {
+    margin-top: 50%;
+    height: 111px;
+    width: 198px;
+  }
+  &-text {
+    margin-top: 10px;
+    color: #353535;
+    opacity: 0.4;
+    font-size: 12px;
+    padding: 0 30px;
+    text-align: center;
+  }
+}
+</style>