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

package/es/schema-component/common/utils/logic.js

@@ -1,7 +1,5 @@
 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); }
-
 /* globals define,module */
-
 /*
 Using a Universal Module Loader that should be browser, require, and AMD friendly
 http://ricostacruz.com/cheatsheets/umdjs.html
@@ -16,36 +14,35 @@ http://ricostacruz.com/cheatsheets/umdjs.html
   }
 })(this, function () {
   'use strict';
-  /* globals console:false */
 
+  /* globals console:false */
   if (!Array.isArray) {
     Array.isArray = function (arg) {
       return Object.prototype.toString.call(arg) === '[object Array]';
     };
   }
+
   /**
    * Return an array that contains no duplicates (original not modified)
    * @param  {array} array   Original reference array
    * @return {array}         New array with no duplicates
    */
-
-
   function arrayUnique(array) {
     var a = [];
-
     for (var i = 0, l = array.length; i < l; i++) {
       if (a.indexOf(array[i]) === -1) {
         a.push(array[i]);
       }
     }
-
     return a;
   }
-
   var jsonLogic = {};
   var operations = {
     $is: function $is(a, b) {
-      return a == b;
+      return a === b;
+    },
+    $match: function $match(a, b) {
+      return JSON.stringify(a) === JSON.stringify(b);
     },
     $eq: function $eq(a, b) {
       return a === b;
@@ -68,12 +65,18 @@ http://ricostacruz.com/cheatsheets/umdjs.html
     $lte: function $lte(a, b, c) {
       return c === undefined ? a <= b : a <= b && b <= c;
     },
+    $exists: function $exists(a) {
+      return jsonLogic.truthy(a);
+    },
     $notEmpty: function $notEmpty(a) {
       return jsonLogic.truthy(a);
     },
     $empty: function $empty(a) {
       return !jsonLogic.truthy(a);
     },
+    $notExists: function $notExists(a) {
+      return !jsonLogic.truthy(a);
+    },
     '%': function _(a, b) {
       return a % b;
     },
@@ -97,6 +100,39 @@ http://ricostacruz.com/cheatsheets/umdjs.html
       if (!a || typeof a.indexOf === 'undefined') return false;
       return !(a.indexOf(b) !== -1);
     },
+    $anyOf: function $anyOf(a, b) {
+      if (a.length === 0) {
+        return false;
+      }
+      return b.every(function (item) {
+        return a.includes(item);
+      });
+    },
+    $noneOf: function $noneOf(a, b) {
+      if (a.length === 0) {
+        return true;
+      }
+      return b.some(function (item) {
+        return !a.includes(item);
+      });
+    },
+    $notMatch: function $notMatch(a, b) {
+      if (a.length !== b.length) {
+        return true;
+      }
+      for (var i = 0; i < a.length; i++) {
+        if (a[i] !== b[i]) {
+          return true;
+        }
+      }
+      return false;
+    },
+    $isTruly: function $isTruly(a) {
+      return a === true || a === 1;
+    },
+    $isFalsy: function $isFalsy(a) {
+      return !jsonLogic.truthy(a);
+    },
     cat: function cat() {
       return Array.prototype.join.call(arguments, '');
     },
@@ -106,7 +142,6 @@ http://ricostacruz.com/cheatsheets/umdjs.html
         var temp = String(source).substr(start);
         return temp.substr(0, temp.length + end);
       }
-
       return String(source).substr(start, end);
     },
     '+': function _() {
@@ -143,26 +178,20 @@ http://ricostacruz.com/cheatsheets/umdjs.html
     var: function _var(a, b) {
       var not_found = b === undefined ? null : b;
       var data = this;
-
       if (typeof a === 'undefined' || a === '' || a === null) {
         return data;
       }
-
       var sub_props = String(a).split('.');
-
       for (var i = 0; i < sub_props.length; i++) {
         if (data === null || data === undefined) {
           return not_found;
-        } // Descending into data
-
-
+        }
+        // Descending into data
         data = data[sub_props[i]];
-
         if (data === undefined) {
           return not_found;
         }
       }
-
       return data;
     },
     missing: function missing() {
@@ -172,20 +201,18 @@ http://ricostacruz.com/cheatsheets/umdjs.html
         which typically happens if it's actually acting on the output of another command
         (like 'if' or 'merge')
         */
+
       var missing = [];
       var keys = Array.isArray(arguments[0]) ? arguments[0] : arguments;
-
       for (var i = 0; i < keys.length; i++) {
         var key = keys[i];
         var value = jsonLogic.apply({
           var: key
         }, this);
-
         if (value === null || value === '') {
           missing.push(key);
         }
       }
-
       return missing;
     },
     missing_some: function missing_some(need_count, options) {
@@ -193,7 +220,6 @@ http://ricostacruz.com/cheatsheets/umdjs.html
       var are_missing = jsonLogic.apply({
         missing: options
       }, this);
-
       if (options.length - are_missing.length >= need_count) {
         return [];
       } else {
@@ -201,63 +227,59 @@ http://ricostacruz.com/cheatsheets/umdjs.html
       }
     }
   };
