@tachybase/client 1.3.19 → 1.3.20

package/lib/schema-settings/VariableInput/hooks/useExactDateVariable.js

@@ -0,0 +1,112 @@
+"use strict";
+var __webpack_require__ = {};
+(()=>{
+    __webpack_require__.d = (exports1, definition)=>{
+        for(var key in definition)if (__webpack_require__.o(definition, key) && !__webpack_require__.o(exports1, key)) Object.defineProperty(exports1, key, {
+            enumerable: true,
+            get: definition[key]
+        });
+    };
+})();
+(()=>{
+    __webpack_require__.o = (obj, prop)=>Object.prototype.hasOwnProperty.call(obj, prop);
+})();
+(()=>{
+    __webpack_require__.r = (exports1)=>{
+        if ('undefined' != typeof Symbol && Symbol.toStringTag) Object.defineProperty(exports1, Symbol.toStringTag, {
+            value: 'Module'
+        });
+        Object.defineProperty(exports1, '__esModule', {
+            value: true
+        });
+    };
+})();
+var __webpack_exports__ = {};
+__webpack_require__.r(__webpack_exports__);
+__webpack_require__.d(__webpack_exports__, {
+    useExactDateVariable: ()=>useExactDateVariable,
+    useExactDateVariableContext: ()=>useExactDateVariableContext
+});
+const external_react_namespaceObject = require("react");
+const external_react_i18next_namespaceObject = require("react-i18next");
+const operators_js_namespaceObject = require("../../../collection-manager/interfaces/properties/operators.js");
+const index_js_namespaceObject = require("../../../flag-provider/index.js");
+const util_js_namespaceObject = require("../../../schema-component/antd/date-picker/util.js");
+const useExactDateVariableContext = ()=>{
+    const exactDateTimeCtx = (0, external_react_namespaceObject.useMemo)(()=>(0, util_js_namespaceObject.getDateExact)(), []);
+    return {
+        exactDateTimeCtx
+    };
+};
+const useExactDateVariable = function() {
+    let { schema, targetFieldSchema } = arguments.length > 0 && void 0 !== arguments[0] ? arguments[0] : {};
+    var _collectionField_uiSchema;
+    const { collectionField } = (0, index_js_namespaceObject.useFlag)();
+    const { dateOnly, utc, accuracy, picker } = (null == collectionField ? void 0 : null == (_collectionField_uiSchema = collectionField.uiSchema) ? void 0 : _collectionField_uiSchema['x-component-props']) || {};
+    const { t } = (0, external_react_i18next_namespaceObject.useTranslation)();
+    const exactDateTimeSettings = (0, external_react_namespaceObject.useMemo)(()=>{
+        const getDateKeys = (key)=>{
+            if (!picker) {
+                if ('now' === key) return 'nowLocal';
+                if ('today' === key) return 'todayDate';
+                if ('yesterday' === key) return 'yesterdayDate';
+                if ('tomorrow' === key) return 'tomorrowDate';
+            }
+            if (dateOnly) {
+                if ('now' === key) return null;
+                return "".concat(key, "Date");
+            }
+            return "".concat(key).concat(utc || accuracy ? 'Utc' : 'Local');
+        };
+        const dateOptions = [
+            {
+                key: 'now',
+                value: getDateKeys('now'),
+                label: t('Now'),
+                operators: operators_js_namespaceObject.datetime
+            },
+            {
+                key: 'today',
+                value: getDateKeys('today'),
+                label: t('Today'),
+                operators: operators_js_namespaceObject.datetime
+            },
+            {
+                key: 'yesterday',
+                value: getDateKeys('yesterday'),
+                label: t('Yesterday'),
+                operators: operators_js_namespaceObject.datetime
+            },
+            {
+                key: 'tomorrow',
+                value: getDateKeys('tomorrow'),
+                label: t('Tomorrow'),
+                operators: operators_js_namespaceObject.datetime
+            }
+        ].filter((v)=>v.value);
+        return {
+            label: t('Date variables'),
+            value: '$nExactDate',
+            key: '$nExactDate',
+            children: dateOptions
+        };
+    }, [
+        null == schema ? void 0 : schema['x-component'],
+        targetFieldSchema
+    ]);
+    const { exactDateTimeCtx } = useExactDateVariableContext();
+    return {
+        exactDateTimeSettings,
+        exactDateTimeCtx,
+        shouldDisplayExactDate: !!collectionField
+    };
+};
+exports.useExactDateVariable = __webpack_exports__.useExactDateVariable;
+exports.useExactDateVariableContext = __webpack_exports__.useExactDateVariableContext;
+for(var __webpack_i__ in __webpack_exports__)if (-1 === [
+    "useExactDateVariable",
+    "useExactDateVariableContext"
+].indexOf(__webpack_i__)) exports[__webpack_i__] = __webpack_exports__[__webpack_i__];
+Object.defineProperty(exports, '__esModule', {
+    value: true
+});

