From bc70b9d6af31ad7011f666c3c65f2e475fcb3265 Mon Sep 17 00:00:00 2001
From: baozhoutao <baozhoutao@hotoa.com>
Date: Mon, 9 Sep 2024 17:40:46 +0800
Subject: [PATCH] =?UTF-8?q?fix=20[Task]:=20=E6=96=B0=E5=BB=BA=E7=94=A8?=
 =?UTF-8?q?=E6=88=B7=E6=97=B6,=20=E5=85=81=E8=AE=B8=E5=A1=AB=E5=86=99?=
 =?UTF-8?q?=E5=AF=86=E7=A0=81=E5=AD=97=E6=AE=B5=E3=80=81=E5=BC=BA=E5=88=B6?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=AF=86=E7=A0=81=EF=BC=88=E9=BB=98=E8=AE=A4?=
 =?UTF-8?q?=E6=89=93=E9=92=A9=EF=BC=89=20#6978?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../objects/space_users/fields/password.field.yml        | 9 ++++-----
 .../space_users/fields/password_expired.field.yml        | 2 +-
 .../main/default/triggers/space_users.trigger.js         | 4 ++--
 3 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/services/standard-space/main/default/objects/space_users/fields/password.field.yml b/services/standard-space/main/default/objects/space_users/fields/password.field.yml
index cea8c52f36..61c831cad7 100644
--- a/services/standard-space/main/default/objects/space_users/fields/password.field.yml
+++ b/services/standard-space/main/default/objects/space_users/fields/password.field.yml
@@ -1,6 +1,5 @@
 name: password
-label: Password
-type: text
-omit: true
-hidden: true
-sort_no: 340
+label: 密码
+type: password
+sort_no: 355
+visible_on: "{{recordId ? false : true}}"
\ No newline at end of file
diff --git a/services/standard-space/main/default/objects/space_users/fields/password_expired.field.yml b/services/standard-space/main/default/objects/space_users/fields/password_expired.field.yml
index a15b4a55d2..0a0f0d46ff 100644
--- a/services/standard-space/main/default/objects/space_users/fields/password_expired.field.yml
+++ b/services/standard-space/main/default/objects/space_users/fields/password_expired.field.yml
@@ -4,4 +4,4 @@ type: boolean
 omit: false
 hidden: false
 sort_no: 360
-visible_on: "{{recordId ? true : false}}"
\ No newline at end of file
+defaultValue: true
diff --git a/services/standard-space/main/default/triggers/space_users.trigger.js b/services/standard-space/main/default/triggers/space_users.trigger.js
index c48faeee01..3f4e8fa6f9 100644
--- a/services/standard-space/main/default/triggers/space_users.trigger.js
+++ b/services/standard-space/main/default/triggers/space_users.trigger.js
@@ -2,7 +2,7 @@
  * @Author: sunhaolin@hotoa.com
  * @Date: 2022-12-07 14:19:57
  * @LastEditors: baozhoutao@steedos.com
- * @LastEditTime: 2024-03-22 09:57:48
+ * @LastEditTime: 2024-09-09 17:39:13
  * @Description: 
  */
 "use strict";
@@ -472,7 +472,7 @@ module.exports = {
                     password.parsePassword(doc.password, options);
                     delete doc.password;
                 }
-
+                options.password_expired = doc.password_expired
                 doc.user = (await userObj.insert(options))._id;
             }
             if (!doc.user) {