@tachybase/client 1.3.25 → 1.5.0

package/lib/schema-component/antd/icon-picker/IconFilterInput.js

@@ -36,19 +36,20 @@ __webpack_require__.d(__webpack_exports__, {
     IconFilterInput: ()=>IconFilterInput
 });
 const jsx_runtime_namespaceObject = require("react/jsx-runtime");
-require("react");
 const external_antd_namespaceObject = require("antd");
 const external_lodash_namespaceObject = require("lodash");
 var external_lodash_default = /*#__PURE__*/ __webpack_require__.n(external_lodash_namespaceObject);
+const external_react_i18next_namespaceObject = require("react-i18next");
 const IconFilterInput = (props)=>{
     const { changeFilterKey } = props;
+    const { t } = (0, external_react_i18next_namespaceObject.useTranslation)();
     const onChange = external_lodash_default().debounce((e)=>{
         const inputValue = e.target.value;
         changeFilterKey(inputValue);
     }, 100);
     return /*#__PURE__*/ (0, jsx_runtime_namespaceObject.jsx)(external_antd_namespaceObject.Input, {
         allowClear: true,
-        placeholder: 'Antd\u7684key,\u4F8B\u5982"ApiOutlined",\u5FFD\u7565\u5927\u5C0F\u5199',
+        placeholder: t("The key in Antd, such as 'ApiOutlined', ignoring case"),
         onChange: onChange
     });
 };

package/lib/schema-component/antd/icon-picker/index.js

@@ -1,5 +1,11 @@
 "use strict";
 var __webpack_modules__ = {
+    "./IconFilterInput": function(module) {
+        module.exports = require("./IconFilterInput.js");
+    },
+    "./IconList": function(module) {
+        module.exports = require("./IconList.js");
+    },
     "./IconPicker": function(module) {
         module.exports = require("./IconPicker.js");
     }
@@ -53,6 +59,18 @@ var __webpack_exports__ = {};
         return _IconPicker__WEBPACK_IMPORTED_MODULE_0__[key];
     }).bind(0, __WEBPACK_IMPORT_KEY__);
     __webpack_require__.d(__webpack_exports__, __WEBPACK_REEXPORT_OBJECT__);