-
   jsonLogic.is_logic = function (logic) {
-    return _typeof(logic) === 'object' && // An object
-    logic !== null && // but not null
-    !Array.isArray(logic) && // and not an array
+    return _typeof(logic) === 'object' &&
+    // An object
+    logic !== null &&
+    // but not null
+    !Array.isArray(logic) &&
+    // and not an array
     Object.keys(logic).length === 1 // with exactly one key
     ;
   };
+
   /*
     This helper will defer to the JsonLogic spec as a tie-breaker when different language interpreters define different behavior for the truthiness of primitives.  E.g., PHP considers empty arrays to be falsy, but Javascript considers them to be truthy. JsonLogic, as an ecosystem, needs one consistent answer.
   
     Spec and rationale here: http://jsonlogic.com/truthy
     */
-
-
   jsonLogic.truthy = function (value) {
     if (Array.isArray(value) && value.length === 0) {
       return false;
     }
-
     return !!value;
   };
-
   jsonLogic.get_operator = function (logic) {
     return Object.keys(logic)[0];
   };
-
   jsonLogic.get_values = function (logic) {
     return logic[jsonLogic.get_operator(logic)];
   };
-
   jsonLogic.apply = function (logic, data) {
     // Does this array contain logic? Only one way to find out.
     if (Array.isArray(logic)) {
       return logic.map(function (l) {
         return jsonLogic.apply(l, data);
       });
-    } // You've recursed to a primitive, stop!
-
-
+    }
+    // You've recursed to a primitive, stop!
     if (!jsonLogic.is_logic(logic)) {
       return logic;
     }
-
     var op = jsonLogic.get_operator(logic);
     var values = logic[op];
     var i;
     var current;
     var scopedLogic;
     var scopedData;
-    var initial; // easy syntax for unary operators, like {"var" : "x"} instead of strict {"var" : ["x"]}
+    var initial;
 
+    // easy syntax for unary operators, like {"var" : "x"} instead of strict {"var" : ["x"]}
     if (!Array.isArray(values)) {
       values = [values];
-    } // 'if', 'and', and 'or' violate the normal rule of depth-first calculating consequents, let each manage recursion as needed.
-
+    }
 
