ronds-metadata 1.1.55 → 1.1.57

package/es/comps/MetadataForm/DataCell/Select.js

@@ -22,7 +22,7 @@ import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
 /*
  * @Author:wangxian
  * @Date: 2021-09-18 14:15:04
- * @LastEditTime: 2022-10-09 18:29:47
+ * @LastEditTime: 2022-11-09 15:59:15
  */
 import React from 'react';
 import { MetadataFormContext, MetadataRefContext } from '../interface';
@@ -74,7 +74,7 @@ function Index(props) {
             case 0:
               server = new MetadataService();
               _url = pid || pid === '' ? http.url.replace('{pid}', pid) : http.url;
-              _url = page ? http.url.replace('{page}', page) : http.url;
+              _url = page ? http.url.replace('{page}', page) : _url;
               _context.next = 5;
               return server.GetEnumDataByUrl(_url);
 
@@ -225,19 +225,22 @@ function Index(props) {
 
   var processSelectType = function processSelectType(isCascader, isPagination) {
     if (isCascader) {
+      var _extraInfo$disabled;
+
       return /*#__PURE__*/React.createElement(_Cascader, {
         multiple: extraInfo === null || extraInfo === void 0 ? void 0 : extraInfo.isMutiple,
+        disabled: (_extraInfo$disabled = extraInfo === null || extraInfo === void 0 ? void 0 : extraInfo.disabled) !== null && _extraInfo$disabled !== void 0 ? _extraInfo$disabled : disabled,
         options: cascaderOption,
         loadData: loadData,
         maxTagCount: 10
       });
     } else if (isPagination) {
-      var _extraInfo$disabled;
+      var _extraInfo$disabled2;
 
       return /*#__PURE__*/React.createElement(_Select, {
         mode: (extraInfo === null || extraInfo === void 0 ? void 0 : extraInfo.isMutiple) ? 'multiple' : extraInfo === null || extraInfo === void 0 ? void 0 : extraInfo.mode,
         onSelect: onSelect,
-        disabled: (_extraInfo$disabled = extraInfo === null || extraInfo === void 0 ? void 0 : extraInfo.disabled) !== null && _extraInfo$disabled !== void 0 ? _extraInfo$disabled : disabled,
+        disabled: (_extraInfo$disabled2 = extraInfo === null || extraInfo === void 0 ? void 0 : extraInfo.disabled) !== null && _extraInfo$disabled2 !== void 0 ? _extraInfo$disabled2 : disabled,
         placeholder: extraInfo === null || extraInfo === void 0 ? void 0 : extraInfo.placeholder,
         options: httpOptions && httpOptions.length > 0 ? httpOptions : options,
         dropdownRender: function dropdownRender(menu) {
@@ -268,12 +271,12 @@ function Index(props) {
         allowClear: true
       });
     } else {
-      var _extraInfo$disabled2;
+      var _extraInfo$disabled3;
 
       return /*#__PURE__*/React.createElement(_Select, {
         mode: (extraInfo === null || extraInfo === void 0 ? void 0 : extraInfo.isMutiple) ? 'multiple' : extraInfo === null || extraInfo === void 0 ? void 0 : extraInfo.mode,
         onSelect: onSelect,
-        disabled: (_extraInfo$disabled2 = extraInfo === null || extraInfo === void 0 ? void 0 : extraInfo.disabled) !== null && _extraInfo$disabled2 !== void 0 ? _extraInfo$disabled2 : disabled,
+        disabled: (_extraInfo$disabled3 = extraInfo === null || extraInfo === void 0 ? void 0 : extraInfo.disabled) !== null && _extraInfo$disabled3 !== void 0 ? _extraInfo$disabled3 : disabled,
         placeholder: extraInfo === null || extraInfo === void 0 ? void 0 : extraInfo.placeholder,
         options: httpOptions && httpOptions.length > 0 ? httpOptions : options,
         showSearch: true,

package/package.json

@@ -1,7 +1,7 @@
 {
   "public": true,
   "name": "ronds-metadata",
-  "version": "1.1.55",
+  "version": "1.1.57",
   "scripts": {
     "start": "dumi dev",
     "docs:build": "dumi build",