From a998f1d180715d46428afa0e440595faa4c389ab Mon Sep 17 00:00:00 2001
From: linju <linju@dcloud.io>
Date: Mon, 18 Dec 2023 20:27:48 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=20=E5=8D=87=E7=BA=A7?=
 =?UTF-8?q?=E4=BE=9D=E8=B5=96=E7=9A=84uni-captcha=E7=9A=84=E7=89=88?=
 =?UTF-8?q?=E6=9C=AC=E4=B8=BA0.7.5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 uni_modules/uni-captcha/changelog.md          |  4 +
 .../uni-popup-captcha/uni-popup-captcha.uvue  |  4 -
 .../uni-popup/uni-popup.uvue                  | 82 -------------------
 uni_modules/uni-captcha/package.json          | 12 +--
 uni_modules/uni-id-pages-x/changelog.md       |  2 +
 .../components/uni-popup/uni-popup.uvue       |  5 +-
 6 files changed, 14 insertions(+), 95 deletions(-)
 delete mode 100644 uni_modules/uni-captcha/components/uni-popup-captcha/uni-popup/uni-popup.uvue

diff --git a/uni_modules/uni-captcha/changelog.md b/uni_modules/uni-captcha/changelog.md
index 5d530f3..34fde9c 100644
--- a/uni_modules/uni-captcha/changelog.md
+++ b/uni_modules/uni-captcha/changelog.md
@@ -1,3 +1,7 @@
+## 0.7.5（2023-12-18）
+- 修复 在uni-app x项目，部分情况下，执行uni-captcha组件的setFocus无效的问题
+## 0.7.4（2023-12-18）
+- 更新 `package.json` -> `dependencies` 增加 `uni-popup`
 ## 0.7.3（2023-11-15）
 - 更新 uni-popup-captcha.uvue依赖的popup组件，直接使用uni_modules下的uni-popup组件
 ## 0.7.2（2023-11-07）
diff --git a/uni_modules/uni-captcha/components/uni-popup-captcha/uni-popup-captcha.uvue b/uni_modules/uni-captcha/components/uni-popup-captcha/uni-popup-captcha.uvue
index 24be570..bb6a556 100644
--- a/uni_modules/uni-captcha/components/uni-popup-captcha/uni-popup-captcha.uvue
+++ b/uni_modules/uni-captcha/components/uni-popup-captcha/uni-popup-captcha.uvue
@@ -14,12 +14,8 @@
 </template>
 
 <script>