+    // 'if', 'and', and 'or' violate the normal rule of depth-first calculating consequents, let each manage recursion as needed.
     if (op === 'if' || op == '?:') {
       /* 'if' should be called with a odd number of parameters, 3 or greater
         This works on the pattern:
@@ -276,56 +298,46 @@ http://ricostacruz.com/cheatsheets/umdjs.html
           return jsonLogic.apply(values[i + 1], data);
         }
       }
-
       if (values.length === i + 1) {
         return jsonLogic.apply(values[i], data);
       }
-
       return null;
     } else if (op === '$and') {
       // Return first falsy, or last
       for (i = 0; i < values.length; i += 1) {
         current = jsonLogic.apply(values[i], data);
-
         if (!jsonLogic.truthy(current)) {
           return current;
         }
       }
-
       return current; // Last
     } else if (op === 'or') {
       // Return first truthy, or last
       for (i = 0; i < values.length; i += 1) {
         current = jsonLogic.apply(values[i], data);
-
         if (jsonLogic.truthy(current)) {
           return current;
         }
       }
-
       return current; // Last
     } else if (op === 'filter') {
       scopedData = jsonLogic.apply(values[0], data);
       scopedLogic = values[1];
-
       if (!Array.isArray(scopedData)) {
         return [];
-      } // Return only the elements from the array in the first argument,
+      }
+      // Return only the elements from the array in the first argument,
       // that return truthy when passed to the logic in the second argument.
       // For parity with JavaScript, reindex the returned array
-
-
       return scopedData.filter(function (datum) {
         return jsonLogic.truthy(jsonLogic.apply(scopedLogic, datum));
       });
     } else if (op === 'map') {
       scopedData = jsonLogic.apply(values[0], data);
       scopedLogic = values[1];
-
       if (!Array.isArray(scopedData)) {
         return [];
       }
-
       return scopedData.map(function (datum) {
         return jsonLogic.apply(scopedLogic, datum);
       });
@@ -333,11 +345,9 @@ http://ricostacruz.com/cheatsheets/umdjs.html
       scopedData = jsonLogic.apply(values[0], data);
       scopedLogic = values[1];
       initial = typeof values[2] !== 'undefined' ? values[2] : null;
-
       if (!Array.isArray(scopedData)) {
         return initial;
       }
-
       return scopedData.reduce(function (accumulator, current) {
         return jsonLogic.apply(scopedLogic, {
           current: current,
@@ -346,12 +356,11 @@ http://ricostacruz.com/cheatsheets/umdjs.html
       }, initial);
     } else if (op === 'all') {
       scopedData = jsonLogic.apply(values[0], data);
-      scopedLogic = values[1]; // All of an empty set is false. Note, some and none have correct fallback after the for loop
-
+      scopedLogic = values[1];
+      // All of an empty set is false. Note, some and none have correct fallback after the for loop
       if (!Array.isArray(scopedData) || !scopedData.length) {
         return false;
       }
-
       for (i = 0; i < scopedData.length; i += 1) {
         if (!jsonLogic.truthy(jsonLogic.apply(scopedLogic, scopedData[i]))) {
           return false; // First falsy, short circuit
@@ -362,11 +371,9 @@ http://ricostacruz.com/cheatsheets/umdjs.html
     } else if (op === 'none') {
       scopedData = jsonLogic.apply(values[0], data);
       scopedLogic = values[1];
-
       if (!Array.isArray(scopedData) || !scopedData.length) {
         return true;
       }
-
       for (i = 0; i < scopedData.length; i += 1) {
         if (jsonLogic.truthy(jsonLogic.apply(scopedLogic, scopedData[i]))) {
           return false; // First truthy, short circuit
@@ -377,11 +384,9 @@ http://ricostacruz.com/cheatsheets/umdjs.html
     } else if (op === 'some') {
       scopedData = jsonLogic.apply(values[0], data);
       scopedLogic = values[1];
-
       if (!Array.isArray(scopedData) || !scopedData.length) {
         return false;
       }
-
       for (i = 0; i < scopedData.length; i += 1) {
         if (jsonLogic.truthy(jsonLogic.apply(scopedLogic, scopedData[i]))) {
           return true; // First truthy, short circuit
@@ -389,48 +394,41 @@ http://ricostacruz.com/cheatsheets/umdjs.html
       }
 
       return false; // None were truthy
-    } // Everyone else gets immediate depth-first recursion
-
+    }
 
+    // Everyone else gets immediate depth-first recursion
     values = values.map(function (val) {
       return jsonLogic.apply(val, data);
-    }); // The operation is called with "data" bound to its "this" and "values" passed as arguments.
+    });
+
+    // The operation is called with "data" bound to its "this" and "values" passed as arguments.
     // Structured commands like % or > can name formal arguments while flexible commands (like missing or merge) can operate on the pseudo-array arguments
     // https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Functions/arguments
-
     if (operations.hasOwnProperty(op) && typeof operations[op] === 'function') {
       return operations[op].apply(data, values);
     } else if (op.indexOf('.') > 0) {
       // Contains a dot, and not in the 0th position
       var sub_ops = String(op).split('.');
       var operation = operations;
-
       for (i = 0; i < sub_ops.length; i++) {
         if (!operation.hasOwnProperty(sub_ops[i])) {
           throw new Error('Unrecognized operation ' + op + ' (failed at ' + sub_ops.slice(0, i + 1).join('.') + ')');
-        } // Descending into operations
-
-
+        }
+        // Descending into operations
         operation = operation[sub_ops[i]];
       }
-
       return operation.apply(data, values);
     }
-
     throw new Error('Unrecognized operation ' + op);
   };
-
   jsonLogic.uses_data = function (logic) {
     var collection = [];
-
     if (jsonLogic.is_logic(logic)) {
       var op = jsonLogic.get_operator(logic);
       var values = logic[op];
-
       if (!Array.isArray(values)) {
         values = [values];
       }
-
       if (op === 'var') {
         // This doesn't cover the case where the arg to var is itself a rule.
         collection.push(values[0]);
@@ -441,54 +439,41 @@ http://ricostacruz.com/cheatsheets/umdjs.html
         });
       }
     }
-
     return arrayUnique(collection);
   };
-
   jsonLogic.add_operation = function (name, code) {
     operations[name] = code;
   };
-
   jsonLogic.rm_operation = function (name) {
     delete operations[name];
   };
-
   jsonLogic.rule_like = function (rule, pattern) {
     // console.log("Is ". JSON.stringify(rule) . " like " . JSON.stringify(pattern) . "?");
     if (pattern === rule) {
       return true;
     } // TODO : Deep object equivalency?
-
-
     if (pattern === '@') {
       return true;
     } // Wildcard!
-
-
     if (pattern === 'number') {
       return typeof rule === 'number';
     }
-
     if (pattern === 'string') {
       return typeof rule === 'string';
     }
-
     if (pattern === 'array') {
       // !logic test might be superfluous in JavaScript
       return Array.isArray(rule) && !jsonLogic.is_logic(rule);
     }
-
     if (jsonLogic.is_logic(pattern)) {
       if (jsonLogic.is_logic(rule)) {
         var pattern_op = jsonLogic.get_operator(pattern);
         var rule_op = jsonLogic.get_operator(rule);
-
         if (pattern_op === '@' || pattern_op === rule_op) {
           // echo "\nOperators match, go deeper\n";
           return jsonLogic.rule_like(jsonLogic.get_values(rule, false), jsonLogic.get_values(pattern, false));
         }
       }
-
       return false; // pattern is logic, rule isn't, can't be eq
     }
 
@@ -500,24 +485,20 @@ http://ricostacruz.com/cheatsheets/umdjs.html
         /*
             Note, array order MATTERS, because we're using this array test logic to consider arguments, where order can matter. (e.g., + is commutative, but '-' or 'if' or 'var' are NOT)
           */
-
-
         for (var i = 0; i < pattern.length; i += 1) {
           // If any fail, we fail
           if (!jsonLogic.rule_like(rule[i], pattern[i])) {
             return false;
           }
         }
-
         return true; // If they *all* passed, we pass
       } else {
         return false; // Pattern is array, rule isn't
       }
