fan-standard-comp 3.2.4 → 3.2.6

package/lib/FormComp/VarTemplate/indexClass.js

@@ -0,0 +1,268 @@
+"use strict";
+
+function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = void 0;
+require("antd/es/tag/style");
+var _tag = _interopRequireDefault(require("antd/es/tag"));
+require("antd/es/input/style");
+var _input = _interopRequireDefault(require("antd/es/input"));
+var _react = _interopRequireWildcard(require("react"));
+function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(e) { return e ? t : r; })(e); }
+function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != _typeof(e) && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && {}.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
+function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
+function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
+function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
+function _defineProperty(e, r, t) { return (r = _toPropertyKey(r)) in e ? Object.defineProperty(e, r, { value: t, enumerable: !0, configurable: !0, writable: !0 }) : e[r] = t, e; }
+function _classCallCheck(a, n) { if (!(a instanceof n)) throw new TypeError("Cannot call a class as a function"); }
+function _defineProperties(e, r) { for (var t = 0; t < r.length; t++) { var o = r[t]; o.enumerable = o.enumerable || !1, o.configurable = !0, "value" in o && (o.writable = !0), Object.defineProperty(e, _toPropertyKey(o.key), o); } }
+function _createClass(e, r, t) { return r && _defineProperties(e.prototype, r), t && _defineProperties(e, t), Object.defineProperty(e, "prototype", { writable: !1 }), e; }
+function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : i + ""; }
+function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
+function _callSuper(t, o, e) { return o = _getPrototypeOf(o), _possibleConstructorReturn(t, _isNativeReflectConstruct() ? Reflect.construct(o, e || [], _getPrototypeOf(t).constructor) : o.apply(t, e)); }
+function _possibleConstructorReturn(t, e) { if (e && ("object" == _typeof(e) || "function" == typeof e)) return e; if (void 0 !== e) throw new TypeError("Derived constructors may only return object or undefined"); return _assertThisInitialized(t); }
+function _assertThisInitialized(e) { if (void 0 === e) throw new ReferenceError("this hasn't been initialised - super() hasn't been called"); return e; }
+function _isNativeReflectConstruct() { try { var t = !Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); } catch (t) {} return (_isNativeReflectConstruct = function _isNativeReflectConstruct() { return !!t; })(); }
+function _getPrototypeOf(t) { return _getPrototypeOf = Object.setPrototypeOf ? Object.getPrototypeOf.bind() : function (t) { return t.__proto__ || Object.getPrototypeOf(t); }, _getPrototypeOf(t); }
+function _inherits(t, e) { if ("function" != typeof e && null !== e) throw new TypeError("Super expression must either be null or a function"); t.prototype = Object.create(e && e.prototype, { constructor: { value: t, writable: !0, configurable: !0 } }), Object.defineProperty(t, "prototype", { writable: !1 }), e && _setPrototypeOf(t, e); }
+function _setPrototypeOf(t, e) { return _setPrototypeOf = Object.setPrototypeOf ? Object.setPrototypeOf.bind() : function (t, e) { return t.__proto__ = e, t; }, _setPrototypeOf(t, e); } /**
+ * Created by S.C. on 2019/11/16.
+ */
+var TextArea = _input.default.TextArea;
+var isIE = !!document.all;
+var VarTemplate = /*#__PURE__*/function (_Component) {
+  function VarTemplate(props) {
+    var _this;
+    _classCallCheck(this, VarTemplate);
+    _this = _callSuper(this, VarTemplate, [props]);
+    _this.handleBlur = function (e) {
+      _this.getCurrentCursor();
+    };
+    _this.handleFocus = function (e) {
+      // console.log('获取焦点')
+      // this.$emit('focus', event)
+    };
+    _this.handleInputChange = function (e) {
+      var onChange = _this.props.onChange;
+      _this.getCurrentCursor();
+      _this.setState({
+        currentContent: e.target.value,
+        startNum: e.target.value.length,
+        endNum: e.target.value.length,
+        wordCount: e.target.value.length
+      });
+      if (onChange) onChange(e.target.value);
+    };
+    _this.setTagWords = function (key) {
+      var onChange = _this.props.onChange;
+      var _this$state = _this.state,
+        currentContent = _this$state.currentContent,
+        startNum = _this$state.startNum,
+        endNum = _this$state.endNum;
+      _this.setState({
+        currentContent: _this.insertContent(currentContent, key, startNum, endNum),
+        startNum: startNum + key.length,
+        // 光标起始位置累加
+        endNum: endNum + key.length,
+        // 光标起始位置累加
+        wordCount: _this.insertContent(currentContent, key, startNum, endNum).length
+      });
+      if (onChange) onChange(_this.insertContent(currentContent, key, startNum, endNum));
+      setTimeout(function () {
+        _this.moveToCursor(); // 重新定位光标
+      });
+    };
+    /**
+     * 指定位置插入标签占位符字符串，当光标有选中一段字符时，会将直接将其替换
+     * @param {str}       需要做插入的字符串
+     * @param {insertStr} 需要插入的字符串
+     * @param {start}     指定开始位置
+     * @param {end}       指定结束位置
+     * */
+    _this.insertContent = function (str, insertStr, start, end) {
+      if (start !== end) {
+        var _prevStr = str.substring(0, start);
+        var _nextStr = str.substring(end, str.length);
+        return _prevStr + insertStr + _nextStr;
+      }
+      var prevStr = str.substring(0, start);
+      var nextStr = str.substring(start, str.length);
+      return prevStr + insertStr + nextStr;
+    };
+    /**
+     * 获取当前（上一次）光标的位置
+     * @参考 http://blog.csdn.net/chadcao/article/details/6575927
+     * @TODO IE、火狐浏览器下未验证
+     */
+    _this.getCurrentCursor = function () {
+      var start = 0;
+      var end = 0;
+      var oTextarea = _this.content.querySelector('textarea'); // 获取textarea标签
+      if (isIE) {
+        // selection 当前激活选中区，即高亮文本块，和/或文当中用户可执行某些操作的其它元素。
+        // createRange 从当前文本选中区中创建 TextRange 对象，
+        // 或从控件选中区中创建 controlRange 集合。
+        var sTextRange = document.selection.createRange();
+        // 判断选中的是不是textarea对象
+        if (sTextRange.parentElement() === oTextarea) {
+          // 创建一个TextRange对象
+          var oTextRange = document.body.createTextRange();
+          // 移动文本范围以便范围的开始和结束位置能够完全包含给定元素的文本。
+          oTextRange.moveToElementText(oTextarea);
+          // 这里我们比较oTextRange和sTextRange的开头，的到选中区域的开头位置
+          for (start = 0; oTextRange.compareEndPoints('StartToStart', sTextRange) < 0; start++) {
+            oTextRange.moveStart('character', 1);
+          }
+          // 需要计算一下\n的数目(按字符移动的方式不计\n,所以这里加上)
+          for (var i = 0; i <= start; i++) {
+            if (oTextarea.value.charAt(i) === '\n') {
+              start++;
+            }
+          }
+          // 再计算一次结束的位置
+          oTextRange.moveToElementText(oTextarea);
+          for (end = 0; oTextRange.compareEndPoints('StartToEnd', sTextRange) < 0; end++) {
+            oTextRange.moveStart('character', 1);
+          }
+          for (var j = 0; j <= end; j++) {
+            if (oTextarea.value.charAt(j) === '\n') {
+              end++;
+            }
+          }
+        }
+      } else {
+        start = oTextarea.selectionStart;
+        end = oTextarea.selectionEnd;
+      }
+      _this.setState({
+        startNum: start,
+        endNum: end
+      });
+    };
+    /**
+     * 跳转到上一次光标的位置
+     * @参考 http://blog.csdn.net/chadcao/article/details/6575927
+     * @TODO IE、火狐浏览器下未验证
+     */
+    _this.moveToCursor = function () {
+      var _this$state2 = _this.state,
+        startNum = _this$state2.startNum,
+        endNum = _this$state2.endNum;
+      var oTextarea = _this.content.querySelector('textarea');
+      var start = startNum;
+      var end = endNum;
+      if (isNaN(start) || isNaN(end)) {
+        alert('位置输入错误');
+      }
+      if (isIE) {
+        var oTextRange = oTextarea.createTextRange();
+        var LStart = startNum;
+        var LEnd = endNum;
+        var _start = 0;
+        var _end = 0;
+        var value = oTextarea.value;
+        for (var i = 0; i < value.length && i < LStart; i++) {
+          var c = value.charAt(i);
+          if (c !== '\n') {
+            _start++;
+          }
+        }
+        for (var j = value.length - 1; j >= LEnd && j >= 0; j--) {
+          var _c = value.charAt(j);
+          if (_c !== '\n') {
+            _end++;
+          }
+        }
+        oTextRange.moveStart('character', _start);
+        oTextRange.moveEnd('character', -_end);
+        // oTextRange.collapse(true);
+        oTextRange.select();
+        oTextarea.focus();
+      } else {
+        oTextarea.select();
+        oTextarea.selectionStart = startNum;
+        oTextarea.selectionEnd = endNum;
+      }
+    };
+    var _value = props.value || '';
+    _this.state = {
+      currentContent: _value,
+      startNum: _value.length,
+      // 光标开始位置(当选中文本时)
+      endNum: _value.length,
+      // 光标结束位置(当选中文本时)
+      wordCount: _value.length // 输入框内的字符数总和（包含占位符所需要的长度）
+    };
+    _this.content = /*#__PURE__*/_react.default.createRef();
+    return _this;
+  }
+  _inherits(VarTemplate, _Component);
+  return _createClass(VarTemplate, [{
+    key: "render",
+    value: function render() {
+      var _this2 = this;
+      var _this$props = this.props,
+        size = _this$props.size,
+        style = _this$props.style,
+        tags = _this$props.tags,
+        disabled = _this$props.disabled;
+      var _this$state3 = this.state,
+        currentContent = _this$state3.currentContent,
+        wordCount = _this$state3.wordCount;
+      return /*#__PURE__*/_react.default.createElement("div", {
+        className: "vart-wrap",
+        style: style,
+        ref: function ref(cRef) {
+          _this2.content = cRef;
+        }
+      }, tags && Array.isArray(tags) && /*#__PURE__*/_react.default.createElement("div", {
+        className: "vart-header"
+      }, tags.map(function (item) {
+        return /*#__PURE__*/_react.default.createElement(_tag.default, {
+          key: item.id,
+          onClick: function onClick() {
+            return !disabled && _this2.setTagWords(item.variableNameFormatted);
+          }
+        }, item.variableName);
+      })), /*#__PURE__*/_react.default.createElement("div", {
+        className: "vart-input"
+      }, /*#__PURE__*/_react.default.createElement(TextArea, {
+        type: "text",
+        size: size,
+        value: currentContent,
+        placeholder: "\u8BF7\u8F93\u5165",
+        onFocus: this.handleFocus,
+        onBlur: this.handleBlur,
+        onChange: function onChange(e) {
+          return _this2.handleInputChange(e);
+        },
+        disabled: disabled
+      })));
+    }
+  }], [{
+    key: "getDerivedStateFromProps",
+    value: function getDerivedStateFromProps(nextProps) {
+      // console.log('执行getDerivedStateFromProps', nextProps)
+      // Should be a controlled component.
+      // 如果 props 中的value属性发生变化，返回一个新的子状态对象
+      if ('value' in nextProps) {
+        // console.log('nextProps', nextProps, nextProps.value || {})
+        var nValue = nextProps.value || '';
+        return _objectSpread({
+          value: nValue,
+          currentContent: nValue,
+          startNum: nValue.length,
+          // 光标开始位置(当选中文本时)
+          endNum: nValue.length,
+          // 光标结束位置(当选中文本时)
+          wordCount: nValue.length
+        }, nextProps.value || {});
+      }
+      // 如果props没有变化，返回null或undefined ,不触发任何状态更新
+      return null;
+    }
+  }]);
+}(_react.Component);
+var _default = exports.default = VarTemplate;