-  import uniPopup from './uni-popup/uni-popup.uvue';
   let confirmCallBack = ():void=>console.log('未传入回调函数')
   export default {
-    components: {
-      uniPopup
-    },
     emits:["modelValue","confirm","cancel"],
     data() {
       return {
diff --git a/uni_modules/uni-captcha/components/uni-popup-captcha/uni-popup/uni-popup.uvue b/uni_modules/uni-captcha/components/uni-popup-captcha/uni-popup/uni-popup.uvue
deleted file mode 100644
index 0fa2388..0000000
--- a/uni_modules/uni-captcha/components/uni-popup-captcha/uni-popup/uni-popup.uvue
+++ /dev/null
@@ -1,82 +0,0 @@
-<template>
-  <view class="popup-root" v-if="isOpen" v-show="isShow" @click="clickMask">
-    <view @click.stop>
-      <slot></slot>
-    </view>
-  </view>
-</template>
-
-<script>
-  type CloseCallBack = ()=> void;
-  let closeCallBack:CloseCallBack = () :void => {};
-  export default {
-    emits:["close","clickMask"],
-    data() {
-      return {
-        isShow:false,
-        isOpen:false
-      }
-    },
-    watch: {
-      // 设置show = true 时，如果没有 open 需要设置为 open
-      isShow:{
-        handler(isShow) {
-          // console.log("isShow",isShow)
-          if(isShow && this.isOpen == false){
-            this.isOpen = true
-          }
-        },
-        immediate:true
-      },
-      // 设置isOpen = true 时，如果没有 isShow 需要设置为 isShow
-      isOpen:{
-        handler(isOpen) {
-          // console.log("isOpen",isOpen)
-          if(isOpen && this.isShow == false){
-            this.isShow = true
-          }
-        },
-        immediate:true
-      }
-    },
-    methods:{
-      open(){
-        // ...funs : CloseCallBack[]
-        // if(funs.length > 0){
-        //   closeCallBack = funs[0]
-        // }
-        this.isOpen = true;
-      },
-      clickMask(){
-        this.$emit('clickMask')
-        this.close()
-      },
-      close(): void{
-        this.isOpen = false;
-        this.$emit('close')
-        closeCallBack()
-      },
-      hiden(){
-        this.isShow = false
-      },
-      show(){
-        this.isShow = true
-      }
-    }
-  }
-</script>
-
-<style>
-.popup-root {
-  position: fixed;
-  top: 0;
-  left: 0;
-  width: 750rpx;
-  height: 100%;
-  flex: 1;
-  background-color: rgba(0, 0, 0, 0.3);
-  justify-content: center;
-  align-items: center;
-  z-index: 99;
-}
-</style>
\ No newline at end of file
diff --git a/uni_modules/uni-captcha/package.json b/uni_modules/uni-captcha/package.json
index f6712a8..c631219 100644
--- a/uni_modules/uni-captcha/package.json
+++ b/uni_modules/uni-captcha/package.json
@@ -1,7 +1,7 @@
 {
   "id": "uni-captcha",
   "displayName": "uni-captcha",
-  "version": "0.7.3",
+  "version": "0.7.5",
   "description": "云端一体图形验证码组件",
   "keywords": [
     "captcha",
@@ -14,7 +14,7 @@
   "engines": {
     "HBuilderX": "^3.1.0"
   },
-"dcloudext": {
+  "dcloudext": {
     "sale": {
       "regular": {
         "price": "0.00"
@@ -35,7 +35,9 @@
     "type": "unicloud-template-function"
   },
   "uni_modules": {
-    "dependencies": [],
+    "dependencies": [
+      "uni-popup"
+    ],
     "encrypt": [],
     "platforms": {
       "cloud": {
@@ -72,8 +74,8 @@
           "联盟": "u"
         },
         "Vue": {
-            "vue2": "y",
-            "vue3": "u"
+          "vue2": "y",
+          "vue3": "u"
         }
       }
     }
diff --git a/uni_modules/uni-id-pages-x/changelog.md b/uni_modules/uni-id-pages-x/changelog.md
index 6917c79..5891557 100644
--- a/uni_modules/uni-id-pages-x/changelog.md
+++ b/uni_modules/uni-id-pages-x/changelog.md
@@ -1,3 +1,5 @@
+## 1.0.5（2023-12-18）
+更新 升级依赖的uni-captcha的版本为0.7.5
 ## 1.0.4（2023-12-16）
 新增 支持一键登录
 ## 1.0.3（2023-11-23）
diff --git a/uni_modules/uni-popup/components/uni-popup/uni-popup.uvue b/uni_modules/uni-popup/components/uni-popup/uni-popup.uvue
index b84695b..5eb8d5b 100644
--- a/uni_modules/uni-popup/components/uni-popup/uni-popup.uvue
+++ b/uni_modules/uni-popup/components/uni-popup/uni-popup.uvue
@@ -1,6 +1,6 @@
 <template>
   <view class="popup-root" v-if="isOpen" v-show="isShow" @click="clickMask">
-    <view class="popup-container" @click.stop>
+    <view @click.stop>
       <slot></slot>
     </view>
   </view>
@@ -87,7 +87,4 @@
   align-items: center;
   z-index: 99;
 }
-.popup-container {
-	margin-top: -120px;
-}
 </style>
\ No newline at end of file
-- 
GitLab