-    } // Not logic, not array, not a === match for rule.
-
+    }
 
+    // Not logic, not array, not a === match for rule.
     return false;
   };
-
   return jsonLogic;
 });

package/es/schema-component/common/utils/uitls.js

@@ -1,82 +1,86 @@
-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); }
 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); }
-
-import { every, some } from 'lodash';
+import { every, some, findIndex } from 'lodash';
 import flat from 'flat';
 import jsonLogic from '../../common/utils/logic';
-
-function getDeepestProperty(obj) {
-  var deepest = {
-    operator: null,
-    value: null
-  };
-  var deepestLevel = 0;
-
-  function traverse(obj, level) {
-    for (var key in obj) {
-      if (obj.hasOwnProperty(key)) {
-        if (_typeof(obj[key]) === 'object') {
-          traverse(obj[key], level + 1);
-        } else {
-          if (level > deepestLevel) {
-            deepestLevel = level;
-            deepest.operator = key;
-            deepest.value = obj[key];
-          }
-        }
+function getInnermostKeyAndValue(obj) {
+  if (_typeof(obj) !== 'object' || obj === null) {
+    return null;
+  }
+  for (var key in obj) {
+    if (Object.prototype.hasOwnProperty.call(obj, key)) {
+      if (Object.prototype.toString.call(obj[key]) === '[object Object]' && obj[key] !== null) {
+        return getInnermostKeyAndValue(obj[key]);
+      } else {
+        return {
+          key: key,
+          value: obj[key]
+        };
       }
     }
   }
-
-  traverse(obj, 1);
-  return deepest;
+  return null;
 }
-
 var getValue = function getValue(str, values) {
   var _str$match;
-
   var regex = /{{(.*?)}}/;
   var matches = str === null || str === void 0 ? void 0 : (_str$match = str.match) === null || _str$match === void 0 ? void 0 : _str$match.call(str, regex);
-
   if (matches) {
     return getVariableValue(str, values);
   } else {
     return str;
   }
 };
-
 var getVariableValue = function getVariableValue(str, values) {
   var regex = /{{[^.]+\.([^}]+)}}/;
   var match = regex.exec(str);
   return values[match === null || match === void 0 ? void 0 : match[1]];
 };
-
+var getTargetField = function getTargetField(obj) {
+  var keys = getAllKeys(obj);
+  var index = findIndex(keys, function (key, index, keys) {
+    if (key.includes('$') && index > 0) {
+      return true;
+    }
+  });
+  var result = keys.slice(0, index);
+  return result;
+};
+function getAllKeys(obj) {
+  var keys = [];
+  function traverse(o) {
+    Object.keys(o).sort().forEach(function (key) {
+      keys.push(key);
+      if (o[key] && _typeof(o[key]) === 'object') {
+        traverse(o[key]);
+      }
+    });
+  }
+  traverse(obj);
+  return keys;
+}
 export var conditionAnalyse = function conditionAnalyse(rules, values) {
   var type = Object.keys(rules)[0] || '$and';
   var conditions = rules[type];
   var results = conditions.map(function (c) {
-    var _Object$keys$, _Object$keys$$replace;
-
-    var jsonlogic = getDeepestProperty(c);
-    var operator = jsonlogic.operator;
-    var value = getValue(jsonlogic.value, values);
-    var targetField = (_Object$keys$ = Object.keys(flat(c))[0]) === null || _Object$keys$ === void 0 ? void 0 : (_Object$keys$$replace = _Object$keys$.replace) === null || _Object$keys$$replace === void 0 ? void 0 : _Object$keys$$replace.call(_Object$keys$, ".".concat(operator), '');
-
+    var jsonlogic = getInnermostKeyAndValue(c);
+    var operator = jsonlogic === null || jsonlogic === void 0 ? void 0 : jsonlogic.key;
+    var value = getValue(jsonlogic === null || jsonlogic === void 0 ? void 0 : jsonlogic.value, values);
+    var targetField = getTargetField(c);
     if (!operator) {
       return true;
     }
-
     try {
       var _flat;
-
-      var result = jsonLogic.apply(_defineProperty({}, operator, [(_flat = flat(values)) === null || _flat === void 0 ? void 0 : _flat[targetField], value]));
+      var currentValue = targetField.length > 1 ? (_flat = flat(values)) === null || _flat === void 0 ? void 0 : _flat[targetField.join('.')] : values === null || values === void 0 ? void 0 : values[targetField[0]];
+      var result = jsonLogic.apply(_defineProperty({}, operator, [currentValue, value]));
       return result;
     } catch (error) {
       console.error(error);
     }
   });
-
   if (type === '$and') {
     return every(results, function (v) {
       return v;

package/es/schema-component/core/DesignableSwitch.js

@@ -1,32 +1,30 @@
 import { HighlightOutlined } from '@ant-design/icons';
+import { Button } from 'antd';
 import React from 'react';
+import { useHotkeys } from 'react-hotkeys-hook';
 import { useTranslation } from 'react-i18next';
 import { useDesignable } from '..';
-import { PluginManager } from '../../plugin-manager';
-import { useHotkeys } from 'react-hotkeys-hook';
 export var DesignableSwitch = function DesignableSwitch() {
   var _useDesignable = useDesignable(),
-      designable = _useDesignable.designable,
-      setDesignable = _useDesignable.setDesignable;
-
+    designable = _useDesignable.designable,
+    setDesignable = _useDesignable.setDesignable;
   var _useTranslation = useTranslation(),
-      t = _useTranslation.t;
-
+    t = _useTranslation.t;
   var style = {};
-
   if (designable) {
     style['backgroundColor'] = '#f18b62';
-  } // 快捷键切换编辑状态
-
-
+  }
+  // 快捷键切换编辑状态
   useHotkeys('Ctrl+Shift+U', function () {
     return setDesignable(!designable);
   }, [designable]);
-  return /*#__PURE__*/React.createElement(PluginManager.Toolbar.Item, {
-    selected: designable,
+  return /*#__PURE__*/React.createElement(Button
+  // selected={designable}
+  , {
+    // selected={designable}
     icon: /*#__PURE__*/React.createElement(HighlightOutlined, null),
     title: t('UI Editor'),
-    subtitle: 'Ctrl+Shift+U',
+    // subtitle={'Ctrl+Shift+U'}
     style: style,
     onClick: function onClick() {
       setDesignable(!designable);