@uxda/appkit 1.2.0 → 1.2.2

package/dist/index.js

@@ -2169,6 +2169,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,7 +2224,13 @@ var script$2 = /* @__PURE__ */ defineComponent({
     const selectedItem = ref([]);
     const options = computed(() => {
       const provinceOption = areaFormatOptions.value;
+      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];
     });
@@ -2232,7 +2239,7 @@ var script$2 = /* @__PURE__ */ defineComponent({
       tmpSelectedIndex.value = [...selectedIndex.value];
       if (props.value) {
         const items = [];
-        for (let index = 0; index < selectedIndex.value.length; index++) {
+        for (let index = 0; index < options.value.length; index++) {
           const item = options.value[index][selectedIndex.value[index]];
           if (item) {
             items.push(item);
@@ -2268,7 +2275,7 @@ 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: []
@@ -2724,6 +2731,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"])
                     ]),

package/package.json

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

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,7 +85,13 @@ const selectedItem = ref<AreaItem[]>([])
 
 const options = computed<AreaItem[][]>(() => {
   const provinceOption = areaFormatOptions.value
+  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]
 })
@@ -91,7 +101,7 @@ function init() {
   tmpSelectedIndex.value = [...selectedIndex.value]
   if (props.value){
     const items = []
-    for (let index = 0; index < selectedIndex.value.length; index++) {
+    for (let index = 0; index < options.value.length; index++) {
       const item = options.value[index][selectedIndex.value[index]]
       if (item){
         items.push(item)
@@ -129,7 +139,7 @@ function findIndexByValue() {
 }
 
 function onChange() {
-  const lastSelectedIndex = options.value[2].length ? 2 : 1
+  const lastSelectedIndex = options.value.length - 1
   const result = {
     values: [],
     labels: []

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>