@uxda/appkit 1.2.0 → 1.2.4

package/dist/index.js

@@ -388,7 +388,8 @@ const appKitOptions = {
   tempToken: () => "",
   baseUrl: () => "",
   401() {
-  }
+  },
+  gray: () => ""
 };
 const useAppKitOptions = () => {
   if (!globalData.$appKitOptions) {
@@ -422,7 +423,8 @@ function useHttp$1() {
   const headers = {
     Token: appkitOptions.token(),
     Appcode: appkitOptions.app(),
-    cookie: `tid=${appkitOptions.tenant()}`
+    cookie: `tid=${appkitOptions.tenant()}`,
+    gray: appkitOptions.gray()
   };
   const $http = createHttp({
     vendor: vendor$1,
@@ -809,7 +811,8 @@ function useHttp() {
   const headers = {
     Token: appkitOptions.token(),
     Appcode: appkitOptions.app(),
-    cookie: `tid=${appkitOptions.tenant()}`
+    cookie: `tid=${appkitOptions.tenant()}`,
+    gray: appkitOptions.gray()
   };
   const $http = createHttp({
     vendor,
@@ -2169,6 +2172,7 @@ var script$2 = /* @__PURE__ */ defineComponent({
     rightIcon: { type: Boolean, required: false, default: true },
     placeholder: { type: String, required: false, default: "\u8BF7\u9009\u62E9" },
     disabled: { type: Boolean, required: false, default: false },
+    type: { type: String, required: false, default: "region" },
     formatter: { type: Function, required: false, default: (values) => values.map((item) => item.label).join("") }
   },
   emits: ["update:value", "change", "cancel"],
@@ -2223,8 +2227,14 @@ var script$2 = /* @__PURE__ */ defineComponent({
     const selectedItem = ref([]);
     const options = computed(() => {
       const provinceOption = areaFormatOptions.value;
-      const cityOption = provinceOption[tmpSelectedIndex.value[0]].children;
-      const regionOption = cityOption[tmpSelectedIndex.value[1]].children;
+      if (props.type === "province") {
+        return [provinceOption];
+      }
+      const cityOption = provinceOption[tmpSelectedIndex.value[0]]?.children ?? [];
+      if (props.type === "city") {
+        return [provinceOption, cityOption];
+      }
+      const regionOption = cityOption[tmpSelectedIndex.value[1]]?.children ?? [];
       return [provinceOption, cityOption, regionOption];
     });
     function init() {
@@ -2232,8 +2242,8 @@ var script$2 = /* @__PURE__ */ defineComponent({
       tmpSelectedIndex.value = [...selectedIndex.value];
       if (props.value) {
         const items = [];
-        for (let index = 0; index < selectedIndex.value.length; index++) {
-          const item = options.value[index][selectedIndex.value[index]];
+        for (let index = 0; index < options.value.length; index++) {
+          const item = options.value[index]?.[selectedIndex.value[index]];
           if (item) {
             items.push(item);
           }
@@ -2268,15 +2278,17 @@ var script$2 = /* @__PURE__ */ defineComponent({
       return [0, 0, 0];
     }
     function onChange() {
-      const lastSelectedIndex = options.value[2].length ? 2 : 1;
+      const lastSelectedIndex = options.value.length - 1;
       const result = {
         values: [],
         labels: []
       };
       for (let index = 0; index <= lastSelectedIndex; index++) {
-        const item = options.value[index][tmpSelectedIndex.value[index]];
-        result.values.push(item.value);
-        result.labels.push(item.label);
+        const item = options.value[index]?.[tmpSelectedIndex.value[index]];
+        if (item) {
+          result.values.push(item.value);
+          result.labels.push(item.label);
+        }
       }
       emit("update:value", result.values[result.values.length - 1]);
       emit("change", result);
@@ -2724,6 +2736,7 @@ var script = /* @__PURE__ */ defineComponent({
                       createVNode(script$2, {
                         value: formState.areaCode,
                         "onUpdate:value": _cache[6] || (_cache[6] = ($event) => formState.areaCode = $event),
+                        type: "city",
                         placeholder: "\u8BF7\u9009\u62E9"
                       }, null, 8, ["value"])
                     ]),
@@ -2776,9 +2789,7 @@ const nutComponents = [
 const appComponents = {
   ...components
 };
-const services = [
-  ...services$1
-];
+const services = [...services$1];
 const $app = {
   setToken: (token) => {
     const appKitOptions = useAppKitOptions();
@@ -2807,6 +2818,7 @@ const AppKit = {
     appKitOptions.token = options.token;
     appKitOptions.baseUrl = options.baseUrl;
     appKitOptions[401] = options[401];
+    appKitOptions.gray = options.gray;
     nutComponents.forEach((component) => {
       app.use(component);
     });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@uxda/appkit",
-  "version": "1.2.0",
+  "version": "1.2.4",
   "description": "小程序应用开发包",
   "main": "dist/index.js",
   "module": "dist/index.ts",

package/src/Appkit.ts

@@ -8,34 +8,38 @@ export type AppKitOptions = {
   /**
    * 应用
    */
-  app (): string,
+  app(): string
   /**
    * 租户
    */
-  tenant (): string,
+  tenant(): string
   /**
    * token 获取方法
    * 由使用场景提供
    */
-  token (): string,
+  token(): string
   /**
    * 临时 token 获取方法
    * 由使用场景提供
    */
-  tempToken: () => string,
+  tempToken: () => string
   /**
    * 调用 API 时使用的 base url
    */
-  baseUrl (): string,
-  
-  401 (): void
+  baseUrl(): string
+
+  401(): void
+  /**
+   * http灰度标记
+   */
+  gray(): string
 }
 
 export type DollarApp = {
-  setToken: (token: () => string) => void,
-  setTempToken: (token: () => string) => void,
-  requestPayment: (options: PaymentParams) => void,
-  invokeRecharge: (options: RechargeParams) => void,
+  setToken: (token: () => string) => void
+  setTempToken: (token: () => string) => void
+  requestPayment: (options: PaymentParams) => void
+  invokeRecharge: (options: RechargeParams) => void
 }
 
 /**
@@ -47,7 +51,8 @@ const appKitOptions: AppKitOptions = {
   token: () => '',
   tempToken: () => '',
   baseUrl: () => '',
-  401 () {}
+  401() {},
+  gray: () => '',
 }
 
 const useAppKitOptions = () => {
@@ -57,8 +62,4 @@ const useAppKitOptions = () => {
   return globalData.$appKitOptions as AppKitOptions
 }
 
-
-
-export {
-  useAppKitOptions,
-}
+export { useAppKitOptions }

package/src/balance/api/index.ts

@@ -3,38 +3,40 @@ import { HttpRequestConfig, PagingData, PagingParams, ResponseRaw, createHttp }
 import { translates, transforms } from './endpoints'
 import { useAppKitOptions } from '../../Appkit'
 
-
 /**
  * 小程序端 Http
  * 使用 Taro.request 实现
  */
 const vendor = {
-  async request <T>(config: HttpRequestConfig) {
+  async request<T>(config: HttpRequestConfig) {
     return new Promise<ResponseRaw<T>>((resolve, reject) => {
       Taro.request({
         url: config.url,
         method: config.method,
         header: config.headers,
-        data: config.data
-      }).then(({data}) => {
-        resolve({
-          status: +data.code,
-          message: data.msg,
-          data: data.result as T
-        })
-      }).catch((e: any) => {
-        reject(e)
+        data: config.data,
       })
+        .then(({ data }) => {
+          resolve({
+            status: +data.code,
+            message: data.msg,
+            data: data.result as T,
+          })
+        })
+        .catch((e: any) => {
+          reject(e)
+        })
     })
-  }
+  },
 }
 
-function useHttp () {
+function useHttp() {
   const appkitOptions = useAppKitOptions()
   const headers = {
     Token: appkitOptions.token(),
     Appcode: appkitOptions.app(),
-    cookie: `tid=${appkitOptions.tenant()}`
+    cookie: `tid=${appkitOptions.tenant()}`,
+    gray: appkitOptions.gray(),
   }
   /**
    * 传入配置获取 Http instanse
@@ -44,30 +46,30 @@ function useHttp () {
     baseUrl: appkitOptions.baseUrl(),
     headers,
     interceptors: [
-      raw => {
+      (raw) => {
         if (raw.status == 401) {
           appkitOptions[401]()
           return true
         }
         return false
       },
-      raw => {
+      (raw) => {
         if (raw.status > 500) {
           return true
         }
         return false
-      }
+      },
     ],
     paging: {
       translate: (params: PagingParams) => ({
         pageNum: params.page,
-        pageSize: params.pageSize
+        pageSize: params.pageSize,
       }),
-      transform (data: any): PagingData {
+      transform(data: any): PagingData {
         return {
-          totalPages: data.pages
+          totalPages: data.pages,
         }
-      }
+      },
     },
     translates,
     transforms,
@@ -75,8 +77,6 @@ function useHttp () {
   return $http
 }
 
-export {
-  useHttp
-}
+export { useHttp }
 
 export * from './endpoints'

package/src/components/dd-area/index.vue

@@ -14,11 +14,14 @@ interface AreaItem {
   children: AreaItem[]
 }
 
-interface PropsType {
+export type AreaType = 'province' | 'city' | 'region'
+
+export interface PropsType {
   value?: string // 地址code
   rightIcon?: boolean
   placeholder?: string
   disabled?: boolean
+  type?: AreaType
   formatter?: (values: AreaItem[]) => string
 }
 
@@ -27,6 +30,7 @@ const props = withDefaults(defineProps<PropsType>(), {
   rightIcon: true,
   placeholder: '请选择',
   disabled: false,
+  type: 'region',
   formatter: (values: AreaItem[]) => values.map((item:AreaItem) => item.label).join('')
 })
 const emit = defineEmits(['update:value', 'change', 'cancel'])
@@ -81,18 +85,24 @@ const selectedItem = ref<AreaItem[]>([])
 
 const options = computed<AreaItem[][]>(() => {
   const provinceOption = areaFormatOptions.value
-  const cityOption = provinceOption[tmpSelectedIndex.value[0]].children
-  const regionOption = cityOption[tmpSelectedIndex.value[1]].children
+  if (props.type === 'province') {
+    return [provinceOption]
+  }
+  const cityOption = provinceOption[tmpSelectedIndex.value[0]]?.children ?? []
+  if (props.type === 'city') {
+    return [provinceOption, cityOption]
+  }
+  const regionOption = cityOption[tmpSelectedIndex.value[1]]?.children ?? []
   return [provinceOption, cityOption, regionOption]
 })
 
 function init() {
   selectedIndex.value = findIndexByValue()
   tmpSelectedIndex.value = [...selectedIndex.value]
-  if (props.value){
+  if (props.value) {
     const items = []
-    for (let index = 0; index < selectedIndex.value.length; index++) {
-      const item = options.value[index][selectedIndex.value[index]]
+    for (let index = 0; index < options.value.length; index++) {
+      const item = options.value[index]?.[selectedIndex.value[index]]
       if (item){
         items.push(item)
       }
@@ -129,15 +139,17 @@ function findIndexByValue() {
 }
 
 function onChange() {
-  const lastSelectedIndex = options.value[2].length ? 2 : 1
+  const lastSelectedIndex = options.value.length - 1
   const result = {
     values: [],
     labels: []
   }
   for (let index = 0; index <= lastSelectedIndex; index++) {
-   const item = options.value[index][tmpSelectedIndex.value[index]]
-    result.values.push(item.value)
-    result.labels.push(item.label)
+   const item = options.value[index]?.[tmpSelectedIndex.value[index]]
+    if (item){
+      result.values.push(item.value)
+      result.labels.push(item.label)
+    }
   }
   emit('update:value', result.values[result.values.length-1])
   emit('change', result)

package/src/index.ts

@@ -12,7 +12,7 @@ import {
   Form,
   FormItem,
   Cell,
-  CellGroup
+  CellGroup,
 } from '@nutui/nutui-taro'
 import { type AppKitOptions, useAppKitOptions, DollarApp } from './Appkit'
 import { PaymentParams, RechargeParams } from './payment/types'
@@ -29,16 +29,14 @@ const nutComponents = [
   Form,
   FormItem,
   Cell,
-  CellGroup
+  CellGroup,
 ]
 
 const appComponents = {
-  ...paymentComponents
+  ...paymentComponents,
 }
 
-const services = [
-  ...paymentServices
-]
+const services = [...paymentServices]
 
 const $app: DollarApp = {
   setToken: (token: () => string) => {
@@ -50,32 +48,33 @@ const $app: DollarApp = {
     appKitOptions.tempToken = token
   },
   requestPayment: (options: PaymentParams) => {},
-  invokeRecharge: (options: RechargeParams) => {}
+  invokeRecharge: (options: RechargeParams) => {},
 }
 
-services.forEach(service => {
+services.forEach((service) => {
   service.install($app)
 })
 
-export function useAppKit (): DollarApp {
+export function useAppKit(): DollarApp {
   return $app
 }
 
 const AppKit = {
-  install (app: App, options: AppKitOptions) {
+  install(app: App, options: AppKitOptions) {
     const appKitOptions = useAppKitOptions()
     appKitOptions.app = options.app
     appKitOptions.tenant = options.tenant
     appKitOptions.token = options.token
     appKitOptions.baseUrl = options.baseUrl
     appKitOptions[401] = options[401]
-    nutComponents.forEach(component => {
+    appKitOptions.gray = options.gray
+    nutComponents.forEach((component) => {
       app.use(component)
     })
     Object.entries(appComponents).forEach(([name, component]) => {
       app.component(name, component)
     })
-  }
+  },
 }
 
 export default AppKit
@@ -84,6 +83,4 @@ export * from './payment'
 export * from './balance'
 export * from './shared'
 export * from './register'
-export {
-  type AppKitOptions
-}
+export { type AppKitOptions }

package/src/payment/api/index.ts

@@ -3,38 +3,40 @@ import { HttpRequestConfig, ResponseRaw, createHttp } from '../../shared'
 import { translates, transforms } from './endpoints'
 import { useAppKitOptions } from '../../Appkit'
 
-
 /**
  * 小程序端 Http
  * 使用 Taro.request 实现
  */
 const vendor = {
-  async request <T>(config: HttpRequestConfig) {
+  async request<T>(config: HttpRequestConfig) {
     return new Promise<ResponseRaw<T>>((resolve, reject) => {
       Taro.request({
         url: config.url,
         method: config.method,
         header: config.headers,
-        data: config.data
-      }).then(({data}) => {
-        resolve({
-          status: data.code,
-          message: data.msg,
-          data: data.result as T
-        })
-      }).catch((e: any) => {
-        reject(e)
+        data: config.data,
       })
+        .then(({ data }) => {
+          resolve({
+            status: data.code,
+            message: data.msg,
+            data: data.result as T,
+          })
+        })
+        .catch((e: any) => {
+          reject(e)
+        })
     })
-  }
+  },
 }
 
-function useHttp () {
+function useHttp() {
   const appkitOptions = useAppKitOptions()
   const headers = {
     Token: appkitOptions.token(),
     Appcode: appkitOptions.app(),
-    cookie: `tid=${appkitOptions.tenant()}`
+    cookie: `tid=${appkitOptions.tenant()}`,
+    gray: appkitOptions.gray(),
   }
   /**
    * 传入配置获取 Http instanse
@@ -44,19 +46,19 @@ function useHttp () {
     baseUrl: appkitOptions.baseUrl(),
     headers,
     interceptors: [
-      raw => {
+      (raw) => {
         if (raw.status == 401) {
           appkitOptions[401]()
           return true
         }
         return false
       },
-      raw => {
+      (raw) => {
         if (raw.status > 500) {
           return true
         }
         return false
-      }
+      },
     ],
     translates,
     transforms,
@@ -64,8 +66,6 @@ function useHttp () {
   return $http
 }
 
-export {
-  useHttp
-}
+export { useHttp }
 
 export * from './endpoints'

package/src/register/components/SelfRegistration.vue

@@ -1,7 +1,7 @@
 <script setup lang="ts">
-import {reactive, ref} from 'vue'
+import { reactive } from 'vue'
 import OcrId from './../../components/ocr-id/index.vue'
-import {OcrResultType} from './../../components/ocr-id/index.vue'
+import { OcrResultType } from '../../components/ocr-id/types'
 import DdArea from './../../components/dd-area/index.vue'
 import DdSelector from './../../components/dd-selector/index.vue'
 import Taro from "@tarojs/taro";
@@ -144,6 +144,7 @@ async function submit() {
           <nut-form-item label="所在地区" required>
             <DdArea
                 v-model:value="formState.areaCode"
+                type="city"
                 placeholder="请选择"/>
           </nut-form-item>
         </template>