linkmore-design 1.1.13 → 1.1.14

package/lib/LmUpload/fns/index.js

@@ -61,16 +61,21 @@ var useCoreOptions = function useCoreOptions(_ref) {
       fileAreaSize = props.fileAreaSize,
       enabledOss = props.enabledOss,
       enableCrop = props.enableCrop,
-      ossConfig = props.ossConfig; // 获取两个对象是否存在指定值相等
+      ossConfig = props.ossConfig;
+  /* 获取两个对象是否存在指定值相等
+   * 取用户定义的列字段，如果读取不到则取'fileName'对比
+   */
 
   var getHasEqual = (0, _react.useCallback)(function (obj1, obj2) {
     var extend = [uid, 'fileName'];
     var flag = false;
     extend.forEach(function (v) {
-      if (!flag) flag = obj1[v] === obj2[v];
+      if (!flag && obj1[v] && obj2[v]) {
+        flag = obj1[v] === obj2[v];
+      }
     });
     return flag;
-  }, []); // 从对象中读取存在的指定属性
+  }, [uid]); // 从对象中读取存在的指定属性
 
   var getFileHasValue = (0, _react.useCallback)(function (obj) {
     var extend = [uid, 'fileName'];

package/lib/Select/index.js

@@ -19,6 +19,8 @@ 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 = {};
 
@@ -37,13 +39,20 @@ var CLMSelect = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
   var children = props.children,
       className = props.className,
       customizeSize = props.size,
+      customDisabled = props.disabled,
       dropdownClassName = props.dropdownClassName,
       options = props.options,
       value = props.value,
       defaultLabel = props.defaultLabel,
-      others = __rest(props, ["children", "className", "size", "dropdownClassName", "options", "value", "defaultLabel"]);
+      rest = __rest(props // ===================== Size =====================
+  , ["children", "className", "size", "disabled", "dropdownClassName", "options", "value", "defaultLabel"]); // ===================== Size =====================
+
+
+  var size = customizeSize || _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; // 当前值是否存于选项中
 
   var hasOption = (0, _react.useMemo)(function () {
     var flag = false;
@@ -80,8 +89,9 @@ var CLMSelect = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
     size: size,
     ref: ref,
     value: resetValue,
-    options: options
-  }, others, {
+    options: options,
+    disabled: mergedDisabled || undefined
+  }, rest, {
     dropdownClassName: (0, _classnames.default)('lm_select_dropdown', dropdownClassName)
   }), children);
 });

package/lib/styles/variables.css

@@ -9001,6 +9001,9 @@ p {
 .lm_container_wrapper .lm_container.responsive.lm_col_5 .ant-form-item-responsive.nth-five {
   margin-right: 0;
 }
+.lm_container_wrapper .lm_container.responsive .ant-cascader {
+  width: 100%;
+}
 .lm_form-item-tip-error .ant-form-item-explain {
   width: 100%;
   position: absolute;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "linkmore-design",
-  "version": "1.1.13",
+  "version": "1.1.14",
   "author": {
     "name": "nowthen",
     "email": "rnlvwyx@gmail.com"