@nocobase/client 0.13.0-alpha.2 → 0.13.0-alpha.4
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/es/application/WebSocketClient.js +0 -1
- package/es/collection-manager/templates/components/PreviewFields.js +1 -2
- package/es/global-theme/type.d.ts +1 -1
- package/es/schema-component/antd/action/Action.js +2 -1
- package/es/schema-component/antd/association-field/InternalPopoverNester.js +4 -4
- package/es/schema-component/antd/filter/FilterAction.js +7 -5
- package/es/schema-component/antd/icon-picker/IconPicker.js +2 -1
- package/es/schema-component/antd/index.d.ts +1 -0
- package/es/schema-component/antd/index.js +1 -0
- package/es/schema-component/antd/input/EllipsisWithTooltip.js +2 -2
- package/es/schema-component/antd/popover/Popover.d.ts +3 -0
- package/es/schema-component/antd/popover/Popover.js +18 -0
- package/es/schema-component/antd/popover/index.d.ts +1 -0
- package/es/schema-component/antd/popover/index.js +1 -0
- package/es/schema-component/antd/quick-edit/QuickEdit.js +1 -1
- package/lib/application/WebSocketClient.js +0 -1
- package/lib/collection-manager/templates/components/PreviewFields.js +1 -2
- package/lib/global-theme/type.d.ts +1 -1
- package/lib/schema-component/antd/action/Action.js +2 -1
- package/lib/schema-component/antd/association-field/InternalPopoverNester.js +5 -5
- package/lib/schema-component/antd/filter/FilterAction.js +6 -4
- package/lib/schema-component/antd/icon-picker/IconPicker.js +2 -1
- package/lib/schema-component/antd/index.d.ts +1 -0
- package/lib/schema-component/antd/index.js +11 -0
- package/lib/schema-component/antd/input/EllipsisWithTooltip.js +2 -2
- package/lib/schema-component/antd/popover/Popover.d.ts +3 -0
- package/lib/schema-component/antd/popover/Popover.js +27 -0
- package/lib/schema-component/antd/popover/index.d.ts +1 -0
- package/lib/schema-component/antd/popover/index.js +16 -0
- package/lib/schema-component/antd/quick-edit/QuickEdit.js +2 -2
- package/package.json +7 -7
|
@@ -18,7 +18,6 @@ export var getWebSocketURL = function getWebSocketURL() {
|
|
|
18
18
|
}
|
|
19
19
|
var subApp = getSubAppName();
|
|
20
20
|
var queryString = subApp ? "?__appName=".concat(subApp) : '';
|
|
21
|
-
console.log(queryString);
|
|
22
21
|
if (process.env.WEBSOCKET_URL) {
|
|
23
22
|
return "".concat(process.env.WEBSOCKET_URL).concat(queryString);
|
|
24
23
|
}
|
|
@@ -10,9 +10,8 @@ function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o =
|
|
|
10
10
|
function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
|
|
11
11
|
function _iterableToArrayLimit(arr, i) { var _i = null == arr ? null : "undefined" != typeof Symbol && arr[Symbol.iterator] || arr["@@iterator"]; if (null != _i) { var _s, _e, _x, _r, _arr = [], _n = !0, _d = !1; try { if (_x = (_i = _i.call(arr)).next, 0 === i) { if (Object(_i) !== _i) return; _n = !1; } else for (; !(_n = (_s = _x.call(_i)).done) && (_arr.push(_s.value), _arr.length !== i); _n = !0); } catch (err) { _d = !0, _e = err; } finally { try { if (!_n && null != _i.return && (_r = _i.return(), Object(_r) !== _r)) return; } finally { if (_d) throw _e; } } return _arr; } }
|
|
12
12
|
function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
|
|
13
|
-
import { Cascader } from '@formily/antd-v5';
|
|
14
13
|
import { useField, useForm } from '@formily/react';
|
|
15
|
-
import { Input, Select, Spin, Table, Tag } from 'antd';
|
|
14
|
+
import { Cascader, Input, Select, Spin, Table, Tag } from 'antd';
|
|
16
15
|
import { last } from 'lodash';
|
|
17
16
|
import React, { useContext, useEffect, useState } from 'react';
|
|
18
17
|
import { useTranslation } from 'react-i18next';
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { MappingAlgorithm } from 'antd
|
|
1
|
+
import { MappingAlgorithm } from 'antd-style';
|
|
2
2
|
import { OverrideToken } from 'antd/es/theme/interface';
|
|
3
3
|
import { AliasToken } from 'antd/es/theme/internal';
|
|
4
4
|
export interface CustomToken extends AliasToken {
|
|
@@ -14,7 +14,7 @@ function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
|
|
|
14
14
|
function _objectWithoutProperties(source, excluded) { if (source == null) return {}; var target = _objectWithoutPropertiesLoose(source, excluded); var key, i; if (Object.getOwnPropertySymbols) { var sourceSymbolKeys = Object.getOwnPropertySymbols(source); for (i = 0; i < sourceSymbolKeys.length; i++) { key = sourceSymbolKeys[i]; if (excluded.indexOf(key) >= 0) continue; if (!Object.prototype.propertyIsEnumerable.call(source, key)) continue; target[key] = source[key]; } } return target; }
|
|
15
15
|
function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) return {}; var target = {}; var sourceKeys = Object.keys(source); var key, i; for (i = 0; i < sourceKeys.length; i++) { key = sourceKeys[i]; if (excluded.indexOf(key) >= 0) continue; target[key] = source[key]; } return target; }
|
|
16
16
|
import { observer, RecursionField, useField, useFieldSchema, useForm } from '@formily/react';
|
|
17
|
-
import { App, Button
|
|
17
|
+
import { App, Button } from 'antd';
|
|
18
18
|
import classnames from 'classnames';
|
|
19
19
|
import lodash from 'lodash';
|
|
20
20
|
import React, { useEffect, useState } from 'react';
|
|
@@ -26,6 +26,7 @@ import { useRecord } from '../../../record-provider';
|
|
|
26
26
|
import { SortableItem } from '../../common';
|
|
27
27
|
import { useCompile, useComponent, useDesigner } from '../../hooks';
|
|
28
28
|
import { useProps } from '../../hooks/useProps';
|
|
29
|
+
import { Popover } from '../popover';
|
|
29
30
|
import ActionContainer from './Action.Container';
|
|
30
31
|
import { ActionDesigner } from './Action.Designer';
|
|
31
32
|
import { ActionDrawer } from './Action.Drawer';
|
|
@@ -12,16 +12,16 @@ function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o =
|
|
|
12
12
|
function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
|
|
13
13
|
function _iterableToArrayLimit(arr, i) { var _i = null == arr ? null : "undefined" != typeof Symbol && arr[Symbol.iterator] || arr["@@iterator"]; if (null != _i) { var _s, _e, _x, _r, _arr = [], _n = !0, _d = !1; try { if (_x = (_i = _i.call(arr)).next, 0 === i) { if (Object(_i) !== _i) return; _n = !1; } else for (; !(_n = (_s = _x.call(_i)).done) && (_arr.push(_s.value), _arr.length !== i); _n = !0); } catch (err) { _d = !0, _e = err; } finally { try { if (!_n && null != _i.return && (_r = _i.return(), Object(_r) !== _r)) return; } finally { if (_d) throw _e; } } return _arr; } }
|
|
14
14
|
function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
|
|
15
|
-
import { Popover } from 'antd';
|
|
16
|
-
import { css } from '@emotion/css';
|
|
17
15
|
import { EditOutlined } from '@ant-design/icons';
|
|
16
|
+
import { css } from '@emotion/css';
|
|
18
17
|
import { observer } from '@formily/react';
|
|
19
18
|
import React, { useContext, useRef, useState } from 'react';
|
|
20
19
|
import { useTranslation } from 'react-i18next';
|
|
21
|
-
import {
|
|
20
|
+
import { ActionContext, ActionContextProvider } from '../action/context';
|
|
21
|
+
import { Popover } from '../popover';
|
|
22
22
|
import { InternalNester } from './InternalNester';
|
|
23
|
+
import { ReadPrettyInternalViewer } from './InternalViewer';
|
|
23
24
|
import { useAssociationFieldContext } from './hooks';
|
|
24
|
-
import { ActionContextProvider, ActionContext } from '../action/context';
|
|
25
25
|
export var InternaPopoverNester = observer(function (props) {
|
|
26
26
|
var _options$uiSchema;
|
|
27
27
|
var _useAssociationFieldC = useAssociationFieldContext(),
|
|
@@ -21,13 +21,14 @@ function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
|
|
|
21
21
|
import { css } from '@emotion/css';
|
|
22
22
|
import { createForm } from '@formily/core';
|
|
23
23
|
import { observer, useField, useFieldSchema, useForm } from '@formily/react';
|
|
24
|
-
import { Button,
|
|
25
|
-
import React, { createContext, useContext, useMemo, useState } from 'react';
|
|
24
|
+
import { Button, Space } from 'antd';
|
|
25
|
+
import React, { createContext, useCallback, useContext, useMemo, useState } from 'react';
|
|
26
26
|
import { useTranslation } from 'react-i18next';
|
|
27
27
|
import { FormProvider, SchemaComponent } from '../../core';
|
|
28
28
|
import { useDesignable } from '../../hooks';
|
|
29
29
|
import { useProps } from '../../hooks/useProps';
|
|
30
30
|
import { Action } from '../action';
|
|
31
|
+
import { Popover } from '../popover';
|
|
31
32
|
export var FilterActionContext = /*#__PURE__*/createContext(null);
|
|
32
33
|
export var FilterAction = observer(function (props) {
|
|
33
34
|
var _useTranslation = useTranslation(),
|
|
@@ -49,6 +50,9 @@ export var FilterAction = observer(function (props) {
|
|
|
49
50
|
onSubmit = _useProps.onSubmit,
|
|
50
51
|
onReset = _useProps.onReset,
|
|
51
52
|
others = _objectWithoutProperties(_useProps, _excluded);
|
|
53
|
+
var onOpenChange = useCallback(function (visible) {
|
|
54
|
+
setVisible(visible);
|
|
55
|
+
}, []);
|
|
52
56
|
return /*#__PURE__*/React.createElement(FilterActionContext.Provider, {
|
|
53
57
|
value: {
|
|
54
58
|
field: field,
|
|
@@ -60,9 +64,7 @@ export var FilterAction = observer(function (props) {
|
|
|
60
64
|
destroyTooltipOnHide: true,
|
|
61
65
|
placement: 'bottomLeft',
|
|
62
66
|
open: visible,
|
|
63
|
-
onOpenChange:
|
|
64
|
-
setVisible(visible);
|
|
65
|
-
},
|
|
67
|
+
onOpenChange: onOpenChange,
|
|
66
68
|
trigger: 'click',
|
|
67
69
|
content: /*#__PURE__*/React.createElement("form", null, /*#__PURE__*/React.createElement(FormProvider, {
|
|
68
70
|
form: form
|
|
@@ -18,10 +18,11 @@ import { CloseOutlined, LoadingOutlined } from '@ant-design/icons';
|
|
|
18
18
|
import { useFormLayout } from '@formily/antd-v5';
|
|
19
19
|
import { connect, mapProps, mapReadPretty } from '@formily/react';
|
|
20
20
|
import { isValid } from '@formily/shared';
|
|
21
|
-
import { Button, Input
|
|
21
|
+
import { Button, Input } from 'antd';
|
|
22
22
|
import React, { useState } from 'react';
|
|
23
23
|
import { useTranslation } from 'react-i18next';
|
|
24
24
|
import { Icon, hasIcon, icons } from '../../../icon';
|
|
25
|
+
import { Popover } from '../popover';
|
|
25
26
|
function IconField(props) {
|
|
26
27
|
var layout = useFormLayout();
|
|
27
28
|
var value = props.value,
|
|
@@ -10,8 +10,8 @@ function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o =
|
|
|
10
10
|
function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
|
|
11
11
|
function _iterableToArrayLimit(arr, i) { var _i = null == arr ? null : "undefined" != typeof Symbol && arr[Symbol.iterator] || arr["@@iterator"]; if (null != _i) { var _s, _e, _x, _r, _arr = [], _n = !0, _d = !1; try { if (_x = (_i = _i.call(arr)).next, 0 === i) { if (Object(_i) !== _i) return; _n = !1; } else for (; !(_n = (_s = _x.call(_i)).done) && (_arr.push(_s.value), _arr.length !== i); _n = !0); } catch (err) { _d = !0, _e = err; } finally { try { if (!_n && null != _i.return && (_r = _i.return(), Object(_r) !== _r)) return; } finally { if (_d) throw _e; } } return _arr; } }
|
|
12
12
|
function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
|
|
13
|
-
import {
|
|
14
|
-
import
|
|
13
|
+
import React, { forwardRef, useImperativeHandle, useRef, useState } from 'react';
|
|
14
|
+
import { Popover } from '../popover';
|
|
15
15
|
var getContentWidth = function getContentWidth(element) {
|
|
16
16
|
if (element) {
|
|
17
17
|
var range = document.createRange();
|
|
@@ -0,0 +1,18 @@
|
|
|
1
|
+
function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (obj) { return typeof obj; } : function (obj) { return obj && "function" == typeof Symbol && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }, _typeof(obj); }
|
|
2
|
+
function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
|
|
3
|
+
function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
|
|
4
|
+
function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
|
|
5
|
+
function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return _typeof(key) === "symbol" ? key : String(key); }
|
|
6
|
+
function _toPrimitive(input, hint) { if (_typeof(input) !== "object" || input === null) return input; var prim = input[Symbol.toPrimitive]; if (prim !== undefined) { var res = prim.call(input, hint || "default"); if (_typeof(res) !== "object") return res; throw new TypeError("@@toPrimitive must return a primitive value."); } return (hint === "string" ? String : Number)(input); }
|
|
7
|
+
import { Popover as AntdPopover } from 'antd';
|
|
8
|
+
import React, { useCallback } from 'react';
|
|
9
|
+
export var Popover = function Popover(props) {
|
|
10
|
+
// 参见:https://github.com/ant-design/ant-design/issues/44119
|
|
11
|
+
// fix T-1508
|
|
12
|
+
var avoidClose = useCallback(function (e) {
|
|
13
|
+
e.stopPropagation();
|
|
14
|
+
}, []);
|
|
15
|
+
return /*#__PURE__*/React.createElement("div", {
|
|
16
|
+
onClick: avoidClose
|
|
17
|
+
}, /*#__PURE__*/React.createElement(AntdPopover, _objectSpread({}, props)));
|
|
18
|
+
};
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
export * from './Popover';
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
export * from './Popover';
|
|
@@ -10,9 +10,9 @@ import { css } from '@emotion/css';
|
|
|
10
10
|
import { FormItem } from '@formily/antd-v5';
|
|
11
11
|
import { createForm } from '@formily/core';
|
|
12
12
|
import { FormContext, RecursionField, observer, useField, useFieldSchema } from '@formily/react';
|
|
13
|
-
import { Popover } from 'antd';
|
|
14
13
|
import React, { useMemo, useRef } from 'react';
|
|
15
14
|
import { useCollectionManager } from '../../../collection-manager';
|
|
15
|
+
import { Popover } from '../popover';
|
|
16
16
|
export var Editable = observer(function (props) {
|
|
17
17
|
var field = useField();
|
|
18
18
|
var containerRef = useRef(null);
|
|
@@ -24,7 +24,6 @@ var getWebSocketURL = function getWebSocketURL() {
|
|
|
24
24
|
}
|
|
25
25
|
var subApp = (0, _sdk.getSubAppName)();
|
|
26
26
|
var queryString = subApp ? "?__appName=".concat(subApp) : '';
|
|
27
|
-
console.log(queryString);
|
|
28
27
|
if (process.env.WEBSOCKET_URL) {
|
|
29
28
|
return "".concat(process.env.WEBSOCKET_URL).concat(queryString);
|
|
30
29
|
}
|
|
@@ -5,7 +5,6 @@ Object.defineProperty(exports, "__esModule", {
|
|
|
5
5
|
value: true
|
|
6
6
|
});
|
|
7
7
|
exports.PreviewFields = void 0;
|
|
8
|
-
var _antdV = require("@formily/antd-v5");
|
|
9
8
|
var _react = require("@formily/react");
|
|
10
9
|
var _antd = require("antd");
|
|
11
10
|
var _lodash = require("lodash");
|
|
@@ -177,7 +176,7 @@ var PreviewCom = function PreviewCom(props) {
|
|
|
177
176
|
key: 'source',
|
|
178
177
|
width: 200,
|
|
179
178
|
render: function render(text, record, index) {
|
|
180
|
-
return /*#__PURE__*/_react2.default.createElement(
|
|
179
|
+
return /*#__PURE__*/_react2.default.createElement(_antd.Cascader, {
|
|
181
180
|
defaultValue: typeof text === 'string' ? text === null || text === void 0 ? void 0 : text.split('.') : text,
|
|
182
181
|
allowClear: true,
|
|
183
182
|
style: {
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { MappingAlgorithm } from 'antd
|
|
1
|
+
import { MappingAlgorithm } from 'antd-style';
|
|
2
2
|
import { OverrideToken } from 'antd/es/theme/interface';
|
|
3
3
|
import { AliasToken } from 'antd/es/theme/internal';
|
|
4
4
|
export interface CustomToken extends AliasToken {
|
|
@@ -18,6 +18,7 @@ var _recordProvider = require("../../../record-provider");
|
|
|
18
18
|
var _common = require("../../common");
|
|
19
19
|
var _hooks = require("../../hooks");
|
|
20
20
|
var _useProps2 = require("../../hooks/useProps");
|
|
21
|
+
var _popover = require("../popover");
|
|
21
22
|
var _Action = _interopRequireDefault(require("./Action.Container"));
|
|
22
23
|
var _Action2 = require("./Action.Designer");
|
|
23
24
|
var _Action3 = require("./Action.Drawer");
|
|
@@ -167,7 +168,7 @@ Action.Popover = (0, _react.observer)(function (props) {
|
|
|
167
168
|
button = _useActionContext.button,
|
|
168
169
|
visible = _useActionContext.visible,
|
|
169
170
|
setVisible = _useActionContext.setVisible;
|
|
170
|
-
return /*#__PURE__*/_react2.default.createElement(
|
|
171
|
+
return /*#__PURE__*/_react2.default.createElement(_popover.Popover, _objectSpread(_objectSpread({}, props), {}, {
|
|
171
172
|
destroyTooltipOnHide: true,
|
|
172
173
|
open: visible,
|
|
173
174
|
onOpenChange: function onOpenChange(visible) {
|
|
@@ -5,16 +5,16 @@ Object.defineProperty(exports, "__esModule", {
|
|
|
5
5
|
value: true
|
|
6
6
|
});
|
|
7
7
|
exports.InternaPopoverNester = void 0;
|
|
8
|
-
var _antd = require("antd");
|
|
9
|
-
var _css = require("@emotion/css");
|
|
10
8
|
var _icons = require("@ant-design/icons");
|
|
9
|
+
var _css = require("@emotion/css");
|
|
11
10
|
var _react = require("@formily/react");
|
|
12
11
|
var _react2 = _interopRequireWildcard(require("react"));
|
|
13
12
|
var _reactI18next = require("react-i18next");
|
|
14
|
-
var
|
|
13
|
+
var _context = require("../action/context");
|
|
14
|
+
var _popover = require("../popover");
|
|
15
15
|
var _InternalNester = require("./InternalNester");
|
|
16
|
+
var _InternalViewer = require("./InternalViewer");
|
|
16
17
|
var _hooks = require("./hooks");
|
|
17
|
-
var _context = require("../action/context");
|
|
18
18
|
var _templateObject, _templateObject2, _templateObject3;
|
|
19
19
|
function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
|
|
20
20
|
function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
|
|
@@ -68,7 +68,7 @@ var InternaPopoverNester = (0, _react.observer)(function (props) {
|
|
|
68
68
|
value: _objectSpread(_objectSpread({}, ctx), {}, {
|
|
69
69
|
modalProps: modalProps
|
|
70
70
|
})
|
|
71
|
-
}, /*#__PURE__*/_react2.default.createElement(
|
|
71
|
+
}, /*#__PURE__*/_react2.default.createElement(_popover.Popover, {
|
|
72
72
|
overlayStyle: {
|
|
73
73
|
padding: '0px'
|
|
74
74
|
},
|
|
@@ -15,6 +15,7 @@ var _core2 = require("../../core");
|
|
|
15
15
|
var _hooks = require("../../hooks");
|
|
16
16
|
var _useProps2 = require("../../hooks/useProps");
|
|
17
17
|
var _action = require("../action");
|
|
18
|
+
var _popover = require("../popover");
|
|
18
19
|
var _templateObject, _templateObject2;
|
|
19
20
|
var _excluded = ["options", "onSubmit", "onReset"];
|
|
20
21
|
function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
|
|
@@ -58,6 +59,9 @@ var FilterAction = (0, _react.observer)(function (props) {
|
|
|
58
59
|
onSubmit = _useProps.onSubmit,
|
|
59
60
|
onReset = _useProps.onReset,
|
|
60
61
|
others = _objectWithoutProperties(_useProps, _excluded);
|
|
62
|
+
var onOpenChange = (0, _react2.useCallback)(function (visible) {
|
|
63
|
+
setVisible(visible);
|
|
64
|
+
}, []);
|
|
61
65
|
return /*#__PURE__*/_react2.default.createElement(FilterActionContext.Provider, {
|
|
62
66
|
value: {
|
|
63
67
|
field: field,
|
|
@@ -65,13 +69,11 @@ var FilterAction = (0, _react.observer)(function (props) {
|
|
|
65
69
|
designable: designable,
|
|
66
70
|
dn: dn
|
|
67
71
|
}
|
|
68
|
-
}, /*#__PURE__*/_react2.default.createElement(
|
|
72
|
+
}, /*#__PURE__*/_react2.default.createElement(_popover.Popover, {
|
|
69
73
|
destroyTooltipOnHide: true,
|
|
70
74
|
placement: 'bottomLeft',
|
|
71
75
|
open: visible,
|
|
72
|
-
onOpenChange:
|
|
73
|
-
setVisible(visible);
|
|
74
|
-
},
|
|
76
|
+
onOpenChange: onOpenChange,
|
|
75
77
|
trigger: 'click',
|
|
76
78
|
content: /*#__PURE__*/_react2.default.createElement("form", null, /*#__PURE__*/_react2.default.createElement(_core2.FormProvider, {
|
|
77
79
|
form: form
|
|
@@ -13,6 +13,7 @@ var _antd = require("antd");
|
|
|
13
13
|
var _react2 = _interopRequireWildcard(require("react"));
|
|
14
14
|
var _reactI18next = require("react-i18next");
|
|
15
15
|
var _icon = require("../../../icon");
|
|
16
|
+
var _popover = require("../popover");
|
|
16
17
|
function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
|
|
17
18
|
function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
|
|
18
19
|
function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
|
|
@@ -43,7 +44,7 @@ function IconField(props) {
|
|
|
43
44
|
t = _useTranslation.t;
|
|
44
45
|
return /*#__PURE__*/_react2.default.createElement("div", null, /*#__PURE__*/_react2.default.createElement(_antd.Input.Group, {
|
|
45
46
|
compact: true
|
|
46
|
-
}, /*#__PURE__*/_react2.default.createElement(
|
|
47
|
+
}, /*#__PURE__*/_react2.default.createElement(_popover.Popover, {
|
|
47
48
|
placement: 'bottom',
|
|
48
49
|
open: visible,
|
|
49
50
|
onOpenChange: function onOpenChange(val) {
|
|
@@ -410,6 +410,17 @@ Object.keys(_percent).forEach(function (key) {
|
|
|
410
410
|
}
|
|
411
411
|
});
|
|
412
412
|
});
|
|
413
|
+
var _popover = require("./popover");
|
|
414
|
+
Object.keys(_popover).forEach(function (key) {
|
|
415
|
+
if (key === "default" || key === "__esModule") return;
|
|
416
|
+
if (key in exports && exports[key] === _popover[key]) return;
|
|
417
|
+
Object.defineProperty(exports, key, {
|
|
418
|
+
enumerable: true,
|
|
419
|
+
get: function get() {
|
|
420
|
+
return _popover[key];
|
|
421
|
+
}
|
|
422
|
+
});
|
|
423
|
+
});
|
|
413
424
|
var _preview = require("./preview");
|
|
414
425
|
Object.keys(_preview).forEach(function (key) {
|
|
415
426
|
if (key === "default" || key === "__esModule") return;
|
|
@@ -5,8 +5,8 @@ Object.defineProperty(exports, "__esModule", {
|
|
|
5
5
|
value: true
|
|
6
6
|
});
|
|
7
7
|
exports.EllipsisWithTooltip = void 0;
|
|
8
|
-
var _antd = require("antd");
|
|
9
8
|
var _react = _interopRequireWildcard(require("react"));
|
|
9
|
+
var _popover = require("../popover");
|
|
10
10
|
function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
|
|
11
11
|
function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
|
|
12
12
|
function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
|
|
@@ -60,7 +60,7 @@ var EllipsisWithTooltip = /*#__PURE__*/(0, _react.forwardRef)(function (props, r
|
|
|
60
60
|
var offsetWidth = (_elRef$current = elRef.current) === null || _elRef$current === void 0 ? void 0 : _elRef$current.offsetWidth;
|
|
61
61
|
return contentWidth > offsetWidth;
|
|
62
62
|
};
|
|
63
|
-
return /*#__PURE__*/_react.default.createElement(
|
|
63
|
+
return /*#__PURE__*/_react.default.createElement(_popover.Popover, {
|
|
64
64
|
open: ellipsis && visible,
|
|
65
65
|
onOpenChange: function onOpenChange(visible) {
|
|
66
66
|
setVisible(ellipsis && visible);
|
|
@@ -0,0 +1,27 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
|
|
3
|
+
Object.defineProperty(exports, "__esModule", {
|
|
4
|
+
value: true
|
|
5
|
+
});
|
|
6
|
+
exports.Popover = void 0;
|
|
7
|
+
var _antd = require("antd");
|
|
8
|
+
var _react = _interopRequireWildcard(require("react"));
|
|
9
|
+
function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
|
|
10
|
+
function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
|
|
11
|
+
function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (obj) { return typeof obj; } : function (obj) { return obj && "function" == typeof Symbol && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }, _typeof(obj); }
|
|
12
|
+
function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
|
|
13
|
+
function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
|
|
14
|
+
function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
|
|
15
|
+
function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return _typeof(key) === "symbol" ? key : String(key); }
|
|
16
|
+
function _toPrimitive(input, hint) { if (_typeof(input) !== "object" || input === null) return input; var prim = input[Symbol.toPrimitive]; if (prim !== undefined) { var res = prim.call(input, hint || "default"); if (_typeof(res) !== "object") return res; throw new TypeError("@@toPrimitive must return a primitive value."); } return (hint === "string" ? String : Number)(input); }
|
|
17
|
+
var Popover = function Popover(props) {
|
|
18
|
+
// 参见:https://github.com/ant-design/ant-design/issues/44119
|
|
19
|
+
// fix T-1508
|
|
20
|
+
var avoidClose = (0, _react.useCallback)(function (e) {
|
|
21
|
+
e.stopPropagation();
|
|
22
|
+
}, []);
|
|
23
|
+
return /*#__PURE__*/_react.default.createElement("div", {
|
|
24
|
+
onClick: avoidClose
|
|
25
|
+
}, /*#__PURE__*/_react.default.createElement(_antd.Popover, _objectSpread({}, props)));
|
|
26
|
+
};
|
|
27
|
+
exports.Popover = Popover;
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
export * from './Popover';
|
|
@@ -0,0 +1,16 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
|
|
3
|
+
Object.defineProperty(exports, "__esModule", {
|
|
4
|
+
value: true
|
|
5
|
+
});
|
|
6
|
+
var _Popover = require("./Popover");
|
|
7
|
+
Object.keys(_Popover).forEach(function (key) {
|
|
8
|
+
if (key === "default" || key === "__esModule") return;
|
|
9
|
+
if (key in exports && exports[key] === _Popover[key]) return;
|
|
10
|
+
Object.defineProperty(exports, key, {
|
|
11
|
+
enumerable: true,
|
|
12
|
+
get: function get() {
|
|
13
|
+
return _Popover[key];
|
|
14
|
+
}
|
|
15
|
+
});
|
|
16
|
+
});
|
|
@@ -8,9 +8,9 @@ var _css = require("@emotion/css");
|
|
|
8
8
|
var _antdV = require("@formily/antd-v5");
|
|
9
9
|
var _core = require("@formily/core");
|
|
10
10
|
var _react = require("@formily/react");
|
|
11
|
-
var _antd = require("antd");
|
|
12
11
|
var _react2 = _interopRequireWildcard(require("react"));
|
|
13
12
|
var _collectionManager = require("../../../collection-manager");
|
|
13
|
+
var _popover = require("../popover");
|
|
14
14
|
var _templateObject;
|
|
15
15
|
function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
|
|
16
16
|
function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
|
|
@@ -55,7 +55,7 @@ var Editable = (0, _react.observer)(function (props) {
|
|
|
55
55
|
labelStyle: {
|
|
56
56
|
display: 'none'
|
|
57
57
|
}
|
|
58
|
-
}), /*#__PURE__*/_react2.default.createElement(
|
|
58
|
+
}), /*#__PURE__*/_react2.default.createElement(_popover.Popover, {
|
|
59
59
|
content: /*#__PURE__*/_react2.default.createElement("div", {
|
|
60
60
|
style: {
|
|
61
61
|
width: '100%',
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@nocobase/client",
|
|
3
|
-
"version": "0.13.0-alpha.
|
|
3
|
+
"version": "0.13.0-alpha.4",
|
|
4
4
|
"license": "Apache-2.0",
|
|
5
5
|
"main": "lib",
|
|
6
6
|
"module": "es/index.js",
|
|
@@ -15,7 +15,7 @@
|
|
|
15
15
|
"@dnd-kit/modifiers": "^6.0.0",
|
|
16
16
|
"@dnd-kit/sortable": "^6.0.0",
|
|
17
17
|
"@emotion/css": "^11.7.1",
|
|
18
|
-
"@formily/antd-v5": "^1.1.
|
|
18
|
+
"@formily/antd-v5": "^1.1.1",
|
|
19
19
|
"@formily/core": "^2.2.27",
|
|
20
20
|
"@formily/grid": "^2.2.27",
|
|
21
21
|
"@formily/json-schema": "^2.2.27",
|
|
@@ -25,12 +25,12 @@
|
|
|
25
25
|
"@formily/reactive-react": "^2.2.27",
|
|
26
26
|
"@formily/shared": "^2.2.27",
|
|
27
27
|
"@formily/validator": "^2.2.27",
|
|
28
|
-
"@nocobase/evaluators": "0.13.0-alpha.
|
|
29
|
-
"@nocobase/sdk": "0.13.0-alpha.
|
|
30
|
-
"@nocobase/utils": "0.13.0-alpha.
|
|
28
|
+
"@nocobase/evaluators": "0.13.0-alpha.4",
|
|
29
|
+
"@nocobase/sdk": "0.13.0-alpha.4",
|
|
30
|
+
"@nocobase/utils": "0.13.0-alpha.4",
|
|
31
31
|
"@types/requirejs": "^2.1.34",
|
|
32
32
|
"ahooks": "^3.7.2",
|
|
33
|
-
"antd": "
|
|
33
|
+
"antd": "5.8.4",
|
|
34
34
|
"antd-style": "^3.3.0",
|
|
35
35
|
"axios": "^0.26.1",
|
|
36
36
|
"classnames": "^2.3.1",
|
|
@@ -75,5 +75,5 @@
|
|
|
75
75
|
"dumi": "^2.2.0",
|
|
76
76
|
"dumi-theme-nocobase": "^0.2.14"
|
|
77
77
|
},
|
|
78
|
-
"gitHead": "
|
|
78
|
+
"gitHead": "29594e9dbb2455e2f3f6bea95340c4ed75789b61"
|
|
79
79
|
}
|