package/lib/NavLeafScroll/index.js

@@ -54,7 +54,7 @@ var NavLeafScroll = /*#__PURE__*/function (_Component) {
       // const isEnough = wrapHeight % baseItemHeight === 0; // 剩余的是否足够容纳一个单元格
       var isInsideEnoughWidth = navList.length * baseItemWidth <= _this.mainWrap.current.clientWidth;
       var wrapWidth = _this.mainWrap.current.clientWidth - (isInsideEnoughWidth ? 0 : 30 * 2);
-      console.log('this.mainWrap.current.clientWidth', _this.mainWrap.current.clientWidth, wrapWidth, isInsideEnoughWidth);
+      // console.log('this.mainWrap.current.clientWidth', this.mainWrap.current.clientWidth, wrapWidth, isInsideEnoughWidth)
       var floorWidth = _this.leafNav.current.clientWidth; // 所有楼层占用的宽度
       if (type === 'horizontal') {
         // 判断有效区域与单元格高度：若小于，则直接使用单元格高度，否则将内容区高度去除不足一个单元格高度
@@ -293,7 +293,7 @@ var NavLeafScroll = /*#__PURE__*/function (_Component) {
         floorWidth = _this$state3$floorRel.floorWidth,
         stepSize = _this$state3.stepSize;
       if (type === 'horizontal') {}
-      if (JSON.stringify(navList) !== JSON.stringify(prevProps.navList) || (type === 'horizontal' ? baseItemWidth !== prevProps.baseItemWidth : baseItemHeight !== prevProps.baseItemHeight) || align !== prevProps.align) {
+      if (navList !== prevProps.navList || (type === 'horizontal' ? baseItemWidth !== prevProps.baseItemWidth : baseItemHeight !== prevProps.baseItemHeight) || align !== prevProps.align) {
         this.initFloorValues();
       }
       if (forbidScroll !== prevProps.forbidScroll) {

package/lib/RefactorTree/index.js

@@ -72,10 +72,10 @@ var RefactorTree = function RefactorTree(props) {
     e.selectedNodes.map(function (item) {
       return multiSelectedData.push(item);
     }); // 多选条件下,当前选中所有节点数据
-    onSelect && onSelect(key, {
+    onSelect && onSelect(key, Object.assign({
       currentData: currentData,
       multiData: multiSelectedData
-    }, e);
+    }, e), e);
   };
   var handleToCheckTreeNode = function handleToCheckTreeNode(keys, e) {
     var currentData = e.node;

package/lib/StandardFilter/index.js

@@ -41,7 +41,8 @@ var StandardFilter = /*#__PURE__*/_react.default.forwardRef(function (props, ref
     style = _Object$assign.style,
     _Object$assign$button = _Object$assign.buttonGroup,
     buttonGroup = _Object$assign$button === void 0 ? [] : _Object$assign$button,
-    buttonGroupConfig = _Object$assign.buttonGroupConfig,
+    _Object$assign$button2 = _Object$assign.buttonGroupConfig,
+    buttonGroupConfig = _Object$assign$button2 === void 0 ? {} : _Object$assign$button2,
     min = _Object$assign.min,
     codes = _Object$assign.codes,
     permissionCodes = _Object$assign.permissionCodes,
@@ -53,8 +54,11 @@ var StandardFilter = /*#__PURE__*/_react.default.forwardRef(function (props, ref
     cancelButtonProps = _Object$assign$cancel === void 0 ? {} : _Object$assign$cancel,
     filterButtonColSpan = _Object$assign.filterButtonColSpan,
     filterButtonConfig = _Object$assign.filterButtonConfig,
-    formLayout = _Object$assign.formLayout,
+    _Object$assign$formLa = _Object$assign.formLayout,
+    formLayout = _Object$assign$formLa === void 0 ? 'inline' : _Object$assign$formLa,
     gridLayout = _Object$assign.gridLayout,
+    _Object$assign$button3 = _Object$assign.buttonGroupPlacement,
+    buttonGroupPlacement = _Object$assign$button3 === void 0 ? 'left' : _Object$assign$button3,
     filterFormStyle = _Object$assign.filterFormStyle,
     filterBtnsStyle = _Object$assign.filterBtnsStyle,
     _Object$assign$colon = _Object$assign.colon,
@@ -210,15 +214,14 @@ var StandardFilter = /*#__PURE__*/_react.default.forwardRef(function (props, ref
   };
   var renderButtonGroup = function renderButtonGroup() {
     return buttonGroup && buttonGroup.length > 0 ? /*#__PURE__*/_react.default.createElement("div", {
-      className: "filter-btns ",
+      className: "filter-btns filter-btns-".concat(gridLayout, " filter-btns-").concat(gridLayout, "-").concat(buttonGroupPlacement),
       style: filterBtnsStyle
-    }, /*#__PURE__*/_react.default.createElement(_index.default, {
+    }, /*#__PURE__*/_react.default.createElement(_index.default, Object.assign({
       options: buttonGroup,
       min: min,
       codes: codes,
-      permissionCodes: permissionCodes,
-      dropdownConfig: buttonGroupConfig
-    })) : null;
+      permissionCodes: permissionCodes
+    }, buttonGroupConfig))) : null;
   };
   return /*#__PURE__*/_react.default.createElement(_form.default, {
     name: 'standard-filter-form-' + guid(),

package/lib/StandardFilter/style/index.less

@@ -32,7 +32,14 @@
       width: 100%;
       text-align: left;
 
+      &.filter-btns-horizontal-right {
+        .spec-button-group {
+          text-align: right;
+          //justify-content: end;
+        }
+      }
       .spec-button-group {
+        display: block;
         padding-left: 0;
         padding-top: @padding-md;
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "fan-standard-comp",
-  "version": "3.2.4",
+  "version": "3.2.6",
   "description": "FZ standard-comp,basic of antd4.0 and custom component.",
   "main": "lib/index.js",
   "module": "es/index.js",
@@ -21,7 +21,8 @@
     "package:build:publish": "father-build && webpack && npm version patch && npm publish",
     "package:build:no-dist:publish": "father-build && npm version patch && npm publish",
     "build:package:to-rgz": "npm run package:build && node copyPackage.js && npm run package-to-tgz",
-    "package-to-tgz": "tar -czf fan-standard-comp-3.2.3-beta.1.tgz package"
+    "package-to-tgz": "tar -czf fan-standard-comp-3.2.6.tgz package",
+    "doc-to-tgz": "tar -czf doc-v3.zip doc-v3"
   },
   "author": "shomychen",
   "license": "ISC",
@@ -51,5 +52,8 @@
     "react-html-parser": "^2.0.2",
     "style-loader": "1.3.0",
     "webpack": "4.44.1"
+  },
+  "engines": {
+    "node": "=16.0.0"
   }
 }