linkmore-design 1.1.13-alpha.1 → 1.1.13-alpha.3

package/lib/IconFont/index.js

@@ -1,16 +1,37 @@
 "use strict";
 
+var _interopRequireWildcard = require("@babel/runtime/helpers/interopRequireWildcard");
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
 
+var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
+
+var _react = _interopRequireWildcard(require("react"));
+
 var _icons = require("@ant-design/icons");
 
-var IconFont = (0, _icons.createFromIconfontCN)({
-  scriptUrl: '//at.alicdn.com/t/c/font_2966019_neaxovtw4w.js' // 在 iconfont.cn 上生成
-  // scriptUrl: require('./font/iconfont.js'),
+var _ConfigProvider = _interopRequireDefault(require("../ConfigProvider"));
+
+var ConfigContext = _ConfigProvider.default.ConfigContext;
+
+var IconFont = function IconFont(props) {
+  var _React$useContext = _react.default.useContext(ConfigContext),
+      iconUrl = _React$useContext.iconUrl;
+
+  var resetUrl = (0, _react.useMemo)(function () {
+    if (!iconUrl) return [];
+    return Array.isArray(iconUrl) ? iconUrl : [iconUrl];
+  }, [iconUrl]);
+  var Component = (0, _icons.createFromIconfontCN)({
+    scriptUrl: ['//at.alicdn.com/t/c/font_2966019_ac9pzkeuo0e.js'].concat((0, _toConsumableArray2.default)(resetUrl))
+  });
+  return /*#__PURE__*/_react.default.createElement(Component, Object.assign({}, props));
+};
 
-});
 var _default = IconFont;
 exports.default = _default;

package/lib/ImageViewer/components/Operate.js

@@ -11,8 +11,6 @@ var _react = _interopRequireDefault(require("react"));
 
 var _linkmoreDesign = require("linkmore-design");
 