package/lib/schema-settings/VariableInput/hooks/useVariableOptions.js

@@ -29,6 +29,7 @@ __webpack_require__.d(__webpack_exports__, {
 const external_react_namespaceObject = require("react");
 const external_useBlockCollection_js_namespaceObject = require("./useBlockCollection.js");
 const external_useDateVariable_js_namespaceObject = require("./useDateVariable.js");
+const external_useExactDateVariable_js_namespaceObject = require("./useExactDateVariable.js");
 const external_useFilterVariable_js_namespaceObject = require("./useFilterVariable.js");
 const external_useFormVariable_js_namespaceObject = require("./useFormVariable.js");
 const external_useIterationVariable_js_namespaceObject = require("./useIterationVariable.js");
@@ -60,6 +61,12 @@ const useVariableOptions = (param)=>{
         schema: uiSchema,
         noDisabled
     });
+    const { exactDateTimeSettings, shouldDisplayExactDate } = (0, external_useExactDateVariable_js_namespaceObject.useExactDateVariable)({
+        operator,
+        schema: uiSchema,
+        noDisabled: true,
+        targetFieldSchema
+    });
     const { currentFormSettings, shouldDisplayCurrentForm } = (0, external_useFormVariable_js_namespaceObject.useCurrentFormVariable)({
         schema: uiSchema,
         collectionField,
@@ -102,7 +109,8 @@ const useVariableOptions = (param)=>{
     return (0, external_react_namespaceObject.useMemo)(()=>[
             currentUserSettings,
             currentRoleSettings,
-            datetimeSettings,
+            !shouldDisplayExactDate && datetimeSettings,
+            shouldDisplayExactDate && exactDateTimeSettings,
             shouldDisplayCurrentForm && currentFormSettings,
             shouldDisplayCurrentObject && currentObjectSettings,
             shouldDisplayCurrentRecord && currentRecordSettings,
@@ -113,6 +121,8 @@ const useVariableOptions = (param)=>{
         currentUserSettings,
         currentRoleSettings,
         datetimeSettings,
+        exactDateTimeSettings,
+        shouldDisplayExactDate,
         shouldDisplayCurrentForm,
         currentFormSettings,
         shouldDisplayCurrentObject,

package/lib/user/ChangePassword.js

@@ -1,5 +1,14 @@
 "use strict";
 var __webpack_require__ = {};
+(()=>{
+    __webpack_require__.n = (module)=>{
+        var getter = module && module.__esModule ? ()=>module['default'] : ()=>module;
+        __webpack_require__.d(getter, {
+            a: getter
+        });
+        return getter;
+    };
+})();
 (()=>{
     __webpack_require__.d = (exports1, definition)=>{
         for(var key in definition)if (__webpack_require__.o(definition, key) && !__webpack_require__.o(exports1, key)) Object.defineProperty(exports1, key, {
@@ -32,6 +41,8 @@ const schema_namespaceObject = require("@tachybase/schema");
 const external_react_i18next_namespaceObject = require("react-i18next");
 const external_index_js_namespaceObject = require("../index.js");
 const index_js_namespaceObject = require("../api-client/index.js");
+const external_VerificationCode_js_namespaceObject = require("./VerificationCode.js");
+var external_VerificationCode_js_default = /*#__PURE__*/ __webpack_require__.n(external_VerificationCode_js_namespaceObject);
 const useCloseAction = ()=>{
     const { setVisible } = (0, external_index_js_namespaceObject.useActionContext)();
     const form = (0, schema_namespaceObject.useForm)();
@@ -77,13 +88,101 @@ const schema = {
             type: 'void',
             title: '{{t("Change password")}}',
             properties: {
+                verifyMethod: {
+                    type: 'string',
+                    required: true,
+                    title: '{{t("Verify method")}}',
+                    enum: [
+                        {
+                            label: '{{t("Use old password")}}',
+                            value: 'password'
+                        },
+                        {
+                            label: '{{t("Use verification code")}}',
+                            value: 'code'
+                        }
+                    ],
+                    'x-component': 'Radio.Group',
+                    'x-decorator': 'FormItem',
+                    'x-reactions': [
+                        {
+                            dependencies: [
+                                '.phoneExist',
+                                '.oldPasswordExist'
+                            ],
+                            fulfill: {
+                                state: {
+                                    hidden: '{{ !($deps[0] && $deps[1] && smsVerifyEnabled) }}',
+                                    value: '{{ undefined }}'
+                                }
+                            }
+                        }
+                    ]
+                },
+                phoneExist: {
+                    type: 'boolean',
+                    default: '{{ !!phoneNumber }}',
+                    'x-hidden': true
+                },
+                phone: {
+                    type: 'string',
+                    title: '{{t("Phone")}}',
+                    default: '{{ phoneNumber }}',
+                    'x-component': 'Input',
+                    'x-validator': 'phone',
+                    'x-decorator': 'FormItem',
+                    'x-hidden': true
+                },
+                code: {
+                    type: 'string',
+                    title: '{{t("Verification code")}}',
+                    description: "{{codeDescription}}",
+                    'x-component': 'VerificationCode',
+                    'x-component-props': {
+                        actionType: 'auth:changePassword',
+                        targetFieldName: 'phone'
+                    },
+                    required: true,
+                    'x-decorator': 'FormItem',
+                    'x-reactions': [
+                        {
+                            dependencies: [
+                                '.verifyMethod',
+                                '.phoneExist',
+                                '.phone'
+                            ],
+                            fulfill: {
+                                state: {
+                                    hidden: "{{ \n                          !$deps[1] || \n                          !smsVerifyEnabled ||\n                          ($deps[0] !== 'code' && $deps[0] !== undefined) // \u6709 verifyMethod \u4F46\u672A\u9009 code\n                        }}"
+                                }
+                            }
+                        }
+                    ]
+                },
+                oldPasswordExist: {
+                    type: 'boolean',
+                    default: '{{ oldPassword }}',
+                    'x-hidden': true
+                },
                 oldPassword: {
                     type: 'string',
                     title: '{{t("Old password")}}',
                     required: true,
                     'x-component': 'Password',
                     'x-decorator': 'FormItem',
-                    'x-hidden': '{{ hideOldPassword }}'
+                    'x-reactions': [
+                        {
+                            dependencies: [
+                                '.verifyMethod',
+                                '.oldPasswordExist'
+                            ],
+                            fulfill: {
+                                state: {
+                                    hidden: "{{ \n                          !$deps[1] || \n                          (smsVerifyEnabled && $deps[0] !== 'password' && $deps[0] !== undefined)\n                        }}"
+                                }
+                            }
+                        }
+                    ]
                 },
                 newPassword: {
                     type: 'string',
@@ -157,12 +256,20 @@ const schema = {
     }
 };
 const useChangePassword = ()=>{
-    var _currentUser_data_data, _currentUser_data;
+    var _currentUser_data_data, _currentUser_data, _currentUser_data_data1, _currentUser_data1;
     const ctx = (0, external_react_namespaceObject.useContext)(external_index_js_namespaceObject.DropdownVisibleContext);
     const [visible, setVisible] = (0, external_react_namespaceObject.useState)(false);
     const { t } = (0, external_react_i18next_namespaceObject.useTranslation)();
+    const pm = (0, external_index_js_namespaceObject.useApp)().pluginManager;
+    const otp = pm.get('@tachybase/plugin-otp');
+    const sms = pm.get('@tachybase/plugin-auth-sms');
+    const smsVerifyEnabled = !!otp && !!sms;
     const currentUser = (0, external_index_js_namespaceObject.useCurrentUserContext)();
-    const hideOldPassword = (null == currentUser ? void 0 : null == (_currentUser_data = currentUser.data) ? void 0 : null == (_currentUser_data_data = _currentUser_data.data) ? void 0 : _currentUser_data_data.password) === null;
+    const oldPassword = (null == currentUser ? void 0 : null == (_currentUser_data = currentUser.data) ? void 0 : null == (_currentUser_data_data = _currentUser_data.data) ? void 0 : _currentUser_data_data.password) !== null;
+    const phoneNumber = null == currentUser ? void 0 : null == (_currentUser_data1 = currentUser.data) ? void 0 : null == (_currentUser_data_data1 = _currentUser_data1.data) ? void 0 : _currentUser_data_data1.phone;
+    const codeDescription = phoneNumber ? t('Send verification code to phone: {{phoneNumber}}', {
+        phoneNumber
+    }) : t('Please fill in your mobile phone number in your personal information first');
     return (0, external_react_namespaceObject.useMemo)(()=>({
             key: 'password',
             eventKey: 'ChangePassword',
@@ -184,7 +291,13 @@ const useChangePassword = ()=>{
                                 scope: {
                                     useCloseAction,
                                     useSaveCurrentUserValues,
-                                    hideOldPassword
+                                    oldPassword,
+                                    codeDescription,
+                                    phoneNumber,
+                                    smsVerifyEnabled
+                                },
+                                components: {
+                                    VerificationCode: external_VerificationCode_js_default()
                                 },
                                 schema: schema
                             })
@@ -194,7 +307,7 @@ const useChangePassword = ()=>{
             })
         }), [
         visible,
-        hideOldPassword
+        oldPassword
     ]);
 };
 exports.useChangePassword = __webpack_exports__.useChangePassword;

package/lib/user/index.js

@@ -8,6 +8,9 @@ var __webpack_modules__ = {
     },
     "./CurrentUserSettingsMenuProvider": function(module) {
         module.exports = require("./CurrentUserSettingsMenuProvider.js");
+    },
+    "./VerificationCode": function(module) {
+        module.exports = require("./VerificationCode.js");
     }
 };
 var __webpack_module_cache__ = {};
@@ -53,26 +56,43 @@ function __webpack_require__(moduleId) {
 var __webpack_exports__ = {};
 (()=>{
     __webpack_require__.r(__webpack_exports__);
+    __webpack_require__.d(__webpack_exports__, {
+        VerificationCode: ()=>_VerificationCode__WEBPACK_IMPORTED_MODULE_3___default.a
+    });
     var _CurrentUser__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("./CurrentUser");
     var __WEBPACK_REEXPORT_OBJECT__ = {};
-    for(var __WEBPACK_IMPORT_KEY__ in _CurrentUser__WEBPACK_IMPORTED_MODULE_0__)if ("default" !== __WEBPACK_IMPORT_KEY__) __WEBPACK_REEXPORT_OBJECT__[__WEBPACK_IMPORT_KEY__] = (function(key) {
+    for(var __WEBPACK_IMPORT_KEY__ in _CurrentUser__WEBPACK_IMPORTED_MODULE_0__)if ([
+        "VerificationCode",
+        "default"
+    ].indexOf(__WEBPACK_IMPORT_KEY__) < 0) __WEBPACK_REEXPORT_OBJECT__[__WEBPACK_IMPORT_KEY__] = (function(key) {
         return _CurrentUser__WEBPACK_IMPORTED_MODULE_0__[key];
     }).bind(0, __WEBPACK_IMPORT_KEY__);
     __webpack_require__.d(__webpack_exports__, __WEBPACK_REEXPORT_OBJECT__);
     var _CurrentUserProvider__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__("./CurrentUserProvider");
     var __WEBPACK_REEXPORT_OBJECT__ = {};
-    for(var __WEBPACK_IMPORT_KEY__ in _CurrentUserProvider__WEBPACK_IMPORTED_MODULE_1__)if ("default" !== __WEBPACK_IMPORT_KEY__) __WEBPACK_REEXPORT_OBJECT__[__WEBPACK_IMPORT_KEY__] = (function(key) {
+    for(var __WEBPACK_IMPORT_KEY__ in _CurrentUserProvider__WEBPACK_IMPORTED_MODULE_1__)if ([
+        "VerificationCode",
+        "default"
+    ].indexOf(__WEBPACK_IMPORT_KEY__) < 0) __WEBPACK_REEXPORT_OBJECT__[__WEBPACK_IMPORT_KEY__] = (function(key) {
         return _CurrentUserProvider__WEBPACK_IMPORTED_MODULE_1__[key];
     }).bind(0, __WEBPACK_IMPORT_KEY__);
     __webpack_require__.d(__webpack_exports__, __WEBPACK_REEXPORT_OBJECT__);
     var _CurrentUserSettingsMenuProvider__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__("./CurrentUserSettingsMenuProvider");
     var __WEBPACK_REEXPORT_OBJECT__ = {};
-    for(var __WEBPACK_IMPORT_KEY__ in _CurrentUserSettingsMenuProvider__WEBPACK_IMPORTED_MODULE_2__)if ("default" !== __WEBPACK_IMPORT_KEY__) __WEBPACK_REEXPORT_OBJECT__[__WEBPACK_IMPORT_KEY__] = (function(key) {
+    for(var __WEBPACK_IMPORT_KEY__ in _CurrentUserSettingsMenuProvider__WEBPACK_IMPORTED_MODULE_2__)if ([
+        "VerificationCode",
+        "default"
+    ].indexOf(__WEBPACK_IMPORT_KEY__) < 0) __WEBPACK_REEXPORT_OBJECT__[__WEBPACK_IMPORT_KEY__] = (function(key) {
         return _CurrentUserSettingsMenuProvider__WEBPACK_IMPORTED_MODULE_2__[key];
     }).bind(0, __WEBPACK_IMPORT_KEY__);
     __webpack_require__.d(__webpack_exports__, __WEBPACK_REEXPORT_OBJECT__);
+    var _VerificationCode__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__("./VerificationCode");
+    var _VerificationCode__WEBPACK_IMPORTED_MODULE_3___default = /*#__PURE__*/ __webpack_require__.n(_VerificationCode__WEBPACK_IMPORTED_MODULE_3__);
 })();
-for(var __webpack_i__ in __webpack_exports__)exports[__webpack_i__] = __webpack_exports__[__webpack_i__];
+exports.VerificationCode = __webpack_exports__.VerificationCode;
+for(var __webpack_i__ in __webpack_exports__)if (-1 === [
+    "VerificationCode"
+].indexOf(__webpack_i__)) exports[__webpack_i__] = __webpack_exports__[__webpack_i__];
 Object.defineProperty(exports, '__esModule', {
     value: true
 });

package/lib/variables/VariablesProvider.js

@@ -33,8 +33,8 @@ var __webpack_require__ = {};
 var __webpack_exports__ = {};
 __webpack_require__.r(__webpack_exports__);
 __webpack_require__.d(__webpack_exports__, {
-    default: ()=>VariablesProvider,
-    VariablesContext: ()=>VariablesContext
+    VariablesContext: ()=>VariablesContext,
+    default: ()=>VariablesProvider
 });
 const jsx_runtime_namespaceObject = require("react/jsx-runtime");
 const external_react_namespaceObject = require("react");

package/lib/variables/hooks/useBuiltinVariables.js

@@ -34,6 +34,7 @@ const useBuiltInVariables = ()=>{
     const { currentUserCtx } = (0, index_js_namespaceObject.useCurrentUserVariable)();
     const { currentRoleCtx } = (0, useRoleVariable_js_namespaceObject.useCurrentRoleVariable)();
     const { datetimeCtx } = (0, index_js_namespaceObject.useDatetimeVariable)();
+    const { exactDateTimeCtx } = (0, index_js_namespaceObject.useExactDateVariable)();
     const builtinVariables = (0, external_react_namespaceObject.useMemo)(()=>[
             {
                 name: '$user',
@@ -58,6 +59,10 @@ const useBuiltInVariables = ()=>{
                 name: '$date',
                 ctx: datetimeCtx
             },
+            {
+                name: '$nExactDate',
+                ctx: exactDateTimeCtx
+            },
             {
                 name: '$system',
                 ctx: {
@@ -69,7 +74,8 @@ const useBuiltInVariables = ()=>{
                 ctx: ()=>(0, client_namespaceObject.dayjs)().toISOString()
             }
         ], [
-        currentUserCtx
+        currentUserCtx,
+        exactDateTimeCtx
     ]);
     return {
         builtinVariables

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tachybase/client",
-  "version": "1.3.19",
+  "version": "1.3.20",
   "license": "Apache-2.0",
   "main": "lib/index.js",
   "module": "es/index.mjs",
@@ -59,26 +59,26 @@
     "react-quill": "^2.0.0",
     "react-router": "6.28.1",
     "react-router-dom": "6.28.1",
-    "react-svg": "^16.2.0",
+    "react-svg": "^16.3.0",
     "react-to-print": "^2.15.1",
     "react-transition-group": "^4.4.5",
     "react-zoom-pan-pinch": "^3.6.1",
     "sanitize-html": "2.17.0",
     "use-deep-compare-effect": "^1.8.1",
     "xlsx": "0.18.5",
-    "@tachybase/requirejs": "1.3.19",
-    "@tachybase/components": "1.3.19",
-    "@tachybase/schema": "1.3.19",
-    "@tachybase/evaluators": "1.3.19",
-    "@tachybase/sdk": "1.3.19",
-    "@tachybase/utils": "1.3.19"
+    "@tachybase/components": "1.3.20",
+    "@tachybase/evaluators": "1.3.20",
+    "@tachybase/requirejs": "1.3.20",
+    "@tachybase/schema": "1.3.20",
+    "@tachybase/sdk": "1.3.20",
+    "@tachybase/utils": "1.3.20"
   },
   "devDependencies": {
     "@testing-library/react": "^16.2.0",
     "@types/flat": "^5.0.5",
-    "@types/lodash": "^4.17.13",
+    "@types/lodash": "^4.17.20",
     "@types/markdown-it": "12.2.3",
-    "@types/react-big-calendar": "^1.16.0"
+    "@types/react-big-calendar": "^1.16.2"
   },
   "peerDependencies": {
     "react": ">=18.0.0",