@nocobase/client 0.7.6-alpha.2 → 0.8.0-alpha.10

package/lib/schema-component/antd/calendar/style.less

@@ -74,7 +74,6 @@ button.rbc-input::-moz-focus-inner {
   text-overflow: ellipsis;
   white-space: nowrap;
   padding: 4px 12px;
-  text-align: right;
   vertical-align: middle;
   // font-weight: 500;
   min-height: 32px;
@@ -338,24 +337,39 @@ button.rbc-input::-moz-focus-inner {
   // cursor: pointer;
   flex: 1 1 0;
   min-width: 0;
-  padding-right: 12px;
+  padding-left: 12px;
   padding-top: 4px;
-  text-align: right;
 }
-.rbc-date-cell.rbc-now a {
+.rbc-date-cell.rbc-now span {
   // font-weight: bold;
   color: #1890ff;
 }
-.rbc-date-cell > a,
-.rbc-date-cell > a:active,
-.rbc-date-cell > a:visited {
+.rbc-date-cell a,
+.rbc-date-cell a:active,
+.rbc-date-cell a:visited {
   color: inherit;
   text-decoration: none;
 }
-.rbc-date-cell > a:hover {
+.rbc-date-cell a:hover {
   color: #1890ff;
 }
 
+.rbc-date-cell .rbc-date-solar {
+  font-weight: 500;
+}
+
+.rbc-date-cell .rbc-date-lunar {
+  padding-left: 12px;
+}
+
+.rbc-date-cell:not(.rbc-off-range) .rbc-date-lunar {
+  color: #aaa
+}
+
+.rbc-date-cell .rbc-date-lunar:hover {
+  color: inherit
+}
+
 .rbc-row-bg {
   display: flex;
   flex-direction: row;
@@ -553,6 +567,36 @@ button.rbc-input::-moz-focus-inner {
 .rbc-time-header-cell {
   min-height: 32px !important;
 }
+.rbc-time-header-cell .rbc-header {
+  display: flex;
+}
+.rbc-time-header-cell .rbc-header.rbc-today {
+  border-color: #1890ff;
+  background-color: #e6f7ff;
+  color: #1890ff
+}
+
+.rbc-time-header-cell .rbc-header a {
+  display: flex;
+  flex-direction: column;
+}
+
+.rbc-time-header-cell .rbc-date-wrap {
+  display: flex;
+  align-items: center;
+}
+
+.rbc-time-header-cell .rbc-date-solar {
+  font-size: 18px;
+}
+.rbc-time-header-cell .rbc-date-lunar {
+  margin-left: 4px;
+}
+
+.rbc-time-header-cell .rbc-header:not(.rbc-today) .rbc-date-lunar {
+  color: #aaa;
+}
+
 .rbc-calendar.view-week {
   .rbc-time-header-cell {
     margin-top: -32px;
@@ -695,7 +739,7 @@ button.rbc-input::-moz-focus-inner {
 
 .rbc-time-header-content {
   flex: 1;
-  display: flex;
+  // display: flex;
   min-width: 0;
   flex-direction: column;
   // border-left: 1px solid #f0f0f0;

package/lib/schema-component/antd/calendar/types.d.ts

@@ -5,4 +5,10 @@ export interface ToolbarProps {
   views?: any;
   onNavigate?: (action: string) => void;
   onView?: (view: string) => void;
+
+  date: string;
+  /**
+   * 是否展示农历
+   */
+  showLunar: boolean;
 }

package/lib/schema-component/antd/calendar/utils.d.ts

@@ -1,6 +1,8 @@
+import moment from 'moment';
 export declare const toEvents: (data: any[], fieldNames: any) => {
     id: any;
     title: any;
     start: Date;
     end: Date;
 }[];
+export declare const getLunarDay: (date: moment.MomentInput) => string | number;

package/lib/schema-component/antd/calendar/utils.js

@@ -3,12 +3,18 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.toEvents = void 0;
+exports.toEvents = exports.getLunarDay = void 0;
 
 var _lodash = require("lodash");
 
+var _moment = _interopRequireDefault(require("moment"));
+
+var _solarlunarEs = _interopRequireDefault(require("solarlunar-es"));
+
 var _i18n = require("../../../i18n");
 
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+
 var toEvents = function toEvents(data, fieldNames) {
   return data === null || data === void 0 ? void 0 : data.map(function (item) {
     return {
@@ -20,4 +26,14 @@ var toEvents = function toEvents(data, fieldNames) {
   });
 };
 
-exports.toEvents = toEvents;
+exports.toEvents = toEvents;
+
+var getLunarDay = function getLunarDay(date) {
+  var md = (0, _moment.default)(date);
+
+  var result = _solarlunarEs.default.solar2lunar(md.year(), md.month() + 1, md.date());
+
+  return typeof result !== 'number' ? result.lunarFestival || result.term || result.dayCn : result;
+};
+
+exports.getLunarDay = getLunarDay;

package/lib/schema-component/antd/checkbox/Checkbox.js

@@ -25,7 +25,15 @@ function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { va
 
 function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
 
-var Checkbox = (0, _react.connect)(_antd.Checkbox, (0, _react.mapProps)({
+var Checkbox = (0, _react.connect)(function (props) {
+  var changeHandler = function changeHandler(val) {
+    props === null || props === void 0 ? void 0 : props.onChange(val);
+  };
+
+  return /*#__PURE__*/_react2.default.createElement(_antd.Checkbox, _objectSpread(_objectSpread({}, props), {}, {
+    onChange: changeHandler
+  }));
+}, (0, _react.mapProps)({
   value: 'checked',
   onInput: 'onChange'
 }, function (props, field) {
@@ -33,7 +41,7 @@ var Checkbox = (0, _react.connect)(_antd.Checkbox, (0, _react.mapProps)({
   return _objectSpread({}, props);
 }), (0, _react.mapReadPretty)(function (props) {
   if (!(0, _shared.isValid)(props.value)) {
-    return /*#__PURE__*/_react2.default.createElement("div", null);
+    return null;
   }
 
   return props.value ? /*#__PURE__*/_react2.default.createElement(_icons.CheckOutlined, {
@@ -48,7 +56,7 @@ Checkbox.Group = (0, _react.connect)(_antd.Checkbox.Group, (0, _react.mapProps)(
   dataSource: 'options'
 }), (0, _react.mapReadPretty)(function (props) {
   if (!(0, _shared.isValid)(props.value)) {
-    return /*#__PURE__*/_react2.default.createElement("div", null);
+    return null;
   }
 
   var _props$options = props.options,
@@ -61,7 +69,8 @@ Checkbox.Group = (0, _react.connect)(_antd.Checkbox.Group, (0, _react.mapProps)(
   }).map(function (option, key) {
     return /*#__PURE__*/_react2.default.createElement(_antd.Tag, {
       key: key,
-      color: option.color
+      color: option.color,
+      icon: option.icon
     }, option.label);
   }));
 }));

package/lib/schema-component/antd/formula-input/FormulaInput.js

@@ -63,13 +63,8 @@ var AntdFormulaInput = function AntdFormulaInput(props) {
 
   var _useState3 = (0, _react2.useState)(null),
       _useState4 = _slicedToArray(_useState3, 2),
-      formula = _useState4[0],
-      setFormula = _useState4[1];
-
-  var _useState5 = (0, _react2.useState)(null),
-      _useState6 = _slicedToArray(_useState5, 2),
-      html = _useState6[0],
-      setHtml = _useState6[1];
+      html = _useState4[0],
+      setHtml = _useState4[1];
 
   var numColumns = new Map();
   var scope = {};
@@ -80,43 +75,38 @@ var AntdFormulaInput = function AntdFormulaInput(props) {
     scope[field.name] = 1;
   });
   var keys = Array.from(numColumns.keys());
-  var initHtml;
-
-  if (value) {
-    initHtml = value;
-    numColumns.forEach(function (value, key) {
-      initHtml = initHtml.replaceAll(key, "<span contentEditable=\"false\" style=\"border: 1px solid #aaa; padding: 2px 5px;\">".concat(value, "</span>"));
-    });
-  }
-
   (0, _react2.useEffect)(function () {
-    if (onChange && formula) {
-      var v = formula || '';
+    if (value) {
+      var newHtml = value;
       numColumns.forEach(function (value, key) {
-        v = v.replaceAll(value, key);
+        newHtml = newHtml.replaceAll(key, "<span contentEditable=\"false\" ><input disabled=\"disabled\" style=\"width:".concat(18 * value.length, "px;max-width: 120px\" value=\"").concat(value, "\"/><span hidden>").concat(key, "</span></span>"));
       });
+      newHtml = "".concat(newHtml, "<span style=\"padding-left: 5px\"></span>"); // set extra span for cursor focus on last position
 
-      if (v != value) {
-        onChange(v);
-      }
+      setHtml(newHtml);
+    } else {
+      setHtml('');
     }
-  }, [formula]);
+  }, [value]);
 
   var menu = /*#__PURE__*/_react2.default.createElement(_antd.Menu, {
     onClick: function () {
       var _onClick = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee(args) {
-        var replaceFormula, replaceHtml;
+        var replaceFormula;
         return regeneratorRuntime.wrap(function _callee$(_context) {
           while (1) {
             switch (_context.prev = _context.next) {
               case 0:
-                replaceFormula = formula.replace('@', numColumns.get(args.key));
-                replaceHtml = html.replace('@', "<span contentEditable=\"false\" style=\"border: 1px solid #aaa; padding: 2px 5px;\">".concat(numColumns.get(args.key), "</span>"));
-                setFormula(replaceFormula);
-                setHtml(replaceHtml);
+                replaceFormula = field.value.replace('@', args.key);
+
+                if (onChange && replaceFormula != field.value) {
+                  onChange(replaceFormula);
+                }
+
                 setDropdownVisible(false);
+                inputRef.current.focus();
 
-              case 5:
+              case 4:
               case "end":
                 return _context.stop();
             }
@@ -137,12 +127,12 @@ var AntdFormulaInput = function AntdFormulaInput(props) {
   }));
 
   var handleChange = function handleChange(e) {
-    var current = inputRef.current;
-    setFormula(e.currentTarget.textContent);
-    setHtml(current.innerHTML);
-
-    if (e.currentTarget.textContent == '' && onChange) {
-      onChange(null);
+    if (onChange) {
+      if (e.currentTarget.textContent == '') {
+        onChange(null);
+      } else {
+        onChange(e.currentTarget.textContent);
+      }
     }
   };
 
@@ -170,7 +160,8 @@ var AntdFormulaInput = function AntdFormulaInput(props) {
       try {
         math.evaluate(field.value, scope);
         field.feedbacks = [];
-      } catch (_unused) {
+      } catch (e) {
+        console.error(field.value, scope, e.message);
         field.setFeedback({
           type: 'error',
           code: 'FormulaError',
@@ -187,7 +178,7 @@ var AntdFormulaInput = function AntdFormulaInput(props) {
     className: "ant-input",
     onChange: handleChange,
     onKeyDown: handleKeyDown,
-    html: html || initHtml || ''
+    html: html || ''
   }));
 };
 

package/lib/schema-component/antd/input/Input.d.ts

@@ -3,6 +3,7 @@ import React from 'react';
 declare type ComposedInput = React.FC<InputProps> & {
     TextArea?: React.FC<TextAreaProps>;
     URL?: React.FC<InputProps>;
+    JSON?: React.FC<TextAreaProps>;
 };
 export declare const Input: ComposedInput;
 export default Input;

package/lib/schema-component/antd/input/Input.js

@@ -15,6 +15,8 @@ var _react2 = _interopRequireDefault(require("react"));
 
 var _ReadPretty = require("./ReadPretty");
 
+var _Json = require("./Json");
+
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
 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; }
@@ -38,5 +40,6 @@ Input.TextArea = (0, _react.connect)(_antd.Input.TextArea, (0, _react.mapProps)(
   }, props);
 }), (0, _react.mapReadPretty)(_ReadPretty.ReadPretty.TextArea));
 Input.URL = (0, _react.connect)(_antd.Input, (0, _react.mapReadPretty)(_ReadPretty.ReadPretty.URL));
+Input.JSON = (0, _react.connect)(_Json.Json, (0, _react.mapReadPretty)(_ReadPretty.ReadPretty.JSON));
 var _default = Input;
 exports.default = _default;

package/lib/schema-component/antd/input/Json.d.ts

@@ -0,0 +1,6 @@
+/// <reference types="react" />
+import { TextAreaProps } from 'antd/lib/input';
+export declare function Json({ value, onChange, space, ...props }: TextAreaProps & {
+    value: any;
+    space: number;
+}): JSX.Element;

package/lib/schema-component/antd/input/Json.js

@@ -0,0 +1,53 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.Json = Json;
+
+var _react = _interopRequireDefault(require("react"));
+
+var _react2 = require("@formily/react");
+
+var _antd = require("antd");
+
+var _excluded = ["value", "onChange", "space"];
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+
+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; }
+
+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; }
+
+function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
+
+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; }
+
+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; }
+
+function Json(_ref) {
+  var value = _ref.value,
+      _onChange = _ref.onChange,
+      _ref$space = _ref.space,
+      space = _ref$space === void 0 ? 2 : _ref$space,
+      props = _objectWithoutProperties(_ref, _excluded);
+
+  var field = (0, _react2.useField)();
+  return /*#__PURE__*/_react.default.createElement(_antd.Input.TextArea, _objectSpread(_objectSpread({}, props), {}, {
+    defaultValue: value != null ? JSON.stringify(value, null, space) : '',
+    onChange: function onChange(ev) {
+      try {
+        var v = ev.target.value.trim() !== '' ? JSON.parse(ev.target.value) : null;
+        field.setFeedback({});
+
+        _onChange(v);
+      } catch (err) {
+        field.setFeedback({
+          type: 'error',
+          code: 'JSONSyntaxError',
+          messages: [err.message]
+        });
+      }
+    }
+  }));
+}

package/lib/schema-component/antd/input/ReadPretty.d.ts

@@ -14,6 +14,9 @@ declare type Composed = {
         autop?: boolean;
     }>;
     Html?: any;
+    JSON?: React.FC<TextAreaProps & {
+        space: number;
+    }>;
 };
 export declare const ReadPretty: Composed;
 export {};

package/lib/schema-component/antd/input/ReadPretty.js

@@ -17,8 +17,14 @@ var _EllipsisWithTooltip = require("./EllipsisWithTooltip");
 
 var _shared = require("./shared");
 
+var _css = require("@emotion/css");
+
+var _templateObject;
+
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
+function _taggedTemplateLiteral(strings, raw) { if (!raw) { raw = strings.slice(0); } return Object.freeze(Object.defineProperties(strings, { raw: { value: Object.freeze(raw) } })); }
+
 var ReadPretty = function ReadPretty() {
   return null;
 };
@@ -115,4 +121,14 @@ ReadPretty.URL = function (props) {
     className: (0, _classnames.default)(prefixCls, props.className),
     style: props.style
   }, props.addonBefore, props.prefix, content, props.suffix, props.addonAfter);
+};
+
+ReadPretty.JSON = function (props) {
+  var _props$space;
+
+  var prefixCls = (0, _builtins__.usePrefixCls)('json', props);
+  return /*#__PURE__*/_react.default.createElement("pre", {
+    className: (0, _css.cx)(prefixCls, props.className, (0, _css.css)(_templateObject || (_templateObject = _taggedTemplateLiteral(["\n        margin-bottom: 0;\n      "])))),
+    style: props.style
+  }, props.value != null ? JSON.stringify(props.value, null, (_props$space = props.space) !== null && _props$space !== void 0 ? _props$space : 2) : '');
 };

package/lib/schema-component/antd/input/index.d.ts

@@ -1,2 +1,3 @@
 export * from './Input';
 export * from './ReadPretty';
+export * from './Json';

package/lib/schema-component/antd/input/index.js

@@ -28,4 +28,17 @@ Object.keys(_ReadPretty).forEach(function (key) {
       return _ReadPretty[key];
     }
   });
+});
+
+var _Json = require("./Json");
+
+Object.keys(_Json).forEach(function (key) {
+  if (key === "default" || key === "__esModule") return;
+  if (key in exports && exports[key] === _Json[key]) return;
+  Object.defineProperty(exports, key, {
+    enumerable: true,
+    get: function get() {
+      return _Json[key];
+    }
+  });
 });

package/lib/schema-component/antd/markdown/Markdown.Void.js

@@ -11,6 +11,8 @@ var _react = require("@formily/react");
 
 var _antd = require("antd");
 
+var _classnames = _interopRequireDefault(require("classnames"));
+
 var _react2 = _interopRequireWildcard(require("react"));
 
 var _reactI18next = require("react-i18next");
@@ -25,6 +27,8 @@ function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "functio
 
 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; }
 
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+
 function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) { try { var info = gen[key](arg); var value = info.value; } catch (error) { reject(error); return; } if (info.done) { resolve(value); } else { Promise.resolve(value).then(_next, _throw); } }
 
 function _asyncToGenerator(fn) { return function () { var self = this, args = arguments; return new Promise(function (resolve, reject) { var gen = fn.apply(self, args); function _next(value) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "next", value); } function _throw(err) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "throw", err); } _next(undefined); }); }; }
@@ -93,7 +97,8 @@ var MarkdownEditor = function MarkdownEditor(props) {
 };
 
 var MarkdownVoid = (0, _react.observer)(function (props) {
-  var content = props.content;
+  var content = props.content,
+      className = props.className;
   var field = (0, _react.useField)();
   var schema = (0, _react.useFieldSchema)();
 
@@ -103,6 +108,7 @@ var MarkdownVoid = (0, _react.observer)(function (props) {
   var onSave = props.onSave,
       _onCancel = props.onCancel;
   return (field === null || field === void 0 ? void 0 : field.editable) ? /*#__PURE__*/_react2.default.createElement(MarkdownEditor, _objectSpread(_objectSpread({}, props), {}, {
+    className: true,
     defaultValue: content,
     onCancel: function onCancel() {
       field.editable = false;
@@ -145,7 +151,7 @@ var MarkdownVoid = (0, _react.observer)(function (props) {
       return onSubmit;
     }()
   })) : /*#__PURE__*/_react2.default.createElement("div", {
-    className: 'nb-markdown',
+    className: (0, _classnames.default)(['nb-markdown', className]),
     dangerouslySetInnerHTML: {
       __html: (0, _util.markdown)(content)
     }

package/lib/schema-component/antd/radio/Radio.js

@@ -38,7 +38,8 @@ Radio.Group = (0, _react.connect)(_antd.Radio.Group, (0, _react.mapProps)({
   }).map(function (option, key) {
     return /*#__PURE__*/_react2.default.createElement(_antd.Tag, {
       key: key,
-      color: option.color
+      color: option.color,
+      icon: option.icon
     }, option.label);
   }));
 }));

package/lib/schema-component/antd/select/ReadPretty.js

@@ -45,7 +45,8 @@ var ReadPretty = (0, _react.observer)(function (props) {
   return /*#__PURE__*/_react2.default.createElement("div", null, options.map(function (option, key) {
     return /*#__PURE__*/_react2.default.createElement(_antd.Tag, {
       key: key,
-      color: option[fieldNames.color]
+      color: option[fieldNames.color],
+      icon: option.icon
     }, option[fieldNames.label]);
   }));
 });

package/lib/schema-component/antd/select/Select.js

@@ -80,6 +80,17 @@ var ObjectSelect = function ObjectSelect(props) {
     labelInValue: true,
     options: options,
     fieldNames: fieldNames,
+    showSearch: true,
+    filterOption: function filterOption(input, option) {
+      var _option;
+
+      return ((_option = option === null || option === void 0 ? void 0 : option[fieldNames.label || 'label']) !== null && _option !== void 0 ? _option : '').includes(input);
+    },
+    filterSort: function filterSort(optionA, optionB) {
+      var _optionA, _optionB;
+
+      return ((_optionA = optionA === null || optionA === void 0 ? void 0 : optionA[fieldNames.label || 'label']) !== null && _optionA !== void 0 ? _optionA : '').toLowerCase().localeCompare(((_optionB = optionB === null || optionB === void 0 ? void 0 : optionB[fieldNames.label || 'label']) !== null && _optionB !== void 0 ? _optionB : '').toLowerCase());
+    },
     onChange: function onChange(changed) {
       var current = (0, _shared2.getCurrentOptions)((0, _shared.toArr)(changed).map(function (v) {
         return v.value;
@@ -103,7 +114,20 @@ var Select = (0, _react.connect)(function (props) {
     return /*#__PURE__*/_react2.default.createElement(ObjectSelect, _objectSpread({}, others));
   }
 
-  return /*#__PURE__*/_react2.default.createElement(_antd.Select, _objectSpread(_objectSpread({}, others), {}, {
+  return /*#__PURE__*/_react2.default.createElement(_antd.Select, _objectSpread(_objectSpread({
+    showSearch: true,
+    filterOption: function filterOption(input, option) {
+      var _option$label;
+
+      return ((_option$label = option === null || option === void 0 ? void 0 : option.label) !== null && _option$label !== void 0 ? _option$label : '').includes(input);
+    },
+    filterSort: function filterSort(optionA, optionB) {
+      var _optionA$label, _optionB$label;
+
+      return ((_optionA$label = optionA === null || optionA === void 0 ? void 0 : optionA.label) !== null && _optionA$label !== void 0 ? _optionA$label : '').toLowerCase().localeCompare(((_optionB$label = optionB === null || optionB === void 0 ? void 0 : optionB.label) !== null && _optionB$label !== void 0 ? _optionB$label : '').toLowerCase());
+    },
+    allowClear: true
+  }, others), {}, {
     value: others.value || undefined
   }));
 }, (0, _react.mapProps)({

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

@@ -25,6 +25,8 @@ var _schemaTemplates = require("../../../schema-templates");
 
 var _hooks = require("../../hooks");
 
+var _lodash = require("lodash");
+
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
 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; }
@@ -46,7 +48,8 @@ var TableSelectorDesigner = function TableSelectorDesigner() {
   var sortFields = (0, _actionHooks.useSortFields)(name);
 
   var _useTableSelectorCont = (0, _blockProvider.useTableSelectorContext)(),
-      service = _useTableSelectorCont.service;
+      service = _useTableSelectorCont.service,
+      extraFilter = _useTableSelectorCont.extraFilter;
 
   var _useTranslation = (0, _reactI18next.useTranslation)(),
       t = _useTranslation.t;
@@ -94,8 +97,20 @@ var TableSelectorDesigner = function TableSelectorDesigner() {
       params.filter = filter;
       field.decoratorProps.params = params;
       fieldSchema['x-decorator-props']['params'] = params;
+      var serviceFilter = (0, _lodash.cloneDeep)(filter);
+
+      if (extraFilter) {
+        if (serviceFilter) {
+          serviceFilter = {
+            $and: [extraFilter, serviceFilter]
+          };
+        } else {
+          serviceFilter = extraFilter;
+        }
+      }
+
       service.run(_objectSpread(_objectSpread({}, (_service$params = service.params) === null || _service$params === void 0 ? void 0 : _service$params[0]), {}, {
-        filter: filter,
+        filter: serviceFilter,
         page: 1
       }));
       dn.emit('patch', {

package/lib/schema-component/antd/upload/Upload.js

@@ -262,9 +262,10 @@ Upload.Attachment = (0, _react.connect)(function (props) {
   }));
 }, (0, _react.mapReadPretty)(_ReadPretty.ReadPretty.Attachment));
 Upload.Dragger = (0, _react.connect)(function (props) {
+  var tipContent = props.tipContent;
   return /*#__PURE__*/_react2.default.createElement("div", {
     className: (0, _builtins__.usePrefixCls)('upload-dragger')
-  }, /*#__PURE__*/_react2.default.createElement(_antd.Upload.Dragger, _objectSpread({}, (0, _shared.useUploadProps)(props))));
+  }, /*#__PURE__*/_react2.default.createElement(_antd.Upload.Dragger, _objectSpread({}, (0, _shared.useUploadProps)(props)), tipContent, props.children));
 }, (0, _react.mapProps)({
   value: 'fileList'
 }));

package/lib/schema-component/antd/upload/shared.js

@@ -251,9 +251,11 @@ function useUploadProps(_ref) {
     (_props$onChange = props.onChange) === null || _props$onChange === void 0 ? void 0 : _props$onChange.call(props, normalizeFileList(_toConsumableArray(param.fileList)));
   };
 
-  var form = (0, _react.useForm)();
   var api = (0, _apiClient.useAPIClient)();
   return _objectSpread(_objectSpread({}, props), {}, {
+    // in customRequest method can't modify form's status(e.g: form.disabled=true )
+    // that will be trigger Upload component（actual Underlying is AjaxUploader component ）'s  componentWillUnmount method
+    // which will cause multiple files upload fail
     customRequest: function customRequest(_ref2) {
       var action = _ref2.action,
           data = _ref2.data,
@@ -273,7 +275,6 @@ function useUploadProps(_ref) {
       }
 
       formData.append(filename, file);
-      form.disabled = true;
       api.axios.post(action, formData, {
         withCredentials: withCredentials,
         headers: headers,
@@ -287,9 +288,7 @@ function useUploadProps(_ref) {
       }).then(function (_ref4) {
         var data = _ref4.data;
         onSuccess(data, file);
-      }).catch(onError).finally(function () {
-        form.disabled = false;
-      });
+      }).catch(onError).finally(function () {});
       return {
         abort: function abort() {
           console.log('upload progress is aborted.');