@kdcloudjs/kdesign 1.7.64 → 1.7.65

package/dist/kdesign.js

@@ -1,6 +1,6 @@
 /*!
  * 
- *   @kdcloudjs/kdesign v1.7.63
+ *   @kdcloudjs/kdesign v1.7.64
  * 
  *   Copyright 2020-present, Kingdee, Inc.
  *   All rights reserved.
@@ -4344,16 +4344,16 @@ __webpack_require__.r(__webpack_exports__);
 /* harmony import */ var _babel_runtime_helpers_slicedToArray__WEBPACK_IMPORTED_MODULE_2___default = /*#__PURE__*/__webpack_require__.n(_babel_runtime_helpers_slicedToArray__WEBPACK_IMPORTED_MODULE_2__);
 /* harmony import */ var core_js_modules_es_object_to_string_js__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! core-js/modules/es.object.to-string.js */ "./node_modules/core-js/modules/es.object.to-string.js");
 /* harmony import */ var core_js_modules_es_object_to_string_js__WEBPACK_IMPORTED_MODULE_3___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_es_object_to_string_js__WEBPACK_IMPORTED_MODULE_3__);
-/* harmony import */ var core_js_modules_es_regexp_exec_js__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(/*! core-js/modules/es.regexp.exec.js */ "./node_modules/core-js/modules/es.regexp.exec.js");
-/* harmony import */ var core_js_modules_es_regexp_exec_js__WEBPACK_IMPORTED_MODULE_4___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_es_regexp_exec_js__WEBPACK_IMPORTED_MODULE_4__);
-/* harmony import */ var core_js_modules_es_string_split_js__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(/*! core-js/modules/es.string.split.js */ "./node_modules/core-js/modules/es.string.split.js");
-/* harmony import */ var core_js_modules_es_string_split_js__WEBPACK_IMPORTED_MODULE_5___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_es_string_split_js__WEBPACK_IMPORTED_MODULE_5__);
-/* harmony import */ var core_js_modules_es_array_splice_js__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(/*! core-js/modules/es.array.splice.js */ "./node_modules/core-js/modules/es.array.splice.js");
-/* harmony import */ var core_js_modules_es_array_splice_js__WEBPACK_IMPORTED_MODULE_6___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_es_array_splice_js__WEBPACK_IMPORTED_MODULE_6__);
-/* harmony import */ var core_js_modules_es_array_filter_js__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__(/*! core-js/modules/es.array.filter.js */ "./node_modules/core-js/modules/es.array.filter.js");
-/* harmony import */ var core_js_modules_es_array_filter_js__WEBPACK_IMPORTED_MODULE_7___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_es_array_filter_js__WEBPACK_IMPORTED_MODULE_7__);
-/* harmony import */ var core_js_modules_es_array_concat_js__WEBPACK_IMPORTED_MODULE_8__ = __webpack_require__(/*! core-js/modules/es.array.concat.js */ "./node_modules/core-js/modules/es.array.concat.js");
-/* harmony import */ var core_js_modules_es_array_concat_js__WEBPACK_IMPORTED_MODULE_8___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_es_array_concat_js__WEBPACK_IMPORTED_MODULE_8__);
+/* harmony import */ var core_js_modules_es_array_filter_js__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(/*! core-js/modules/es.array.filter.js */ "./node_modules/core-js/modules/es.array.filter.js");
+/* harmony import */ var core_js_modules_es_array_filter_js__WEBPACK_IMPORTED_MODULE_4___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_es_array_filter_js__WEBPACK_IMPORTED_MODULE_4__);
+/* harmony import */ var core_js_modules_es_regexp_exec_js__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(/*! core-js/modules/es.regexp.exec.js */ "./node_modules/core-js/modules/es.regexp.exec.js");
+/* harmony import */ var core_js_modules_es_regexp_exec_js__WEBPACK_IMPORTED_MODULE_5___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_es_regexp_exec_js__WEBPACK_IMPORTED_MODULE_5__);
+/* harmony import */ var core_js_modules_es_string_split_js__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(/*! core-js/modules/es.string.split.js */ "./node_modules/core-js/modules/es.string.split.js");
+/* harmony import */ var core_js_modules_es_string_split_js__WEBPACK_IMPORTED_MODULE_6___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_es_string_split_js__WEBPACK_IMPORTED_MODULE_6__);
+/* harmony import */ var core_js_modules_es_array_concat_js__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__(/*! core-js/modules/es.array.concat.js */ "./node_modules/core-js/modules/es.array.concat.js");
+/* harmony import */ var core_js_modules_es_array_concat_js__WEBPACK_IMPORTED_MODULE_7___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_es_array_concat_js__WEBPACK_IMPORTED_MODULE_7__);
+/* harmony import */ var core_js_modules_es_array_splice_js__WEBPACK_IMPORTED_MODULE_8__ = __webpack_require__(/*! core-js/modules/es.array.splice.js */ "./node_modules/core-js/modules/es.array.splice.js");
+/* harmony import */ var core_js_modules_es_array_splice_js__WEBPACK_IMPORTED_MODULE_8___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_es_array_splice_js__WEBPACK_IMPORTED_MODULE_8__);
 /* harmony import */ var core_js_modules_es_array_slice_js__WEBPACK_IMPORTED_MODULE_9__ = __webpack_require__(/*! core-js/modules/es.array.slice.js */ "./node_modules/core-js/modules/es.array.slice.js");
 /* harmony import */ var core_js_modules_es_array_slice_js__WEBPACK_IMPORTED_MODULE_9___default = /*#__PURE__*/__webpack_require__.n(core_js_modules_es_array_slice_js__WEBPACK_IMPORTED_MODULE_9__);
 /* harmony import */ var core_js_modules_es_array_map_js__WEBPACK_IMPORTED_MODULE_10__ = __webpack_require__(/*! core-js/modules/es.array.map.js */ "./node_modules/core-js/modules/es.array.map.js");