+    var _IconList__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__("./IconList");
+    var __WEBPACK_REEXPORT_OBJECT__ = {};
+    for(var __WEBPACK_IMPORT_KEY__ in _IconList__WEBPACK_IMPORTED_MODULE_1__)if ("default" !== __WEBPACK_IMPORT_KEY__) __WEBPACK_REEXPORT_OBJECT__[__WEBPACK_IMPORT_KEY__] = (function(key) {
+        return _IconList__WEBPACK_IMPORTED_MODULE_1__[key];
+    }).bind(0, __WEBPACK_IMPORT_KEY__);
+    __webpack_require__.d(__webpack_exports__, __WEBPACK_REEXPORT_OBJECT__);
+    var _IconFilterInput__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__("./IconFilterInput");
+    var __WEBPACK_REEXPORT_OBJECT__ = {};
+    for(var __WEBPACK_IMPORT_KEY__ in _IconFilterInput__WEBPACK_IMPORTED_MODULE_2__)if ("default" !== __WEBPACK_IMPORT_KEY__) __WEBPACK_REEXPORT_OBJECT__[__WEBPACK_IMPORT_KEY__] = (function(key) {
+        return _IconFilterInput__WEBPACK_IMPORTED_MODULE_2__[key];
+    }).bind(0, __WEBPACK_IMPORT_KEY__);
+    __webpack_require__.d(__webpack_exports__, __WEBPACK_REEXPORT_OBJECT__);
 })();
 for(var __webpack_i__ in __webpack_exports__)exports[__webpack_i__] = __webpack_exports__[__webpack_i__];
 Object.defineProperty(exports, '__esModule', {

package/lib/schema-component/antd/menu/Menu.js

@@ -29,8 +29,8 @@ __webpack_require__.d(__webpack_exports__, {
 const jsx_runtime_namespaceObject = require("react/jsx-runtime");
 const external_react_namespaceObject = require("react");
 const schema_namespaceObject = require("@tachybase/schema");
-const core_namespaceObject = require("@dnd-kit/core");
 const client_namespaceObject = require("@tego/client");
+const core_namespaceObject = require("@dnd-kit/core");
 const external_antd_namespaceObject = require("antd");
 const external_react_dom_namespaceObject = require("react-dom");
 const external_index_js_namespaceObject = require("../../index.js");

package/lib/schema-component/antd/page/components/AddTabForm.js

@@ -0,0 +1,69 @@
+"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__, {
+    AddTabForm: ()=>AddTabForm
+});
+const jsx_runtime_namespaceObject = require("react/jsx-runtime");
+const client_namespaceObject = require("@tego/client");
+const external_react_i18next_namespaceObject = require("react-i18next");
+const index_js_namespaceObject = require("../../../core/index.js");
+const AddTabForm = (props)=>{
+    const { options } = props;
+    const { t } = (0, external_react_i18next_namespaceObject.useTranslation)();
+    return /*#__PURE__*/ (0, jsx_runtime_namespaceObject.jsx)(index_js_namespaceObject.SchemaComponentOptions, {
+        scope: options.scope,
+        components: {
+            ...options.components
+        },
+        children: /*#__PURE__*/ (0, jsx_runtime_namespaceObject.jsx)(client_namespaceObject.FormLayout, {
+            layout: 'vertical',
+            children: /*#__PURE__*/ (0, jsx_runtime_namespaceObject.jsx)(index_js_namespaceObject.SchemaComponent, {
+                schema: {
+                    properties: {
+                        title: {
+                            title: t('Tab name'),
+                            'x-component': 'Input',
+                            'x-decorator': 'FormItem',
+                            required: true
+                        },
+                        icon: {
+                            title: t('Icon'),
+                            'x-component': 'IconPicker',
+                            'x-decorator': 'FormItem'
+                        }
+                    }
+                }
+            })
+        })
+    });
+};
+exports.AddTabForm = __webpack_exports__.AddTabForm;
+for(var __webpack_i__ in __webpack_exports__)if (-1 === [
+    "AddTabForm"
+].indexOf(__webpack_i__)) exports[__webpack_i__] = __webpack_exports__[__webpack_i__];
+Object.defineProperty(exports, '__esModule', {
+    value: true
+});

package/lib/schema-component/antd/table-v2/Table.js

@@ -39,9 +39,9 @@ const jsx_runtime_namespaceObject = require("react/jsx-runtime");
 const external_react_namespaceObject = require("react");
 var external_react_default = /*#__PURE__*/ __webpack_require__.n(external_react_namespaceObject);
 const schema_namespaceObject = require("@tachybase/schema");
+const client_namespaceObject = require("@tego/client");
 const icons_namespaceObject = require("@ant-design/icons");
 const sortable_namespaceObject = require("@dnd-kit/sortable");
-const client_namespaceObject = require("@tego/client");
 const external_ahooks_namespaceObject = require("ahooks");
 const external_antd_namespaceObject = require("antd");
 const external_classnames_namespaceObject = require("classnames");
@@ -277,7 +277,7 @@ const Table = (0, withDynamicSchemaProps_js_namespaceObject.withDynamicSchemaPro
     const { styles } = (0, external_Table_styles_js_namespaceObject.useStyles)();
     const { pagination: pagination1, useProps, ...others1 } = props;
     const { pagination: pagination2, ...others2 } = (null == useProps ? void 0 : useProps()) || {};
-    const { dragSort = false, showIndex = true, onRowSelectionChange, onChange: onTableChange, rowSelection, rowKey, required, onExpand, onClickRow, ...others } = {
+    const { dragSort: tableDragSort, showIndex = true, onRowSelectionChange, onChange: onTableChange, rowSelection, rowKey, required, onExpand, onClickRow, ...others } = {
         ...others1,
         ...others2
     };
@@ -295,6 +295,7 @@ const Table = (0, withDynamicSchemaProps_js_namespaceObject.withDynamicSchemaPro
     const [selectedRow, setSelectedRow] = (0, external_react_namespaceObject.useState)([]);
     const dataSource = (null == field ? void 0 : null == (_field_value = field.value) ? void 0 : null == (_field_value_slice1 = _field_value.slice) ? void 0 : null == (_field_value_slice = _field_value_slice1.call(_field_value)) ? void 0 : null == (_field_value_slice_filter = _field_value_slice.filter) ? void 0 : _field_value_slice_filter.call(_field_value_slice, Boolean)) || [];
     const isRowSelect = (null == rowSelection ? void 0 : rowSelection.type) !== 'none';
+    const dragSort = tableDragSort || field.componentProps.dragSort || false;
     const defaultRowKeyMap = (0, external_react_namespaceObject.useRef)(new Map());
     let onRow = null, highlightRow = '';
     if (onClickRow) {

package/lib/schema-component/antd/table-v2/Table.styles.js

@@ -100,7 +100,7 @@ function _templateObject5() {
 }
 function _templateObject6() {
     const data = _tagged_template_literal([
-        "\n      max-width: 300px;\n      white-space: nowrap;\n      .tb-read-pretty-input-number {\n        text-align: right;\n      }\n      .ant-color-picker-trigger {\n        position: absolute;\n        top: 50%;\n        transform: translateY(-50%);\n      }\n    "
+        "\n      max-width: 300px;\n      white-space: nowrap;\n      .ant-color-picker-trigger {\n        position: absolute;\n        top: 50%;\n        transform: translateY(-50%);\n      }\n    "
     ]);
     _templateObject6 = function() {
         return data;

package/lib/schema-component/hooks/useDesignable.js

@@ -308,17 +308,17 @@ class Designable {
         if (this.model) update(this.model);
         if (this.query) this.query.take(update);
     }
-    insertAdjacent(position, schema) {
+    async insertAdjacent(position, schema) {
         let options = arguments.length > 2 && void 0 !== arguments[2] ? arguments[2] : {};
         switch(position){
             case 'beforeBegin':
-                return this.insertBeforeBegin(schema, options);
+                return await this.insertBeforeBegin(schema, options);
             case 'afterBegin':
-                return this.insertAfterBegin(schema, options);
+                return await this.insertAfterBegin(schema, options);
             case 'beforeEnd':
-                return this.insertBeforeEnd(schema, options);
+                return await this.insertBeforeEnd(schema, options);
             case 'afterEnd':
-                return this.insertAfterEnd(schema, options);
+                return await this.insertAfterEnd(schema, options);
         }
     }
     recursiveRemoveIfNoChildren(schema, options) {
@@ -337,7 +337,7 @@ class Designable {
         }
         return removed;
     }
-    remove(schema) {
+    async remove(schema) {
         let options = arguments.length > 1 && void 0 !== arguments[1] ? arguments[1] : {};
         const { breakRemoveOn, removeParentsIfNoChildren } = options;
         const s = schema || this.current;
@@ -348,7 +348,7 @@ class Designable {
             });
             if (parent) removed = parent;
         }
-        return this.emit('remove', {
+        return await this.emit('remove', {
             removed
         });
     }
@@ -365,7 +365,7 @@ class Designable {
         }
         return removed;
     }
-    insertBeforeBeginOrAfterEnd(schema) {
+    async insertBeforeBeginOrAfterEnd(schema) {
         let options = arguments.length > 1 && void 0 !== arguments[1] ? arguments[1] : {};
         if (!schema_namespaceObject.Schema.isSchemaInstance(this.current)) return;
         if (!schema_namespaceObject.Schema.isSchemaInstance(schema)) return;
@@ -376,9 +376,9 @@ class Designable {
             if (this.current.name === key) toIndex = index;
             if (schema.name === key) fromIndex = index;
         });
-        return fromIndex > toIndex ? this.insertBeforeBegin(schema, options) : this.insertAfterEnd(schema, options);
+        return fromIndex > toIndex ? await this.insertBeforeBegin(schema, options) : await this.insertAfterEnd(schema, options);
     }
-    insertBeforeBegin(schema) {
+    async insertBeforeBegin(schema) {
         let options = arguments.length > 1 && void 0 !== arguments[1] ? arguments[1] : {};
         if (!schema_namespaceObject.Schema.isSchemaInstance(this.current)) return;
         const opts = {
@@ -419,7 +419,7 @@ class Designable {
         s.parent = this.current.parent;
         this.current.parent.setProperties(properties);
         const [schema1, schema2] = splitWrapSchema(s, schema);
-        this.emit('insertAdjacent', {
+        await this.emit('insertAdjacent', {
             position: 'beforeBegin',
             schema: schema2,
             wrapped,
@@ -427,7 +427,7 @@ class Designable {
             ...opts
         });
     }
-    insertAfterBegin(schema) {
+    async insertAfterBegin(schema) {
         let options = arguments.length > 1 && void 0 !== arguments[1] ? arguments[1] : {};
         if (!schema_namespaceObject.Schema.isSchemaInstance(this.current)) return;
         const opts = {
@@ -459,7 +459,7 @@ class Designable {
         s.parent = this.current;
         this.current.setProperties(properties);
         const [schema1, schema2] = splitWrapSchema(s, schema);
-        this.emit('insertAdjacent', {
+        await this.emit('insertAdjacent', {
             position: 'afterBegin',
             schema: schema2,
             wrap: schema1,
@@ -467,7 +467,7 @@ class Designable {
             ...opts
         });
     }
-    insertBeforeEnd(schema) {
+    async insertBeforeEnd(schema) {
         let options = arguments.length > 1 && void 0 !== arguments[1] ? arguments[1] : {};
         if (!schema_namespaceObject.Schema.isSchemaInstance(this.current)) return;
         delete schema['x-index'];
@@ -476,7 +476,7 @@ class Designable {
         };
         const { wrap = defaultWrap, breakRemoveOn, removeParentsIfNoChildren } = options;
         if (schema_namespaceObject.Schema.isSchemaInstance(schema)) {
-            if (this.parentsIn(schema)) return void this.emit('error', {
+            if (this.parentsIn(schema)) return void await this.emit('error', {
                 code: 'parent_is_not_allowed',
                 schema
             });
@@ -490,7 +490,7 @@ class Designable {
         const s = this.current.addProperty(wrapped.name || (0, schema_namespaceObject.uid)(), wrapped);
         s.parent = this.current;
         const [schema1, schema2] = splitWrapSchema(s, schema);
-        return this.emit('insertAdjacent', {
+        return await this.emit('insertAdjacent', {
             position: 'beforeEnd',
             schema: schema2,
             wrap: schema1,
@@ -498,7 +498,7 @@ class Designable {
             ...opts
         });
     }
-    insertAfterEnd(schema) {
+    async insertAfterEnd(schema) {
         let options = arguments.length > 1 && void 0 !== arguments[1] ? arguments[1] : {};
         if (!schema_namespaceObject.Schema.isSchemaInstance(this.current)) return;
         const opts = {
@@ -540,7 +540,7 @@ class Designable {
         s['x-index'] = newOrder;
         this.current.parent.setProperties(properties);
         const [schema1, schema2] = splitWrapSchema(s, schema);
-        this.emit('insertAdjacent', {
+        await this.emit('insertAdjacent', {
             position: 'afterEnd',
             schema: schema2,
             wrap: schema1,

package/lib/user/CurrentUser.js

@@ -30,8 +30,8 @@ __webpack_require__.d(__webpack_exports__, {
 });
 const jsx_runtime_namespaceObject = require("react/jsx-runtime");
 const external_react_namespaceObject = require("react");
-const icons_namespaceObject = require("@ant-design/icons");
 const client_namespaceObject = require("@tego/client");
+const icons_namespaceObject = require("@ant-design/icons");
 const external_antd_namespaceObject = require("antd");
 const external_antd_style_namespaceObject = require("antd-style");
 const external_react_i18next_namespaceObject = require("react-i18next");
@@ -187,8 +187,16 @@ const SettingsMenu = (props)=>{
                 key: 'signout',
                 label: t('Sign out'),
                 onClick: async ()=>{
-                    await api.auth.signOut();
-                    navigate("/signin?redirect=".concat(encodeURIComponent(redirectUrl)));
+                    try {
+                        var _loginMethods_data;
+                        const loginMethods = await api.resource('authenticators').publicList();
+                        const methods = (null == loginMethods ? void 0 : null == (_loginMethods_data = loginMethods.data) ? void 0 : _loginMethods_data.data) || [];
+                        await api.auth.signOut();
+                        if (1 === methods.length && 'mainApp' === methods[0].authType) window.location.href = '/';
+                        else navigate("/signin?redirect=".concat(encodeURIComponent(redirectUrl)));
+                    } catch (err) {
+                        console.error('Sign out error:', err);
+                    }
                 }
             }
         ];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tachybase/client",
-  "version": "1.3.25",
+  "version": "1.5.0",
   "license": "Apache-2.0",
   "main": "lib/index.js",
   "module": "es/index.mjs",
@@ -11,7 +11,7 @@
     "@ant-design/icons": "^5.6.1",
     "@ant-design/pro-components": "2.8.9",
     "@ant-design/pro-layout": "^7.21.2",
-    "@ctrl/tinycolor": "^3.6.1",
+    "@ctrl/tinycolor": "^4.2.0",
     "@dnd-kit/accessibility": "^3.1.1",
     "@dnd-kit/core": "^6.3.1",
     "@dnd-kit/modifiers": "^7.0.0",
@@ -26,7 +26,7 @@
     "ahooks": "^3.9.0",
     "antd": "5.22.5",
     "antd-style": "3.7.1",
-    "axios": "1.7.7",
+    "axios": "1.13.0",
     "axios-mock-adapter": "^1.22.0",
     "classnames": "^2.5.1",
     "click-to-react-component": "1.1.2",
@@ -50,7 +50,7 @@
     "react-error-boundary": "^6.0.0",
     "react-helmet": "^6.1.0",
     "react-hotkeys-hook": "^5.1.0",
-    "react-i18next": "15.2.0",
+    "react-i18next": "16.2.1",
     "react-intersection-observer": "^9.14.0",
     "react-js-cron": "^3.2.0",
     "react-pdf": "^10.0.1",