@nocobase/client 0.9.1-alpha.2 → 0.9.2-alpha.1

package/es/schema-component/antd/table-v2/FilterDynamicComponent.js

@@ -0,0 +1,150 @@
+import React from 'react';
+import { useCompile } from '../..';
+import { useValues } from '../filter/useValues';
+import { Variable } from '../variable';
+import { useUserVariable } from './hooks/useUserVariable';
+var useVariableOptions = function useVariableOptions() {
+  var _useValues = useValues(),
+    operator = _useValues.operator,
+    schema = _useValues.schema;
+  var operatorValue = (operator === null || operator === void 0 ? void 0 : operator.value) || '';
+  var userVariable = useUserVariable({
+    schema: schema,
+    operator: operator
+  });
+  if (!operator || !schema) return [];
+  var disabled = !['DatePicker', 'DatePicker.RangePicker'].includes(schema['x-component']);
+  var dateOptions = [{
+    key: 'now',
+    value: 'now',
+    label: "{{t(\"Now\")}}",
+    disabled: schema['x-component'] !== 'DatePicker' || operatorValue === '$dateBetween'
+  }, {
+    key: 'yesterday',
+    value: 'yesterday',
+    label: "{{t(\"Yesterday\")}}",
+    disabled: disabled
+  }, {
+    key: 'today',
+    value: 'today',
+    label: "{{t(\"Today\")}}",
+    disabled: disabled
+  }, {
+    key: 'tomorrow',
+    value: 'tomorrow',
+    label: "{{t(\"Tomorrow\")}}",
+    disabled: disabled
+  }, {
+    key: 'lastIsoWeek',
+    value: 'lastIsoWeek',
+    label: "{{t(\"Last week\")}}",
+    disabled: disabled
+  }, {
+    key: 'thisIsoWeek',
+    value: 'thisIsoWeek',
+    label: "{{t(\"This week\")}}",
+    disabled: disabled
+  }, {
+    key: 'nextIsoWeek',
+    value: 'nextIsoWeek',
+    label: "{{t(\"Next week\")}}",
+    disabled: disabled
+  }, {
+    key: 'lastMonth',
+    value: 'lastMonth',
+    label: "{{t(\"Last month\")}}",
+    disabled: disabled
+  }, {
+    key: 'thisMonth',
+    value: 'thisMonth',
+    label: "{{t(\"This month\")}}",
+    disabled: disabled
+  }, {
+    key: 'nextMonth',
+    value: 'nextMonth',
+    label: "{{t(\"Next month\")}}",
+    disabled: disabled
+  }, {
+    key: 'lastQuarter',
+    value: 'lastQuarter',
+    label: "{{t(\"Last quarter\")}}",
+    disabled: disabled
+  }, {
+    key: 'thisQuarter',
+    value: 'thisQuarter',
+    label: "{{t(\"This quarter\")}}",
+    disabled: disabled
+  }, {
+    key: 'nextQuarter',
+    value: 'nextQuarter',
+    label: "{{t(\"Next quarter\")}}",
+    disabled: disabled
+  }, {
+    key: 'lastYear',
+    value: 'lastYear',
+    label: "{{t(\"Last year\")}}",
+    disabled: disabled
+  }, {
+    key: 'thisYear',
+    value: 'thisYear',
+    label: "{{t(\"This year\")}}",
+    disabled: disabled
+  }, {
+    key: 'nextYear',
+    value: 'nextYear',
+    label: "{{t(\"Next year\")}}",
+    disabled: disabled
+  }, {
+    key: 'last7Days',
+    value: 'last7Days',
+    label: "{{t(\"Last 7 days\")}}",
+    disabled: disabled
+  }, {
+    key: 'next7Days',
+    value: 'next7Days',
+    label: "{{t(\"Next 7 days\")}}",
+    disabled: disabled
+  }, {
+    key: 'last30Days',
+    value: 'last30Days',
+    label: "{{t(\"Last 30 days\")}}",
+    disabled: disabled
+  }, {
+    key: 'next30Days',
+    value: 'next30Days',
+    label: "{{t(\"Next 30 days\")}}",
+    disabled: disabled
+  }, {
+    key: 'last90Days',
+    value: 'last90Days',
+    label: "{{t(\"Last 90 days\")}}",
+    disabled: disabled
+  }, {
+    key: 'next90Days',
+    value: 'next90Days',
+    label: "{{t(\"Next 90 days\")}}",
+    disabled: disabled
+  }];
+  return [userVariable, {
+    label: "{{t(\"Date variables\")}}",
+    value: '$date',
+    key: '$date',
+    disabled: dateOptions.every(function (option) {
+      return option.disabled;
+    }),
+    children: dateOptions
+  }];
+};
+export function FilterDynamicComponent(props) {
+  var value = props.value,
+    onChange = props.onChange,
+    renderSchemaComponent = props.renderSchemaComponent;
+  var options = useVariableOptions();
+  var compile = useCompile();
+  var scope = compile(options);
+  return /*#__PURE__*/React.createElement(Variable.Input, {
+    value: value,
+    onChange: onChange,
+    scope: scope
+  }, renderSchemaComponent());
+}