@@ -4492,8 +4492,11 @@ var InternalBaseData = function InternalBaseData(props, ref) {
 
   // 记录每个选项的开始与结束下标
   var setValIndxPosition = Object(react__WEBPACK_IMPORTED_MODULE_17__["useCallback"])(function () {
+    var str = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : '';
     var arr = [];
-    inputValue.split(delimiter).reduce(function (pre, next) {
+    (str || inputValue).split(delimiter).filter(function (item) {
+      return !!item;
+    }).reduce(function (pre, next) {
       arr.push({
         start: pre,
         end: pre + next.length
@@ -4502,6 +4505,12 @@ var InternalBaseData = function InternalBaseData(props, ref) {
     }, 0);
     return arr;
   }, [delimiter, inputValue]);
+  var initInputValue = (searchInfo.current.editOptions || []).filter(function (item) {
+    return !!item;
+  }).reduce(function (pre, next, index, arr) {
+    return "".concat(pre).concat(next[optionLabelProp]).concat(index !== arr.length - 1 ? delimiter : '');
+  }, '');
+  var initIndexPos = setValIndxPosition(initInputValue);
   Object(react__WEBPACK_IMPORTED_MODULE_17__["useEffect"])(function () {
     var list = setValIndxPosition();
     setIndxPosList(list);
@@ -4531,7 +4540,6 @@ var InternalBaseData = function InternalBaseData(props, ref) {
     // 新增一个
     var list = _babel_runtime_helpers_toConsumableArray__WEBPACK_IMPORTED_MODULE_0___default()(searchInfo.current.editOptions || []);
     if (valueArr.length - preValueArr.length === 1) {
-      searchInfo.current.deleteEndIndx = index;
       list.splice(index, 0, null);
     }
     if (valueArr.length < preValueArr.length) {
@@ -4548,6 +4556,17 @@ var InternalBaseData = function InternalBaseData(props, ref) {
         end = _findDeleteInterval.end;
       list === null || list === void 0 ? void 0 : list.splice(start, end - start + 1);
     }
+    // 判断每次单个按del键时删除了分隔符后下一次触发
+    if (searchInfo.current.deleteEndIndx > 0 && selectionStart !== searchInfo.current.deleteEndIndx) {
+      var _findDeleteInterval2 = findDeleteInterval(selectionStart, searchInfo.current.deleteEndIndx, initIndexPos),
+        _start = _findDeleteInterval2.start,
+        _end = _findDeleteInterval2.end;
+      // 单个删除时找到合理的下标触发
+      if (_start !== null && _end !== null && _start <= _end) {
+        list === null || list === void 0 ? void 0 : list.splice(_start, _end - _start + 1);
+        searchInfo.current.deleteEndIndx = 0;
+      }
+    }
     searchInfo.current.editOptions = list;
     searchInfo.current.previousEditValue = inputValue;
     // eslint-disable-next-line react-hooks/exhaustive-deps
@@ -4584,14 +4603,25 @@ var InternalBaseData = function InternalBaseData(props, ref) {
   Object(react__WEBPACK_IMPORTED_MODULE_17__["useEffect"])(function () {
     setValueBySeleted();
   }, [setValueBySeleted]);
+  var findDeletedChar = function findDeletedChar(prev, current) {
+    if (prev.length > current.length) {
+      for (var i = 0; i < prev.length; i++) {
+        if (prev[i] !== current[i]) {
+          return prev[i];
+        }
+      }
+      return prev[prev.length - 1];
+    }
+    return null;
+  };
   var changeInputText = function changeInputText(e) {
     var _inputRef$current3;
     setOptionShow(true);
     var textValue = e.target.value;
     var val = textValue;
     var inputDom = (_inputRef$current3 = inputRef.current) === null || _inputRef$current3 === void 0 ? void 0 : _inputRef$current3.input;
+    var selectionStart = inputDom.selectionStart || 0; // selectionStart: 光标前面有几个字符
     if (isMultiple && inputDom && textValue && textValue.length > inputValue.length) {
-      var selectionStart = inputDom.selectionStart || 0; // selectionStart: 光标前面有几个字符
       searchInfo.current.selectionStart = selectionStart;
       var isInHead = selectionStart === 1 && textValue[1] !== delimiter && textValue.length !== 1; // 在首部添加
       var isInMid = selectionStart !== textValue.length && textValue[selectionStart - 2] === delimiter && textValue[selectionStart] !== delimiter;
@@ -4600,6 +4630,10 @@ var InternalBaseData = function InternalBaseData(props, ref) {
         setCursorPosition(inputDom, selectionStart);
       }
     }
+    // 单个删除时 当删除的字符为分隔符delimiter 记录位置
+    if (findDeletedChar(searchInfo.current.previousEditValue || '', textValue) === delimiter) {
+      searchInfo.current.deleteEndIndx = selectionStart;
+    }
     setInputValue(val);
     handleChange(val);
   };