@tachybase/client 1.3.20 → 1.3.22

package/lib/schema-component/antd/association-field/InternalNester.js

@@ -37,8 +37,8 @@ __webpack_require__.d(__webpack_exports__, {
 });
 const jsx_runtime_namespaceObject = require("react/jsx-runtime");
 const external_react_namespaceObject = require("react");
-const components_namespaceObject = require("@tachybase/components");
 const schema_namespaceObject = require("@tachybase/schema");
+const client_namespaceObject = require("@tego/client");
 const external_antd_style_namespaceObject = require("antd-style");
 const external_classnames_namespaceObject = require("classnames");
 var external_classnames_default = /*#__PURE__*/ __webpack_require__.n(external_classnames_namespaceObject);
@@ -97,7 +97,7 @@ const InternalNester = (0, schema_namespaceObject.observer)(()=>{
         name: collectionField.target,
         children: /*#__PURE__*/ (0, jsx_runtime_namespaceObject.jsx)(index_js_namespaceObject.ACLCollectionProvider, {
             actionPath: "".concat(collectionField.target, ":").concat(actionName),
-            children: /*#__PURE__*/ (0, jsx_runtime_namespaceObject.jsx)(components_namespaceObject.FormLayout, {
+            children: /*#__PURE__*/ (0, jsx_runtime_namespaceObject.jsx)(client_namespaceObject.FormLayout, {
                 layout: 'vertical',
                 children: /*#__PURE__*/ (0, jsx_runtime_namespaceObject.jsx)("div", {
                     className: external_classnames_default()(styles.body, {

package/lib/schema-component/antd/association-field/InternalSubTable.js

@@ -37,8 +37,8 @@ __webpack_require__.d(__webpack_exports__, {
 });
 const jsx_runtime_namespaceObject = require("react/jsx-runtime");
 const external_react_namespaceObject = require("react");
-const components_namespaceObject = require("@tachybase/components");
 const schema_namespaceObject = require("@tachybase/schema");
+const client_namespaceObject = require("@tego/client");
 const external_antd_style_namespaceObject = require("antd-style");
 const index_js_namespaceObject = require("../../../built-in/acl/index.js");
 const external_collection_manager_index_js_namespaceObject = require("../../../collection-manager/index.js");
@@ -105,7 +105,7 @@ const InternalSubTable = (0, schema_namespaceObject.observer)(()=>{
         name: options.target,
         children: /*#__PURE__*/ (0, jsx_runtime_namespaceObject.jsx)(index_js_namespaceObject.ACLCollectionProvider, {
             actionPath: "".concat(options.target, ":").concat(actionName || 'view'),
-            children: /*#__PURE__*/ (0, jsx_runtime_namespaceObject.jsx)(components_namespaceObject.FormLayout, {
+            children: /*#__PURE__*/ (0, jsx_runtime_namespaceObject.jsx)(client_namespaceObject.FormLayout, {
                 className: styles.container,
                 layout: 'vertical',
                 bordered: false,

package/lib/schema-component/antd/association-field/InternalViewer.js

@@ -80,7 +80,7 @@ const ReadPrettyInternalViewer = (0, schema_namespaceObject.observer)((props)=>{
     const isTreeCollection = (null == targetCollection ? void 0 : targetCollection.template) === 'tree';
     const ellipsisWithTooltipRef = (0, external_react_namespaceObject.useRef)();
     const getLabelUiSchema = (0, external_util_js_namespaceObject.useLabelUiSchemaV2)();
-    const { formulaRecord, fieldNames } = customTitle(recordCtx, fieldSchema, defFieldNames);
+    const { formulaRecord, fieldNames } = (0, external_hooks_js_namespaceObject.useCustomTitle)(recordCtx, fieldSchema, defFieldNames);
     const renderRecords = ()=>(0, schema_namespaceObject.toArr)(formulaRecord[fieldSchema['name']] || props.value).map((record, index, arr)=>{
             var _getCollection_options, _getCollection, _targetCollection_fieldsMap_, _targetCollection_fieldsMap, _getCollection_options1, _getCollection1, _targetCollection_fieldsMap_1, _targetCollection_fieldsMap1;
             const value = null == record ? void 0 : record[(null == fieldNames ? void 0 : fieldNames.label) || 'label'];
@@ -173,60 +173,6 @@ const ReadPrettyInternalViewer = (0, schema_namespaceObject.observer)((props)=>{
 }, {
     displayName: 'ReadPrettyInternalViewer'
 });
-const customTitle = (record, schema, fieldNames)=>{
-    var _schema_xcomponentprops, _schema_xcomponentprops_fieldNames, _schema_xcomponentprops1;
-    if ((null == (_schema_xcomponentprops = schema['x-component-props']) ? void 0 : _schema_xcomponentprops.mode) === 'CustomTitle' && (null == (_schema_xcomponentprops1 = schema['x-component-props']) ? void 0 : null == (_schema_xcomponentprops_fieldNames = _schema_xcomponentprops1.fieldNames) ? void 0 : _schema_xcomponentprops_fieldNames.formula)) {
-        var _schema_xcomponentprops_fieldNames1, _schema_xcomponentprops2;
-        const regex = /{{(.*?)}}/g;
-        const valueOject = {};
-        let outputStr = '';
-        let match;
-        const formula = null == (_schema_xcomponentprops2 = schema['x-component-props']) ? void 0 : null == (_schema_xcomponentprops_fieldNames1 = _schema_xcomponentprops2.fieldNames) ? void 0 : _schema_xcomponentprops_fieldNames1.formula;
-        while(match = regex.exec(formula))if (match[1].includes('.')) {
-            const fieldList = [
-                schema.name
-            ];
-            fieldList.push(...match[1].split('.'));
-            const result = {
-                currRecord: record,
-                value: ''
-            };
-            fieldList.forEach((value, index)=>{
-                var _result_currRecord;
-                if (fieldList.length - 1 !== index) {
-                    var _result_currRecord1;
-                    result.currRecord = null == (_result_currRecord1 = result.currRecord) ? void 0 : _result_currRecord1[value];
-                    return;
-                }
-                result.value = null == (_result_currRecord = result.currRecord) ? void 0 : _result_currRecord[value];
-            });
-            var _result_value;
-            valueOject[match[1]] = null != (_result_value = result.value) ? _result_value : '';
-        } else {
-            var _record_schema_name;
-            valueOject[match[1]] = (null == (_record_schema_name = record[schema['name']]) ? void 0 : _record_schema_name[match[1]]) || '';
-        }
-        outputStr = replacePlaceholders(formula, valueOject);
-        record[schema['name']] = {
-            ...record[schema['name']],
-            customLabel: outputStr
-        };
-        return {
-            formulaRecord: record,
-            fieldNames: {
-                ...fieldNames,
-                label: 'customLabel'
-            }
-        };
-    }
-    return {
-        formulaRecord: record,
-        fieldNames
-    };
-};
-const replacePlaceholders = (inputStr, values)=>inputStr.replace(/{{(.*?)}}/g, function(match, placeholder) {
-        return Object.prototype.hasOwnProperty.call(values, placeholder) ? values[placeholder] : match;
-    });
 exports.ReadPrettyInternalViewer = __webpack_exports__.ReadPrettyInternalViewer;
 exports.isObject = __webpack_exports__.isObject;
 for(var __webpack_i__ in __webpack_exports__)if (-1 === [

package/lib/schema-component/antd/association-field/SubTabs/InternalCollapse.js

@@ -40,8 +40,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 client_namespaceObject = require("@tachybase/utils/client");
 const icons_namespaceObject = require("@ant-design/icons");
+const client_namespaceObject = require("@tego/client");
 const external_ahooks_namespaceObject = require("ahooks");
 const external_antd_namespaceObject = require("antd");
 const external_flat_namespaceObject = require("flat");

package/lib/schema-component/antd/association-field/SubTabs/hook.js

@@ -37,7 +37,7 @@ __webpack_require__.d(__webpack_exports__, {
 });
 const external_react_namespaceObject = require("react");
 const schema_namespaceObject = require("@tachybase/schema");
-const client_namespaceObject = require("@tachybase/utils/client");
+const client_namespaceObject = require("@tego/client");
 const external_lodash_namespaceObject = require("lodash");
 var external_lodash_default = /*#__PURE__*/ __webpack_require__.n(external_lodash_namespaceObject);
 const index_js_namespaceObject = require("../../../../filter-provider/index.js");

package/lib/schema-component/antd/association-field/hooks.js

@@ -34,6 +34,7 @@ var __webpack_exports__ = {};
 __webpack_require__.r(__webpack_exports__);
 __webpack_require__.d(__webpack_exports__, {
     useAssociationFieldContext: ()=>useAssociationFieldContext,
+    useCustomTitle: ()=>useCustomTitle,
     default: ()=>useServiceOptions,
     SubFormProvider: ()=>SubFormProvider,
     useSubFormValue: ()=>useSubFormValue,
@@ -42,7 +43,7 @@ __webpack_require__.d(__webpack_exports__, {
 });
 const external_react_namespaceObject = require("react");
 const schema_namespaceObject = require("@tachybase/schema");
-const client_namespaceObject = require("@tachybase/utils/client");
+const client_namespaceObject = require("@tego/client");
 const external_lodash_namespaceObject = require("lodash");
 var external_lodash_default = /*#__PURE__*/ __webpack_require__.n(external_lodash_namespaceObject);
 const cloneDeep_namespaceObject = require("lodash/cloneDeep");
@@ -191,9 +192,61 @@ const useSubFormValue = ()=>{
         collection
     };
 };
+const useCustomTitle = (record, schema, fieldNames)=>{
+    var _schema_xcomponentprops, _schema_xcomponentprops_fieldNames, _schema_xcomponentprops1;
+    if ((null == (_schema_xcomponentprops = schema['x-component-props']) ? void 0 : _schema_xcomponentprops.mode) === 'CustomTitle' && (null == (_schema_xcomponentprops1 = schema['x-component-props']) ? void 0 : null == (_schema_xcomponentprops_fieldNames = _schema_xcomponentprops1.fieldNames) ? void 0 : _schema_xcomponentprops_fieldNames.formula)) {
+        if (Array.isArray(record[schema['name']])) record[schema['name']].forEach((recordItem)=>{
+            recordItem['customLabel'] = getCustomLabel(recordItem, schema);
+        });
+        else record[schema['name']]['customLabel'] = getCustomLabel(record[schema['name']], schema);
+        return {
+            formulaRecord: record,
+            fieldNames: {
+                ...fieldNames,
+                label: 'customLabel'
+            }
+        };
+    }
+    return {
+        formulaRecord: record,
+        fieldNames
+    };
+};
+const getCustomLabel = (record, schema)=>{
+    var _schema_xcomponentprops_fieldNames, _schema_xcomponentprops;
+    const regex = /{{(.*?)}}/g;
+    const valueOject = {};
+    let outputStr = '';
+    let match;
+    const formula = null == (_schema_xcomponentprops = schema['x-component-props']) ? void 0 : null == (_schema_xcomponentprops_fieldNames = _schema_xcomponentprops.fieldNames) ? void 0 : _schema_xcomponentprops_fieldNames.formula;
+    while(match = regex.exec(formula))if (match[1].includes('.')) {
+        const fieldList = match[1].split('.');
+        const result = {
+            currRecord: record,
+            value: ''
+        };
+        fieldList.forEach((value, index)=>{
+            var _result_currRecord;
+            if (fieldList.length - 1 !== index) {
+                var _result_currRecord1;
+                result.currRecord = null == (_result_currRecord1 = result.currRecord) ? void 0 : _result_currRecord1[value];
+                return;
+            }
+            result.value = null == (_result_currRecord = result.currRecord) ? void 0 : _result_currRecord[value];
+        });
+        var _result_value;
+        valueOject[match[1]] = null != (_result_value = result.value) ? _result_value : '';
+    } else valueOject[match[1]] = record[match[1]] || '';
+    outputStr = replacePlaceholders(formula, valueOject);
+    return outputStr;
+};
+const replacePlaceholders = (inputStr, values)=>inputStr.replace(/{{(.*?)}}/g, function(match, placeholder) {
+        return Object.prototype.hasOwnProperty.call(values, placeholder) ? values[placeholder] : match;
+    });
 exports.SubFormProvider = __webpack_exports__.SubFormProvider;
 exports["default"] = __webpack_exports__["default"];
 exports.useAssociationFieldContext = __webpack_exports__.useAssociationFieldContext;
+exports.useCustomTitle = __webpack_exports__.useCustomTitle;
 exports.useFieldNames = __webpack_exports__.useFieldNames;
 exports.useInsertSchema = __webpack_exports__.useInsertSchema;
 exports.useSubFormValue = __webpack_exports__.useSubFormValue;
@@ -201,6 +254,7 @@ for(var __webpack_i__ in __webpack_exports__)if (-1 === [
     "SubFormProvider",
     "default",
     "useAssociationFieldContext",
+    "useCustomTitle",
     "useFieldNames",
     "useInsertSchema",
     "useSubFormValue"

package/lib/schema-component/antd/association-field/util.js

@@ -45,7 +45,7 @@ __webpack_require__.d(__webpack_exports__, {
 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("@tachybase/utils/client");
+const client_namespaceObject = require("@tego/client");
 const external_antd_namespaceObject = require("antd");
 const index_js_namespaceObject = require("../../../collection-manager/index.js");
 const useLabelUiSchemaV2 = ()=>{

package/lib/schema-component/antd/association-select/AssociationSelect.js

@@ -38,9 +38,9 @@ __webpack_require__.d(__webpack_exports__, {
 });
 const jsx_runtime_namespaceObject = require("react/jsx-runtime");
 const external_react_namespaceObject = require("react");
-const components_namespaceObject = require("@tachybase/components");
 const schema_namespaceObject = require("@tachybase/schema");
 const icons_namespaceObject = require("@ant-design/icons");
+const client_namespaceObject = require("@tego/client");
 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");
@@ -160,8 +160,8 @@ AssociationSelect.Designer = function() {
             form && !(null == form ? void 0 : form.readPretty) && validateSchema && /*#__PURE__*/ (0, jsx_runtime_namespaceObject.jsx)(SchemaSettings_js_namespaceObject.SchemaSettingsModalItem, {
                 title: t('Set validation rules'),
                 components: {
-                    ArrayCollapse: components_namespaceObject.ArrayCollapse,
-                    FormLayout: components_namespaceObject.FormLayout
+                    ArrayCollapse: client_namespaceObject.ArrayCollapse,
+                    FormLayout: client_namespaceObject.FormLayout
                 },
                 schema: {
                     type: 'object',
@@ -273,8 +273,8 @@ AssociationSelect.Designer = function() {
             isAllowToSetDefaultValue() && /*#__PURE__*/ (0, jsx_runtime_namespaceObject.jsx)(SchemaSettings_js_namespaceObject.SchemaSettingsModalItem, {
                 title: t('Set default value'),
                 components: {
-                    ArrayCollapse: components_namespaceObject.ArrayCollapse,
-                    FormLayout: components_namespaceObject.FormLayout
+                    ArrayCollapse: client_namespaceObject.ArrayCollapse,
+                    FormLayout: client_namespaceObject.FormLayout
                 },
                 width: 800,
                 schema: {
@@ -282,7 +282,7 @@ AssociationSelect.Designer = function() {
                     title: t('Set default value'),
                     properties: {
                         default: {
-                            ...fieldSchemaWithoutRequired || {},
+                            ...fieldSchemaWithoutRequired,
                             'x-decorator': 'FormItem',
                             'x-component-props': {
                                 ...fieldSchemaWithoutRequired['x-component-props'],
@@ -394,7 +394,7 @@ AssociationSelect.Designer = function() {
             /*#__PURE__*/ (0, jsx_runtime_namespaceObject.jsx)(SchemaSettings_js_namespaceObject.SchemaSettingsModalItem, {
                 title: t('Set default sorting rules'),
                 components: {
-                    ArrayItems: components_namespaceObject.ArrayItems
+                    ArrayItems: client_namespaceObject.ArrayItems
                 },
                 schema: {
                     type: 'object',
@@ -616,8 +616,8 @@ AssociationSelect.FilterDesigner = function() {
             form && !(null == form ? void 0 : form.readPretty) && validateSchema && /*#__PURE__*/ (0, jsx_runtime_namespaceObject.jsx)(SchemaSettings_js_namespaceObject.SchemaSettingsModalItem, {
                 title: t('Set validation rules'),
                 components: {
-                    ArrayCollapse: components_namespaceObject.ArrayCollapse,
-                    FormLayout: components_namespaceObject.FormLayout
+                    ArrayCollapse: client_namespaceObject.ArrayCollapse,
+                    FormLayout: client_namespaceObject.FormLayout
                 },
                 schema: {
                     type: 'object',
@@ -729,8 +729,8 @@ AssociationSelect.FilterDesigner = function() {
             form && !(null == form ? void 0 : form.readPretty) && (null == collectionField ? void 0 : null == (_collectionField_uiSchema1 = collectionField.uiSchema) ? void 0 : _collectionField_uiSchema1.type) && /*#__PURE__*/ (0, jsx_runtime_namespaceObject.jsx)(SchemaSettings_js_namespaceObject.SchemaSettingsModalItem, {
                 title: t('Set default value'),
                 components: {
-                    ArrayCollapse: components_namespaceObject.ArrayCollapse,
-                    FormLayout: components_namespaceObject.FormLayout
+                    ArrayCollapse: client_namespaceObject.ArrayCollapse,
+                    FormLayout: client_namespaceObject.FormLayout
                 },
                 schema: {
                     type: 'object',
@@ -778,7 +778,7 @@ AssociationSelect.FilterDesigner = function() {
             /*#__PURE__*/ (0, jsx_runtime_namespaceObject.jsx)(SchemaSettings_js_namespaceObject.SchemaSettingsModalItem, {
                 title: t('Set default sorting rules'),
                 components: {
-                    ArrayItems: components_namespaceObject.ArrayItems
+                    ArrayItems: client_namespaceObject.ArrayItems
                 },
                 schema: {
                     type: 'object',

package/lib/schema-component/antd/auto-complete/AutoComplete.js

@@ -29,7 +29,7 @@ __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 client_namespaceObject = require("@tachybase/utils/client");
+const client_namespaceObject = require("@tego/client");
 const external_ahooks_namespaceObject = require("ahooks");
 const external_antd_namespaceObject = require("antd");
 const index_js_namespaceObject = require("../../../api-client/index.js");

package/lib/schema-component/antd/color-picker/ColorPicker.js

@@ -38,8 +38,8 @@ __webpack_require__.d(__webpack_exports__, {
 });
 const jsx_runtime_namespaceObject = require("react/jsx-runtime");
 require("react");
-const components_namespaceObject = require("@tachybase/components");
 const schema_namespaceObject = require("@tachybase/schema");
+const client_namespaceObject = require("@tego/client");
 const external_antd_namespaceObject = require("antd");
 const external_antd_style_namespaceObject = require("antd-style");
 const external_classnames_namespaceObject = require("classnames");
@@ -107,7 +107,7 @@ const ColorPicker = (0, schema_namespaceObject.connect)((props)=>{
 }, (0, schema_namespaceObject.mapProps)((props, field)=>({
         ...props
     })), (0, schema_namespaceObject.mapReadPretty)((props)=>{
-    const prefixCls = (0, components_namespaceObject.usePrefixCls)("description-color-picker", props);
+    const prefixCls = (0, client_namespaceObject.usePrefixCls)("description-color-picker", props);
     const { styles } = useStyles();
     return /*#__PURE__*/ (0, jsx_runtime_namespaceObject.jsx)("div", {
         role: "button",

package/lib/schema-component/antd/color-picker/util.js

@@ -29,7 +29,7 @@ __webpack_require__.d(__webpack_exports__, {
     mapDatePicker: ()=>mapDatePicker,
     getDateRanges: ()=>getDateRanges
 });
-const client_namespaceObject = require("@tachybase/utils/client");
+const client_namespaceObject = require("@tego/client");
 const toStringByPicker = (value, picker, timezone)=>{
     if (!client_namespaceObject.dayjs.isDayjs(value)) return value;
     if ('local' === timezone) {

package/lib/schema-component/antd/cron/Cron.js

@@ -39,7 +39,7 @@ __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 client_namespaceObject = require("@tachybase/utils/client");
+const client_namespaceObject = require("@tego/client");
 const external_antd_style_namespaceObject = require("antd-style");
 const external_cronstrue_namespaceObject = require("cronstrue");
 var external_cronstrue_default = /*#__PURE__*/ __webpack_require__.n(external_cronstrue_namespaceObject);

package/lib/schema-component/antd/date-picker/ReadPretty.js

@@ -38,7 +38,7 @@ __webpack_require__.d(__webpack_exports__, {
 const jsx_runtime_namespaceObject = require("react/jsx-runtime");
 require("react");
 const schema_namespaceObject = require("@tachybase/schema");
-const client_namespaceObject = require("@tachybase/utils/client");
+const client_namespaceObject = require("@tego/client");
 const external_classnames_namespaceObject = require("classnames");
 var external_classnames_default = /*#__PURE__*/ __webpack_require__.n(external_classnames_namespaceObject);
 const external_dayjs_namespaceObject = require("dayjs");

package/lib/schema-component/antd/date-picker/util.js

@@ -30,7 +30,7 @@ __webpack_require__.d(__webpack_exports__, {
     getDateExact: ()=>getDateExact,
     getDateRanges: ()=>getDateRanges
 });
-const client_namespaceObject = require("@tachybase/utils/client");
+const client_namespaceObject = require("@tego/client");
 const toStringByPicker = (value, picker, timezone)=>{
     if (!client_namespaceObject.dayjs.isDayjs(value)) return value;
     if ('local' === timezone) {

package/lib/schema-component/antd/filter/FilterAction.js

@@ -30,7 +30,7 @@ __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 client_namespaceObject = require("@tachybase/utils/client");
+const client_namespaceObject = require("@tego/client");
 const external_antd_namespaceObject = require("antd");
 const external_antd_style_namespaceObject = require("antd-style");
 const external_react_i18next_namespaceObject = require("react-i18next");

package/lib/schema-component/antd/form/Form.js

@@ -28,8 +28,8 @@ __webpack_require__.d(__webpack_exports__, {
 });
 const jsx_runtime_namespaceObject = require("react/jsx-runtime");
 const external_react_namespaceObject = require("react");
-const components_namespaceObject = require("@tachybase/components");
 const schema_namespaceObject = require("@tachybase/schema");
+const client_namespaceObject = require("@tego/client");
 const external_antd_namespaceObject = require("antd");
 const external_index_js_namespaceObject = require("../../index.js");
 const index_js_namespaceObject = require("../../../api-client/index.js");
@@ -48,7 +48,7 @@ const FormComponent = (props)=>{
         value: void 0,
         children: /*#__PURE__*/ (0, jsx_runtime_namespaceObject.jsx)(schema_namespaceObject.FormContext.Provider, {
             value: form,
-            children: /*#__PURE__*/ (0, jsx_runtime_namespaceObject.jsx)(components_namespaceObject.FormLayout, {
+            children: /*#__PURE__*/ (0, jsx_runtime_namespaceObject.jsx)(client_namespaceObject.FormLayout, {
                 layout: 'vertical',
                 ...others,
                 children: /*#__PURE__*/ (0, jsx_runtime_namespaceObject.jsx)(schema_namespaceObject.RecursionField, {
@@ -82,7 +82,7 @@ const FormDecorator = (props)=>{
             value: void 0,
             children: /*#__PURE__*/ (0, jsx_runtime_namespaceObject.jsx)(schema_namespaceObject.FormContext.Provider, {
                 value: form,
-                children: /*#__PURE__*/ (0, jsx_runtime_namespaceObject.jsx)(components_namespaceObject.FormLayout, {
+                children: /*#__PURE__*/ (0, jsx_runtime_namespaceObject.jsx)(client_namespaceObject.FormLayout, {
                     layout: 'vertical',
                     ...others,
                     children: /*#__PURE__*/ (0, jsx_runtime_namespaceObject.jsx)(schema_namespaceObject.FieldContext.Provider, {

package/lib/schema-component/antd/form-item/FormItem.Settings.js

@@ -48,8 +48,8 @@ __webpack_require__.d(__webpack_exports__, {
 });
 const jsx_runtime_namespaceObject = require("react/jsx-runtime");
 require("react");
-const components_namespaceObject = require("@tachybase/components");
 const schema_namespaceObject = require("@tachybase/schema");
+const client_namespaceObject = require("@tego/client");
 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");
@@ -233,8 +233,8 @@ const formItemSettings = new index_js_namespaceObject.SchemaSettings({
                 return {
                     title: t('Set validation rules'),
                     components: {
-                        ArrayCollapse: components_namespaceObject.ArrayCollapse,
-                        FormLayout: components_namespaceObject.FormLayout
+                        ArrayCollapse: client_namespaceObject.ArrayCollapse,
+                        FormLayout: client_namespaceObject.FormLayout
                     },
                     schema: {
                         type: 'object',

package/lib/schema-component/antd/form-item/FormItem.js

@@ -38,8 +38,8 @@ __webpack_require__.d(__webpack_exports__, {
 });
 const jsx_runtime_namespaceObject = require("react/jsx-runtime");
 const external_react_namespaceObject = require("react");
-const components_namespaceObject = require("@tachybase/components");
 const schema_namespaceObject = require("@tachybase/schema");
+const client_namespaceObject = require("@tego/client");
 const external_antd_style_namespaceObject = require("antd-style");
 const external_classnames_namespaceObject = require("classnames");
 var external_classnames_default = /*#__PURE__*/ __webpack_require__.n(external_classnames_namespaceObject);
@@ -156,7 +156,7 @@ const FormItem = (props)=>{
         children: /*#__PURE__*/ (0, jsx_runtime_namespaceObject.jsx)(external_block_item_index_js_namespaceObject.BlockItem, {
             className: 'tb-form-item',
             children: /*#__PURE__*/ (0, jsx_runtime_namespaceObject.jsx)(acl_index_js_namespaceObject.ACLCollectionFieldProvider, {
-                children: /*#__PURE__*/ (0, jsx_runtime_namespaceObject.jsx)(components_namespaceObject.FormItem, {
+                children: /*#__PURE__*/ (0, jsx_runtime_namespaceObject.jsx)(client_namespaceObject.FormItem, {
                     className: className,
                     ...props,
                     extra: extra

package/lib/schema-component/antd/form-item/SchemaSettingOptions.js

@@ -48,8 +48,8 @@ __webpack_require__.d(__webpack_exports__, {
 });
 const jsx_runtime_namespaceObject = require("react/jsx-runtime");
 require("react");
-const components_namespaceObject = require("@tachybase/components");
 const schema_namespaceObject = require("@tachybase/schema");
+const client_namespaceObject = require("@tego/client");
 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");
@@ -216,8 +216,8 @@ const EditValidationRules = ()=>{
     return form && !(null == form ? void 0 : form.readPretty) && validateSchema ? /*#__PURE__*/ (0, jsx_runtime_namespaceObject.jsx)(external_schema_settings_index_js_namespaceObject.SchemaSettingsModalItem, {
         title: t('Set validation rules'),
         components: {
-            ArrayCollapse: components_namespaceObject.ArrayCollapse,
-            FormLayout: components_namespaceObject.FormLayout
+            ArrayCollapse: client_namespaceObject.ArrayCollapse,
+            FormLayout: client_namespaceObject.FormLayout
         },
         schema: {
             type: 'object',
@@ -340,8 +340,8 @@ const EditDefaultValue = ()=>{
     return form && !(null == form ? void 0 : form.readPretty) && (null == collectionField ? void 0 : null == (_collectionField_uiSchema = collectionField.uiSchema) ? void 0 : _collectionField_uiSchema.type) ? /*#__PURE__*/ (0, jsx_runtime_namespaceObject.jsx)(external_schema_settings_index_js_namespaceObject.SchemaSettingsModalItem, {
         title: t('Set default value'),
         components: {
-            ArrayCollapse: components_namespaceObject.ArrayCollapse,
-            FormLayout: components_namespaceObject.FormLayout
+            ArrayCollapse: client_namespaceObject.ArrayCollapse,
+            FormLayout: client_namespaceObject.FormLayout
         },
         schema: {
             type: 'object',

package/lib/schema-component/antd/form-item/hooks/useLazyLoadDisplayAssociationFieldsOfForm.js

@@ -37,7 +37,7 @@ __webpack_require__.d(__webpack_exports__, {
 });
 const external_react_namespaceObject = require("react");
 const schema_namespaceObject = require("@tachybase/schema");
-const client_namespaceObject = require("@tachybase/utils/client");
+const client_namespaceObject = require("@tego/client");
 const external_lodash_namespaceObject = require("lodash");
 var external_lodash_default = /*#__PURE__*/ __webpack_require__.n(external_lodash_namespaceObject);
 const index_js_namespaceObject = require("../../../../block-provider/hooks/index.js");

package/lib/schema-component/antd/form-item/hooks/useParseDefaultValue.js

@@ -37,7 +37,7 @@ __webpack_require__.d(__webpack_exports__, {
 });
 const external_react_namespaceObject = require("react");
 const schema_namespaceObject = require("@tachybase/schema");
-const client_namespaceObject = require("@tachybase/utils/client");
+const client_namespaceObject = require("@tego/client");
 const external_lodash_namespaceObject = require("lodash");
 var external_lodash_default = /*#__PURE__*/ __webpack_require__.n(external_lodash_namespaceObject);
 const index_js_namespaceObject = require("../../../../record-provider/index.js");

package/lib/schema-component/antd/form-v2/Form.Settings.js

@@ -28,8 +28,8 @@ __webpack_require__.d(__webpack_exports__, {
     formSettings: ()=>formSettings,
     readPrettyFormSettings: ()=>readPrettyFormSettings
 });
-const components_namespaceObject = require("@tachybase/components");
 const schema_namespaceObject = require("@tachybase/schema");
+const client_namespaceObject = require("@tego/client");
 const external_react_i18next_namespaceObject = require("react-i18next");
 const index_js_namespaceObject = require("../../../application/schema-settings/index.js");
 const external_block_provider_index_js_namespaceObject = require("../../../block-provider/index.js");
@@ -217,7 +217,7 @@ const formDetailsSettings = new index_js_namespaceObject.SchemaSettings({
                 return {
                     title: t('Set default sorting rules'),
                     components: {
-                        ArrayItems: components_namespaceObject.ArrayItems
+                        ArrayItems: client_namespaceObject.ArrayItems
                     },
                     schema: {
                         type: 'object',

package/lib/schema-component/antd/form-v2/Form.js

@@ -28,9 +28,8 @@ __webpack_require__.d(__webpack_exports__, {
 });
 const jsx_runtime_namespaceObject = require("react/jsx-runtime");
 const external_react_namespaceObject = require("react");
-const components_namespaceObject = require("@tachybase/components");
 const schema_namespaceObject = require("@tachybase/schema");
-const client_namespaceObject = require("@tachybase/utils/client");
+const client_namespaceObject = require("@tego/client");
 const external_antd_namespaceObject = require("antd");
 const external_antd_style_namespaceObject = require("antd-style");
 const external_index_js_namespaceObject = require("../index.js");
@@ -79,7 +78,7 @@ const FormComponent = (props)=>{
         value: void 0,
         children: /*#__PURE__*/ (0, jsx_runtime_namespaceObject.jsx)(schema_namespaceObject.FormContext.Provider, {
             value: form,
-            children: /*#__PURE__*/ (0, jsx_runtime_namespaceObject.jsx)(components_namespaceObject.FormLayout, {
+            children: /*#__PURE__*/ (0, jsx_runtime_namespaceObject.jsx)(client_namespaceObject.FormLayout, {
                 layout: 'vertical',
                 ...others,
                 children: /*#__PURE__*/ (0, jsx_runtime_namespaceObject.jsx)(schema_namespaceObject.RecursionField, {
@@ -105,7 +104,7 @@ const FormDecorator = (props)=>{
         value: void 0,
         children: /*#__PURE__*/ (0, jsx_runtime_namespaceObject.jsx)(schema_namespaceObject.FormContext.Provider, {
             value: form,
-            children: /*#__PURE__*/ (0, jsx_runtime_namespaceObject.jsx)(components_namespaceObject.FormLayout, {
+            children: /*#__PURE__*/ (0, jsx_runtime_namespaceObject.jsx)(client_namespaceObject.FormLayout, {
                 layout: 'vertical',
                 ...others,
                 children: /*#__PURE__*/ (0, jsx_runtime_namespaceObject.jsx)(schema_namespaceObject.FieldContext.Provider, {

package/lib/schema-component/antd/form-v2/Templates.js

@@ -39,7 +39,7 @@ __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 client_namespaceObject = require("@tachybase/utils/client");
+const client_namespaceObject = require("@tego/client");
 const external_antd_namespaceObject = require("antd");
 const external_lodash_namespaceObject = require("lodash");
 var external_lodash_default = /*#__PURE__*/ __webpack_require__.n(external_lodash_namespaceObject);

package/lib/schema-component/antd/form-v2/utils.js

@@ -36,8 +36,7 @@ __webpack_require__.d(__webpack_exports__, {
     collectFieldStateOfLinkageRules: ()=>collectFieldStateOfLinkageRules,
     getTempFieldState: ()=>getTempFieldState
 });
-const client_namespaceObject = require("@tachybase/evaluators/client");
-const utils_client_namespaceObject = require("@tachybase/utils/client");
+const client_namespaceObject = require("@tego/client");
 const external_lodash_namespaceObject = require("lodash");
 var external_lodash_default = /*#__PURE__*/ __webpack_require__.n(external_lodash_namespaceObject);
 const type_js_namespaceObject = require("../../../schema-settings/LinkageRules/type.js");
@@ -163,7 +162,7 @@ async function replaceVariables(value, param) {
     if (null == value) return;
     const waitForParsing = null == (_value_match = value.match(isVariable_js_namespaceObject.REGEX_OF_VARIABLE)) ? void 0 : _value_match.map(async (item)=>{
         const result = await variables.parseVariable(item, localVariables);
-        const id = "_".concat((0, utils_client_namespaceObject.uid)());
+        const id = "_".concat((0, client_namespaceObject.uid)());
         scope[id] = result;
         store[item] = id;
         return result;

package/lib/schema-component/antd/grid-card/GridCard.Decorator.js

@@ -40,8 +40,8 @@ __webpack_require__.d(__webpack_exports__, {
 });
 const jsx_runtime_namespaceObject = require("react/jsx-runtime");
 const external_react_namespaceObject = require("react");
-const components_namespaceObject = require("@tachybase/components");
 const schema_namespaceObject = require("@tachybase/schema");
+const client_namespaceObject = require("@tego/client");
 const withDynamicSchemaProps_js_namespaceObject = require("../../../application/hoc/withDynamicSchemaProps.js");
 const index_js_namespaceObject = require("../../../block-provider/index.js");
 const useGridCardBlockParams_js_namespaceObject = require("../../../modules/blocks/data-blocks/grid-card/hooks/useGridCardBlockParams.js");
@@ -77,7 +77,7 @@ const InternalGridCardBlockProvider = (props)=>{
         },
         children: /*#__PURE__*/ (0, jsx_runtime_namespaceObject.jsx)(schema_namespaceObject.FormContext.Provider, {
             value: form,
-            children: /*#__PURE__*/ (0, jsx_runtime_namespaceObject.jsx)(components_namespaceObject.FormLayout, {
+            children: /*#__PURE__*/ (0, jsx_runtime_namespaceObject.jsx)(client_namespaceObject.FormLayout, {
                 layout: 'vertical',
                 children: /*#__PURE__*/ (0, jsx_runtime_namespaceObject.jsx)("div", {
                     className: "".concat(componentCls, " ").concat(hashId),