-var _icons = require("@ant-design/icons");
-
 var Operate = function Operate(_ref) {
   var instance = _ref.instance;
   var setTransform = instance.setTransform;
@@ -31,20 +29,18 @@ var Operate = function Operate(_ref) {
     onClick: function onClick(e) {
       return handleTranform(e, 'zoomIn');
     }
-  }), /*#__PURE__*/_react.default.createElement(_icons.ZoomOutOutlined, {
+  }), /*#__PURE__*/_react.default.createElement(_linkmoreDesign.IconFont, {
+    type: "lmweb-icon_m_narrow",
     onClick: function onClick(e) {
       return handleTranform(e, 'zoomOut');
-    },
-    style: {
-      fontSize: 22
     }
   }), /*#__PURE__*/_react.default.createElement(_linkmoreDesign.IconFont, {
-    type: "lmweb-undo",
+    type: "lmweb-icon_m_turnleft-01",
     onClick: function onClick(e) {
       return handleTranform(e, 'rotateLeft');
     }
   }), /*#__PURE__*/_react.default.createElement(_linkmoreDesign.IconFont, {
-    type: "lmweb-redo",
+    type: "lmweb-reload",
     onClick: function onClick(e) {
       return handleTranform(e, 'rotateRight');
     }

package/lib/Input/index.js

@@ -17,8 +17,12 @@ var _react = _interopRequireWildcard(require("react"));
 
 var _IconFont = _interopRequireDefault(require("../IconFont"));
 
+var _classnames = _interopRequireDefault(require("classnames"));
+
 var _SizeContext = _interopRequireDefault(require("../ConfigProvider/SizeContext"));
 
+var _DisabledContext = _interopRequireDefault(require("../ConfigProvider/DisabledContext"));
+
 var __rest = void 0 && (void 0).__rest || function (s, e) {
   var t = {};
 
@@ -33,15 +37,24 @@ var __rest = void 0 && (void 0).__rest || function (s, e) {
 };
 
 var LmInput = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
-  var _props$allowClear = props.allowClear,
+  var className = props.className,
+      customSize = props.size,
+      customDisabled = props.disabled,
+      _props$allowClear = props.allowClear,
       allowClear = _props$allowClear === void 0 ? true : _props$allowClear,
-      customizeSize = props.size,
-      rest = __rest(props, ["allowClear", "size"]);
+      rest = __rest(props // ===================== Size =====================
+  , ["className", "size", "disabled", "allowClear"]); // ===================== Size =====================
+
+
+  var size = customSize || _react.default.useContext(_SizeContext.default) || 'middle'; // ===================== Disabled =====================
+
+  var disabled = _react.default.useContext(_DisabledContext.default);
 
-  var size = customizeSize || _react.default.useContext(_SizeContext.default) || 'middle';
+  var mergedDisabled = customDisabled || disabled;
   return /*#__PURE__*/_react.default.createElement(_input.default, Object.assign({
     ref: ref,
-    className: "lm_input",
+    className: (0, _classnames.default)('lm_input', className),
+    disabled: mergedDisabled || undefined,
     size: size
   }, rest, {
     allowClear: allowClear
@@ -51,7 +64,8 @@ LmInput.Group = _input.default.Group;
 LmInput.Search = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
   var _props$allowClear2 = props.allowClear,
       allowClear = _props$allowClear2 === void 0 ? true : _props$allowClear2,
-      rest = __rest(props, ["allowClear"]);
+      className = props.className,
+      rest = __rest(props, ["allowClear", "className"]);
 
   return /*#__PURE__*/_react.default.createElement(_input.default.Search, Object.assign({
     enterButton: /*#__PURE__*/_react.default.createElement(_IconFont.default, {
@@ -60,7 +74,7 @@ LmInput.Search = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
   }, rest, {
     ref: ref,
     allowClear: allowClear,
-    className: "lm_input_search"
+    className: (0, _classnames.default)('lm_input_search', className)
   }));
 });
 LmInput.TextArea = _input.default.TextArea;
@@ -68,10 +82,11 @@ LmInput.TextArea = _input.default.TextArea;
 LmInput.Password = function (props) {
   var _props$allowClear3 = props.allowClear,
       allowClear = _props$allowClear3 === void 0 ? true : _props$allowClear3,
-      rest = __rest(props, ["allowClear"]);
+      className = props.className,
+      rest = __rest(props, ["allowClear", "className"]);
 
   return /*#__PURE__*/_react.default.createElement(_input.default.Password, Object.assign({
-    className: "lm_input_password",
+    className: (0, _classnames.default)('lm_input_password', className),
     iconRender: function iconRender(visible) {
       return visible ? /*#__PURE__*/_react.default.createElement(_IconFont.default, {
         type: "lmweb-eye"

package/lib/InputNumber/index.js

@@ -15,6 +15,8 @@ var _classnames = _interopRequireDefault(require("classnames"));
 
 var _react = _interopRequireDefault(require("react"));
 
+var _DisabledContext = _interopRequireDefault(require("../ConfigProvider/DisabledContext"));
+
 var __rest = void 0 && (void 0).__rest || function (s, e) {
   var t = {};
 
@@ -33,12 +35,19 @@ var prefixCls = 'lm_input-number';
 var LMInputNumber = function LMInputNumber(props) {
   var children = props.children,
       className = props.className,
-      others = __rest(props, ["children", "className"]);
+      customDisabled = props.disabled,
+      rest = __rest(props // ===================== Disabled =====================
+  , ["children", "className", "disabled"]); // ===================== Disabled =====================
+
+
+  var disabled = _react.default.useContext(_DisabledContext.default);
 
+  var mergedDisabled = customDisabled || disabled;
   return /*#__PURE__*/_react.default.createElement(_inputNumber.default, Object.assign({
     className: (0, _classnames.default)(className, prefixCls),
+    disabled: mergedDisabled,
     placeholder: "\u8BF7\u8F93\u5165"
-  }, others));
+  }, rest));
 };
 
 var CInputNumber = LMInputNumber;

package/lib/InputNumber/style/index.css

@@ -510,8 +510,12 @@ html {
 p {
   margin-bottom: 0;
 }
+.lm_input-number {
+  width: 100%;
+}
 .lm_input-number.ant-input-number {
   border: 1px solid var(--color-15);
+  width: 100%;
 }
 .lm_input-number .ant-input-number-handler-wrap {
   width: 28px;

package/lib/InputNumber/style/variables.css

@@ -1,5 +1,9 @@
+.lm_input-number {
+  width: 100%;
+}
 .lm_input-number.ant-input-number {
   border: 1px solid var(--color-15);
+  width: 100%;
 }
 .lm_input-number .ant-input-number-handler-wrap {
   width: 28px;

package/lib/LmEditTable/EditTable.d.ts

@@ -13,6 +13,7 @@ interface ILmEditTable extends TableProps<any> {
     sortOpen?: boolean;
     size?: TableProps<any>['size'];
     colSortOpen?: boolean;
+    indexCol?: boolean | Record<string, any>;
     filterChange?: (data: TableProps<any>['columns']) => void;
     recordCreatorProps?: {
         creatorButtonText?: string;

package/lib/LmEditTable/EditTable.js

@@ -323,7 +323,7 @@ var Opetate = function Opetate(_ref) {
         fontSize: 16
       }
     })
-  })) : /*#__PURE__*/_react.default.createElement(_linkmoreDesign.Button, {
+  })) : (options === null || options === void 0 ? void 0 : options.includes('add')) || (options === null || options === void 0 ? void 0 : options.includes('addInChildren')) ? /*#__PURE__*/_react.default.createElement(_linkmoreDesign.Button, {
     type: "link",
     size: "small",
     icon: /*#__PURE__*/_react.default.createElement(_linkmoreDesign.IconFont, {
@@ -335,7 +335,7 @@ var Opetate = function Opetate(_ref) {
     onClick: function onClick() {
       return handleAdd(record, (options === null || options === void 0 ? void 0 : options.includes('addInChildren')) ? true : false);
     }
-  }));
+  }) : null);
 };
 /*
   表格单元格
@@ -628,7 +628,7 @@ var EditableCell = function EditableCell(props) {
           var fromData = form.getFieldsValue();
           return render === null || render === void 0 ? void 0 : render(Object.assign(Object.assign({}, !(0, _util.isObjEmpty)(fromData) ? Object.assign(Object.assign({}, record), (0, _defineProperty2.default)({}, dataIndex, fromData[dataIndex])) : record), {
             onChange: save
-          }));
+          }), rowIndex);
         }
 
       default:
@@ -763,6 +763,8 @@ var EditTable = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
       virtual = props.virtual,
       sortOpen = props.sortOpen,
       colSortOpen = props.colSortOpen,
+      _props$indexCol = props.indexCol,
+      indexCol = _props$indexCol === void 0 ? false : _props$indexCol,
       filterChange = props.filterChange,
       _props$size = props.size,
       size = _props$size === void 0 ? 'small' : _props$size,
@@ -770,7 +772,7 @@ var EditTable = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
       _props$shouldUpdate = props.shouldUpdate,
       shouldUpdate = _props$shouldUpdate === void 0 ? false : _props$shouldUpdate,
       resetProps = __rest(props // const [dataSource, setDataSource] = useState([]);
-  , ["value", "columns", "isEdit", "isAdd", "onChange", "rowKey", "rowHoverEdit", "isUseForm", "isHoverEdit", "useQuickOpetate", "quickOpetateClearAll", "rowSelection", "virtual", "sortOpen", "colSortOpen", "filterChange", "size", "recordCreatorProps", "shouldUpdate"]); // const [dataSource, setDataSource] = useState([]);
+  , ["value", "columns", "isEdit", "isAdd", "onChange", "rowKey", "rowHoverEdit", "isUseForm", "isHoverEdit", "useQuickOpetate", "quickOpetateClearAll", "rowSelection", "virtual", "sortOpen", "colSortOpen", "indexCol", "filterChange", "size", "recordCreatorProps", "shouldUpdate"]); // const [dataSource, setDataSource] = useState([]);
 
 
   var _useControllableValue = (0, _ahooks.useControllableValue)({
@@ -1115,7 +1117,7 @@ var EditTable = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
     var rColumns = hasDisableOptions ? DisableOptions : columns;
     var localColumns = [sortOpen ? {
       title: '排序',
-      dataIndex: 'sort',
+      dataIndex: '_sort',
       width: 48,
       maxWidth: 48,
       className: 'drag-visible',
@@ -1125,7 +1127,25 @@ var EditTable = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
           id: record[_rowKey] || record.id
         });
       }
-    } : null].concat((0, _toConsumableArray2.default)(rColumns), [useQuickOpetate ? {
+    } : null, indexCol ? (0, _lodash.isBoolean)(indexCol) ? {
+      title: '',
+      dataIndex: '_index',
+      width: 48,
+      maxWidth: 48,
+      fixed: 'left',
+      render: function render(_, record, index) {
+        return "".concat(index + 1);
+      }
+    } : Object.assign({
+      title: '',
+      dataIndex: '_index',
+      width: 48,
+      maxWidth: 48,
+      fixed: 'left',
+      render: function render(_, record, index) {
+        return "".concat(index + 1);
+      }
+    }, indexCol || {}) : null].concat((0, _toConsumableArray2.default)(rColumns), [useQuickOpetate ? {
       title: '操作',
       dataIndex: 'lm_edit_opetate',
       width: 68,
@@ -1163,8 +1183,15 @@ var EditTable = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
     var mapColumns = function mapColumns(col, index) {
       var _a, _b;
 
-      if (!col.editable && !((_a = col.children) === null || _a === void 0 ? void 0 : _a.length)) {
-        return col;
+      if (!col.editable && !((_a = col.children) === null || _a === void 0 ? void 0 : _a.length) && (col === null || col === void 0 ? void 0 : col.dataIndex) === '_sort') {
+        var fn = col === null || col === void 0 ? void 0 : col.render;
+        return Object.assign(Object.assign({}, col), {
+          render: function render(text, record, i) {
+            var _a;
+
+            return fn === null || fn === void 0 ? void 0 : fn((_a = dataSource[i]) === null || _a === void 0 ? void 0 : _a[col.dataIndex], dataSource[i], i);
+          }
+        });
       }
 
       var newCol = Object.assign(Object.assign({}, col), {

package/lib/LmEditTable/sortableItemCol.js

@@ -27,14 +27,15 @@ var __rest = void 0 && (void 0).__rest || function (s, e) {
 };
 
 var Item = /*#__PURE__*/(0, _react.forwardRef)(function (_a, ref) {
-  var _b;
-
   var children = _a.children,
       props = __rest(_a, ["children"]);
 
-  return /*#__PURE__*/_react.default.createElement("th", Object.assign({}, props, {
+  return /*#__PURE__*/_react.default.createElement("th", Object.assign({}, props, children.props, {
     ref: ref
-  }), ((_b = children === null || children === void 0 ? void 0 : children.props) === null || _b === void 0 ? void 0 : _b.children) || children);
+  })); // <th {...props} ref={ref as any}>
+  //   {/* {(children as any)?.props?.children || children} */}
+  //   { children }
+  // </th>
 });
 
 function SortableItem(props) {
@@ -49,7 +50,9 @@ function SortableItem(props) {
 
   var style = {
     position: 'relative',
-    transform: _utilities.CSS.Translate.toString(transform),
+    transform: _utilities.CSS.Translate.toString(transform ? Object.assign(Object.assign({}, transform), {
+      y: 0
+    }) : transform),
     transition: transition,
     touchAction: 'none',
     height: '40px',

package/lib/LmEditTable/util.js

@@ -84,7 +84,7 @@ function getExpandStatus(children) {
 }
 
 function checkMemoShouldUploadSpecialFun(prev, next) {
-  var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k;
+  var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m;
 
   var checkExpandStatus = getExpandStatus(prev.children) === getExpandStatus(next.children);
 
@@ -94,12 +94,21 @@ function checkMemoShouldUploadSpecialFun(prev, next) {
 
   var prevCol = prev === null || prev === void 0 ? void 0 : prev.col;
   var nextCol = next === null || next === void 0 ? void 0 : next.col;
+  /** TODO: 使用了自定义render, 是否要判断rowIndex? 这样排序之后，渲染的性能就会变差 */
+
+  if (((prevCol === null || prevCol === void 0 ? void 0 : prevCol.render) || (nextCol === null || nextCol === void 0 ? void 0 : nextCol.render)) && !(0, _lodash.isEqual)((0, _lodash.pick)(prev, ['colIndex', 'record', 'children']), (0, _lodash.pick)(next, ['colIndex', 'record', 'children']))) {
+    return false;
+  }
+
+  if (((prevCol === null || prevCol === void 0 ? void 0 : prevCol.editable) === 'render' || (nextCol === null || nextCol === void 0 ? void 0 : nextCol.editable) === 'render') && (((_a = prevCol === null || prevCol === void 0 ? void 0 : prevCol.componentProps) === null || _a === void 0 ? void 0 : _a.render) || ((_b = nextCol === null || nextCol === void 0 ? void 0 : nextCol.componentProps) === null || _b === void 0 ? void 0 : _b.render)) && !(0, _lodash.isEqual)((0, _lodash.pick)(prev, ['colIndex', 'record', 'rowIndex']), (0, _lodash.pick)(next, ['colIndex', 'record', 'rowIndex']))) {
+    return false;
+  }
 
   if (((prevCol === null || prevCol === void 0 ? void 0 : prevCol.fixed) || (nextCol === null || nextCol === void 0 ? void 0 : nextCol.fixed)) && !(0, _lodash.isEqual)(prev === null || prev === void 0 ? void 0 : prev.style, next === null || next === void 0 ? void 0 : next.style)) {
     return false;
   }
 
-  if ((((_a = prevCol === null || prevCol === void 0 ? void 0 : prevCol.componentProps) === null || _a === void 0 ? void 0 : _a.optionOnly) || ((_b = nextCol === null || nextCol === void 0 ? void 0 : nextCol.componentProps) === null || _b === void 0 ? void 0 : _b.optionOnly)) && !(0, _lodash.isEqual)((_c = prevCol === null || prevCol === void 0 ? void 0 : prevCol.componentProps) === null || _c === void 0 ? void 0 : _c.options, (_d = nextCol === null || nextCol === void 0 ? void 0 : nextCol.componentProps) === null || _d === void 0 ? void 0 : _d.options)) {
+  if ((((_c = prevCol === null || prevCol === void 0 ? void 0 : prevCol.componentProps) === null || _c === void 0 ? void 0 : _c.optionOnly) || ((_d = nextCol === null || nextCol === void 0 ? void 0 : nextCol.componentProps) === null || _d === void 0 ? void 0 : _d.optionOnly)) && !(0, _lodash.isEqual)((_e = prevCol === null || prevCol === void 0 ? void 0 : prevCol.componentProps) === null || _e === void 0 ? void 0 : _e.options, (_f = nextCol === null || nextCol === void 0 ? void 0 : nextCol.componentProps) === null || _f === void 0 ? void 0 : _f.options)) {
     // return isEqual(prevCol?.componentProps?.options, nextCol?.componentProps?.options)
     return false;
   }
@@ -110,12 +119,12 @@ function checkMemoShouldUploadSpecialFun(prev, next) {
   }
 
   if (next.className.indexOf('ant-table-selection-column') > -1) {
-    return (0, _lodash.isEqual)((_f = (_e = prev.children) === null || _e === void 0 ? void 0 : _e[1]) === null || _f === void 0 ? void 0 : _f.props, (_h = (_g = next.children) === null || _g === void 0 ? void 0 : _g[1]) === null || _h === void 0 ? void 0 : _h.props);
+    return (0, _lodash.isEqual)((_h = (_g = prev.children) === null || _g === void 0 ? void 0 : _g[1]) === null || _h === void 0 ? void 0 : _h.props, (_k = (_j = next.children) === null || _j === void 0 ? void 0 : _j[1]) === null || _k === void 0 ? void 0 : _k.props);
   }
   /** 如果启用了快速复制功能，需要实时判断rowIndex与getLength */
 
 
-  if (((_j = prevCol === null || prevCol === void 0 ? void 0 : prevCol.componentProps) === null || _j === void 0 ? void 0 : _j.quickcopy) || ((_k = nextCol === null || nextCol === void 0 ? void 0 : nextCol.componentProps) === null || _k === void 0 ? void 0 : _k.quickcopy)) {
+  if (((_l = prevCol === null || prevCol === void 0 ? void 0 : prevCol.componentProps) === null || _l === void 0 ? void 0 : _l.quickcopy) || ((_m = nextCol === null || nextCol === void 0 ? void 0 : nextCol.componentProps) === null || _m === void 0 ? void 0 : _m.quickcopy)) {
     var pickProps = ['record', 'colIndex', 'rowIndex', 'getLength'];
     var p = (0, _lodash.pick)(prev, pickProps);
     var n = (0, _lodash.pick)(next, pickProps);

package/lib/LmFilter/LmFilter.js

@@ -21,9 +21,10 @@ var _FilterRoot = _interopRequireDefault(require("./wrapper/FilterRoot"));
 
 var _localization = require("./localization");
 
-var _excluded = ["searchConfig", "localization"];
+var _components = _interopRequireDefault(require("./components"));
 
-var LmFilter = function LmFilter(_ref, ref) {
+var _excluded = ["searchConfig", "localization"];
+var LmFilter = /*#__PURE__*/(0, _react.forwardRef)(function (_ref, ref) {
   var _ref$searchConfig = _ref.searchConfig,
       searchConfig = _ref$searchConfig === void 0 ? {} : _ref$searchConfig,
       _ref$localization = _ref.localization,
@@ -64,8 +65,7 @@ var LmFilter = function LmFilter(_ref, ref) {
   return /*#__PURE__*/_react.default.createElement(_FilterRoot.default, (0, _extends2.default)({
     ref: ref || defaultRef
   }, defaultProps, resetProps));
-};
-
-var _default = /*#__PURE__*/(0, _react.forwardRef)(LmFilter);
-
+});
+LmFilter.FilterControl = _components.default;
+var _default = LmFilter;
 exports.default = _default;

package/lib/LmFilter/components/CheckboxFilter.js

@@ -43,7 +43,9 @@ var CheckboxFilter = function CheckboxFilter(_ref) {
       visible = instance.visible,
       setVisible = instance.setVisible;
   var _itemProps$data = itemProps.data,
-      filters = _itemProps$data === void 0 ? [] : _itemProps$data;
+      filters = _itemProps$data === void 0 ? [] : _itemProps$data,
+      showSearch = itemProps.showSearch,
+      showAllChecked = itemProps.showAllChecked;
   var inputRef = (0, _react.useRef)(); // 选中的数据项: [key, key, ...];
 
   var _useState = (0, _react.useState)(filterValue),
@@ -62,8 +64,11 @@ var CheckboxFilter = function CheckboxFilter(_ref) {
   var delayedFn = (0, _hooks.useDelayedFn)(); // 是否存在搜索, 当数据大于8时存在搜索
 
   var isSearch = (0, _react.useMemo)(function () {
-    return filters.length > 8;
-  }, [filters.length]); // 是否全选: 选中的数据大于等于筛选后的数据 && 筛选后的数据全部存在于选中的数据中
+    return filters.length > 8 && !!(showSearch !== null && showSearch !== void 0 ? showSearch : true);
+  }, [filters.length, showSearch]);
+  var isAllCheck = (0, _react.useMemo)(function () {
+    return !!(showAllChecked !== null && showAllChecked !== void 0 ? showAllChecked : true);
+  }, [showAllChecked]); // 是否全选: 选中的数据大于等于筛选后的数据 && 筛选后的数据全部存在于选中的数据中
 
   var checkAll = (0, _react.useMemo)(function () {
     var isAll = checkedValues.length >= options.length;
@@ -145,7 +150,7 @@ var CheckboxFilter = function CheckboxFilter(_ref) {
     ref: inputRef,
     onSearch: handleFilter,
     onChange: handleFilter
-  }), /*#__PURE__*/_react.default.createElement("div", {
+  }), isAllCheck && /*#__PURE__*/_react.default.createElement("div", {
     className: "filter_header_operate"
   }, /*#__PURE__*/_react.default.createElement(_linkmoreDesign.Checkbox, {
     indeterminate: indeterminate,