package/es/schema-component/antd/table-v2/Table.ActionColumnDesigner.js

@@ -6,10 +6,8 @@ import { DragHandler } from '../../../schema-component';
 import { useSchemaInitializer } from '../../../schema-initializer';
 export var TableActionColumnDesigner = function TableActionColumnDesigner(props) {
   var fieldSchema = useFieldSchema();
-
   var _useSchemaInitializer = useSchemaInitializer(fieldSchema['x-initializer']),
-      render = _useSchemaInitializer.render;
-
+    render = _useSchemaInitializer.render;
   return /*#__PURE__*/React.createElement("div", {
     className: 'general-schema-designer'
   }, /*#__PURE__*/React.createElement("div", {

package/es/schema-component/antd/table-v2/Table.Column.ActionBar.js

@@ -1,7 +1,5 @@
 var _templateObject;
-
 function _taggedTemplateLiteral(strings, raw) { if (!raw) { raw = strings.slice(0); } return Object.freeze(Object.defineProperties(strings, { raw: { value: Object.freeze(raw) } })); }
-
 import { css } from '@emotion/css';
 import { observer } from '@formily/react';
 import React from 'react';

package/es/schema-component/antd/table-v2/Table.Column.Decorator.js

@@ -5,26 +5,20 @@ import { designerCss } from './Table.Column.ActionBar';
 import { isCollectionFieldComponent } from './utils';
 export var useColumnSchema = function useColumnSchema() {
   var _useCollection = useCollection(),
-      getField = _useCollection.getField;
-
+    getField = _useCollection.getField;
   var compile = useCompile();
   var columnSchema = useFieldSchema();
-
   var _useCollectionManager = useCollectionManager(),
-      getCollectionJoinField = _useCollectionManager.getCollectionJoinField;
-
+    getCollectionJoinField = _useCollectionManager.getCollectionJoinField;
   var fieldSchema = columnSchema.reduceProperties(function (buf, s) {
     if (isCollectionFieldComponent(s)) {
       return s;
     }
-
     return buf;
   }, null);
-
   if (!fieldSchema) {
     return {};
   }
-
   var collectionField = getField(fieldSchema.name) || getCollectionJoinField(fieldSchema === null || fieldSchema === void 0 ? void 0 : fieldSchema['x-collection-field']);
   return {
     columnSchema: columnSchema,
@@ -36,25 +30,20 @@ export var useColumnSchema = function useColumnSchema() {
 export var TableColumnDecorator = function TableColumnDecorator(props) {
   var Designer = useDesigner();
   var field = useField();
-
   var _useColumnSchema = useColumnSchema(),
-      fieldSchema = _useColumnSchema.fieldSchema,
-      uiSchema = _useColumnSchema.uiSchema,
-      collectionField = _useColumnSchema.collectionField;
-
+    fieldSchema = _useColumnSchema.fieldSchema,
+    uiSchema = _useColumnSchema.uiSchema,
+    collectionField = _useColumnSchema.collectionField;
   var _useDesignable = useDesignable(),
-      refresh = _useDesignable.refresh;
-
+    refresh = _useDesignable.refresh;
   var compile = useCompile();
   useLayoutEffect(function () {
     if (field.title) {
       return;
     }
-
     if (!fieldSchema) {
       return;
     }
-
     if (uiSchema === null || uiSchema === void 0 ? void 0 : uiSchema.title) {
       field.title = uiSchema === null || uiSchema === void 0 ? void 0 : uiSchema.title;
     }

package/es/schema-component/antd/table-v2/Table.Column.Designer.js

@@ -1,61 +1,47 @@
+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); }
 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 _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; }
+function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return _typeof(key) === "symbol" ? key : String(key); }
+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); }
 import { useField, useFieldSchema } from '@formily/react';
 import React from 'react';
 import { useTranslation } from 'react-i18next';
 import { useCollectionManager } from '../../../collection-manager';
 import { GeneralSchemaDesigner, SchemaSettings } from '../../../schema-settings';
 import { useCompile, useDesignable } from '../../hooks';
-
 var useLabelFields = function useLabelFields(collectionName) {
   var _targetFields$filter, _targetFields$filter$, _targetFields$filter$2;
-
   if (!collectionName) {
     return [];
   }
-
   var compile = useCompile();
-
   var _useCollectionManager = useCollectionManager(),
-      getCollectionFields = _useCollectionManager.getCollectionFields;
-
+    getCollectionFields = _useCollectionManager.getCollectionFields;
   var targetFields = getCollectionFields(collectionName);
   return targetFields === null || targetFields === void 0 ? void 0 : (_targetFields$filter = targetFields.filter) === null || _targetFields$filter === void 0 ? void 0 : (_targetFields$filter$ = _targetFields$filter.call(targetFields, function (field) {
     return (field === null || field === void 0 ? void 0 : field.interface) && !(field === null || field === void 0 ? void 0 : field.target) && field.type !== 'boolean' && !field.isForeignKey;
   })) === null || _targetFields$filter$ === void 0 ? void 0 : (_targetFields$filter$2 = _targetFields$filter$.map) === null || _targetFields$filter$2 === void 0 ? void 0 : _targetFields$filter$2.call(_targetFields$filter$, function (field) {
     var _field$uiSchema;
-
     return {
       value: field.name,
       label: compile((field === null || field === void 0 ? void 0 : (_field$uiSchema = field.uiSchema) === null || _field$uiSchema === void 0 ? void 0 : _field$uiSchema.title) || field.name)
     };
   });
 };
-
 export var TableColumnDesigner = function TableColumnDesigner(props) {
-  var _fieldSchema$xCompon, _uiSchema$xComponent, _collectionField$targ, _collectionField$uiSc, _columnSchema$xCompo;
-
+  var _fieldSchema$xCompon, _uiSchema$xComponent, _collectionField$targ, _collectionField$uiSc, _columnSchema$xCompo, _fieldSchema$xCompon2, _fieldSchema$xCompon3;
   var uiSchema = props.uiSchema,
-      fieldSchema = props.fieldSchema,
-      collectionField = props.collectionField;
-
+    fieldSchema = props.fieldSchema,
+    collectionField = props.collectionField;
   var _useCollectionManager2 = useCollectionManager(),
-      getInterface = _useCollectionManager2.getInterface;
-
+    getInterface = _useCollectionManager2.getInterface;
   var field = useField();
-
   var _useTranslation = useTranslation(),
-      t = _useTranslation.t;
-
+    t = _useTranslation.t;
   var columnSchema = useFieldSchema();
-
   var _useDesignable = useDesignable(),
-      dn = _useDesignable.dn;
-
+    dn = _useDesignable.dn;
   var fieldNames = (fieldSchema === null || fieldSchema === void 0 ? void 0 : (_fieldSchema$xCompon = fieldSchema['x-component-props']) === null || _fieldSchema$xCompon === void 0 ? void 0 : _fieldSchema$xCompon['fieldNames']) || (uiSchema === null || uiSchema === void 0 ? void 0 : (_uiSchema$xComponent = uiSchema['x-component-props']) === null || _uiSchema$xComponent === void 0 ? void 0 : _uiSchema$xComponent['fieldNames']);
   var options = useLabelFields((_collectionField$targ = collectionField === null || collectionField === void 0 ? void 0 : collectionField.target) !== null && _collectionField$targ !== void 0 ? _collectionField$targ : collectionField === null || collectionField === void 0 ? void 0 : collectionField.targetCollection);
   var intefaceCfg = getInterface(collectionField === null || collectionField === void 0 ? void 0 : collectionField.interface);
@@ -79,7 +65,6 @@ export var TableColumnDesigner = function TableColumnDesigner(props) {
     },
     onSubmit: function onSubmit(_ref) {
       var title = _ref.title;
-
       if (title) {
         field.title = title;
         columnSchema.title = title;
@@ -90,7 +75,6 @@ export var TableColumnDesigner = function TableColumnDesigner(props) {
           }
         });
       }
-
       dn.refresh();
     }
   }), /*#__PURE__*/React.createElement(SchemaSettings.ModalItem, {
@@ -111,9 +95,7 @@ export var TableColumnDesigner = function TableColumnDesigner(props) {
       var width = _ref2.width;
       var props = columnSchema['x-component-props'] || {};
       props['width'] = width;
-
       var schema = _defineProperty({}, 'x-uid', columnSchema['x-uid']);
-
       schema['x-component-props'] = props;
       columnSchema['x-component-props'] = props;
       field.componentProps.width = width;
@@ -127,7 +109,6 @@ export var TableColumnDesigner = function TableColumnDesigner(props) {
     checked: field.componentProps.sorter,
     onChange: function onChange(v) {
       var schema = _defineProperty({}, 'x-uid', columnSchema['x-uid']);
-
       columnSchema['x-component-props'] = _objectSpread(_objectSpread({}, columnSchema['x-component-props']), {}, {
         sorter: v
       });
@@ -138,17 +119,30 @@ export var TableColumnDesigner = function TableColumnDesigner(props) {
       });
       dn.refresh();
     }
+  }), ['linkTo', 'm2m', 'm2o', 'o2m', 'obo', 'oho', 'snapshot', 'createdBy', 'updatedBy'].includes(collectionField === null || collectionField === void 0 ? void 0 : collectionField.interface) && /*#__PURE__*/React.createElement(SchemaSettings.SwitchItem, {
+    title: t('Enable link'),
+    checked: ((_fieldSchema$xCompon2 = (_fieldSchema$xCompon3 = fieldSchema['x-component-props']) === null || _fieldSchema$xCompon3 === void 0 ? void 0 : _fieldSchema$xCompon3.mode) !== null && _fieldSchema$xCompon2 !== void 0 ? _fieldSchema$xCompon2 : 'links') === 'links',
+    onChange: function onChange(flag) {
+      fieldSchema['x-component-props'] = _objectSpread(_objectSpread({}, fieldSchema === null || fieldSchema === void 0 ? void 0 : fieldSchema['x-component-props']), {}, {
+        mode: flag ? 'links' : 'tags'
+      });
+      dn.emit('patch', {
+        schema: {
+          'x-uid': fieldSchema['x-uid'],
+          'x-component-props': _objectSpread({}, fieldSchema['x-component-props'])
+        }
+      });
+      dn.refresh();
+    }
   }), ['linkTo', 'm2m', 'm2o', 'o2m', 'obo', 'oho', 'snapshot'].includes(collectionField === null || collectionField === void 0 ? void 0 : collectionField.interface) && /*#__PURE__*/React.createElement(SchemaSettings.SelectItem, {
     title: t('Title field'),
     options: options,
     value: fieldNames === null || fieldNames === void 0 ? void 0 : fieldNames['label'],
     onChange: function onChange(label) {
-      var _collectionField$uiSc2, _fieldSchema$xCompon2;
-
-      var fieldNames = _objectSpread(_objectSpread(_objectSpread({}, collectionField === null || collectionField === void 0 ? void 0 : (_collectionField$uiSc2 = collectionField.uiSchema) === null || _collectionField$uiSc2 === void 0 ? void 0 : _collectionField$uiSc2['x-component-props']['fieldNames']), fieldSchema === null || fieldSchema === void 0 ? void 0 : (_fieldSchema$xCompon2 = fieldSchema['x-component-props']) === null || _fieldSchema$xCompon2 === void 0 ? void 0 : _fieldSchema$xCompon2['fieldNames']), {}, {
+      var _collectionField$uiSc2, _fieldSchema$xCompon4;
+      var fieldNames = _objectSpread(_objectSpread(_objectSpread({}, collectionField === null || collectionField === void 0 ? void 0 : (_collectionField$uiSc2 = collectionField.uiSchema) === null || _collectionField$uiSc2 === void 0 ? void 0 : _collectionField$uiSc2['x-component-props']['fieldNames']), fieldSchema === null || fieldSchema === void 0 ? void 0 : (_fieldSchema$xCompon4 = fieldSchema['x-component-props']) === null || _fieldSchema$xCompon4 === void 0 ? void 0 : _fieldSchema$xCompon4['fieldNames']), {}, {
         label: label
       });
-
       fieldSchema['x-component-props']['fieldNames'] = fieldNames;
       field.query(".*.".concat(fieldSchema.name)).take(function (f) {
         f.componentProps.fieldNames = fieldNames;

package/es/schema-component/antd/table-v2/Table.Designer.js

@@ -3,9 +3,8 @@ import { useCollection } from '../../../collection-manager';
 import { GeneralSchemaDesigner, SchemaSettings } from '../../../schema-settings';
 export var TableDesigner = function TableDesigner() {
   var _useCollection = useCollection(),
-      name = _useCollection.name,
-      title = _useCollection.title;
-
+    name = _useCollection.name,
+    title = _useCollection.title;
   return /*#__PURE__*/React.createElement(GeneralSchemaDesigner, {
     title: title || name
   }, /*#__PURE__*/React.createElement(SchemaSettings.Remove, {