@quansitech/antd-admin 1.2.7 → 1.2.9

package/dist/components/Column/Cascader.js

@@ -37,10 +37,13 @@ export default function (props) {
   var tableContext = useContext(TableContext);
   var itemContext = useContext(ItemContext);
   var findValue = function findValue(options, value) {
+    if (!value) {
+      return [];
+    }
     for (var i = 0; i < options.length; i++) {
       var _option$children;
       var option = options[i];
-      if (option.value === value) {
+      if (option.value == value) {
         return [option.value];
       }
       if ((_option$children = option.children) !== null && _option$children !== void 0 && _option$children.length) {
@@ -70,28 +73,32 @@ export default function (props) {
       }
     }
     var extraData;
-    if ((_props$fieldProps = props.fieldProps) !== null && _props$fieldProps !== void 0 && _props$fieldProps.extraRenderValue) {
+    // 表单
+    if (formContext && (_props$fieldProps = props.fieldProps) !== null && _props$fieldProps !== void 0 && _props$fieldProps.extraRenderValue) {
       extraData = props.fieldProps.extraRenderValue;
     }
-    if ((_props$fieldProps2 = props.fieldProps) !== null && _props$fieldProps2 !== void 0 && _props$fieldProps2.extraRenderValues) {
+    // 表格行数据
+    if (tableContext && (_props$fieldProps2 = props.fieldProps) !== null && _props$fieldProps2 !== void 0 && _props$fieldProps2.extraRenderValues && props.record) {
       var _props$fieldProps$ext;
       var index = -1;
-      if (tableContext && tableContext !== null && tableContext !== void 0 && tableContext.dataSource && props.record) {
+      if (tableContext !== null && tableContext !== void 0 && tableContext.dataSource && props.record) {
         var key = tableContext.getTableProps().rowKey;
         index = tableContext.dataSource.findIndex(function (item) {
           return item[key] === props.record[key];
         });
       }
-      if (itemContext && (itemContext === null || itemContext === void 0 ? void 0 : itemContext.index) !== undefined) {
-        index = itemContext.index;
-      }
-      extraData = (_props$fieldProps$ext = props.fieldProps.extraRenderValues[index]) !== null && _props$fieldProps$ext !== void 0 ? _props$fieldProps$ext : [];
+      extraData = (_props$fieldProps$ext = props.fieldProps.extraRenderValues[index]) !== null && _props$fieldProps$ext !== void 0 ? _props$fieldProps$ext : {};
     }
-    if (extraData) {
+    // 表单列表
+    if (itemContext && (itemContext === null || itemContext === void 0 ? void 0 : itemContext.index) !== undefined) {
+      var _props$fieldProps$ext2;
+      var _index = -1;
+      _index = itemContext.index;
+      extraData = (_props$fieldProps$ext2 = props.fieldProps.extraRenderValues[_index]) !== null && _props$fieldProps$ext2 !== void 0 ? _props$fieldProps$ext2 : {};
+    }
+    if (extraData && value) {
       setOptions(extraData.options);
-      if (value) {
-        setValues(findValue(extraData.options, value));
-      }
+      setValues(findValue(extraData.options, value));
       return;
     }
 

package/dist/components/Column/Readonly/Cascader.js

@@ -24,7 +24,7 @@ export default function (props) {
   var findValue = function findValue(options, value) {
     for (var i = 0; i < options.length; i++) {
       var option = options[i];
-      if (option.value === value) {
+      if (option.value == value) {
         return [option.label];
       } else if (option.children) {
         return [option.label].concat(_toConsumableArray(findValue(option.children, value)));
@@ -33,8 +33,8 @@ export default function (props) {
   };
   useEffect(function () {
     var _props$fieldProps, _props$fieldProps2, _props$fieldProps3;
-    setText(props.fieldProps.value);
-    var value = props.fieldProps.value;
+    setText(props.text);
+    var value = props.text;
     var extraData;
     if ((_props$fieldProps = props.fieldProps) !== null && _props$fieldProps !== void 0 && _props$fieldProps.extraRenderValue) {
       extraData = props.fieldProps.extraRenderValue;
@@ -53,7 +53,7 @@ export default function (props) {
       }
       extraData = (_props$fieldProps$ext = props.fieldProps.extraRenderValues[index]) !== null && _props$fieldProps$ext !== void 0 ? _props$fieldProps$ext : [];
     }
-    if (extraData) {
+    if (extraData && value && value != '-') {
       setText(findValue(extraData.options, value).join(' / '));
       return;
     }

package/dist/components/Table.js

@@ -201,6 +201,14 @@ export default function (props) {
     _useState24 = _slicedToArray(_useState23, 2),
     columns = _useState24[0],
     setColumns = _useState24[1];
+  var _useState25 = useState(false),
+    _useState26 = _slicedToArray(_useState25, 2),
+    inited = _useState26[0],
+    setInited = _useState26[1];
+  var _useState27 = useState(props.defaultSearchValue || {}),
+    _useState28 = _slicedToArray(_useState27, 2),
+    initialValues = _useState28[0],
+    setInitialValues = _useState28[1];
   var realColumns = useMemo(function () {
     var _cloneDeep;
     var processedColumns = [];
@@ -321,15 +329,17 @@ export default function (props) {
         handleSearchRangeValue(query);
         handleSearchArrayKey(query);
         (_formRef$current2 = formRef.current) === null || _formRef$current2 === void 0 || _formRef$current2.setFieldsValue(query);
+        setInitialValues(query);
         setLastQuery(query);
       }
     }
+    setInited(true);
   }, []);
   return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement("div", {
     dangerouslySetInnerHTML: {
       __html: props.description
     }
-  }), /*#__PURE__*/React.createElement(TableContext.Provider, {
+  }), inited ? /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(TableContext.Provider, {
     value: {
       getTableProps: function getTableProps() {
         return props;
@@ -370,7 +380,7 @@ export default function (props) {
       reload: true
     },
     form: {
-      initialValues: props.defaultSearchValue,
+      initialValues: initialValues,
       onValuesChange: function onValuesChange(changedValues, allValues) {
         var _formRef$current3;
         var submit = realColumns.filter(function (c) {
@@ -448,5 +458,5 @@ export default function (props) {
     actionRef: actionRef,
     search: props.search,
     dateFormatter: props.dateFormatter
-  })));
+  }))) : /*#__PURE__*/React.createElement(React.Fragment, null));
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@quansitech/antd-admin",
-  "version": "1.2.7",
+  "version": "1.2.9",
   "type": "module",
   "files": [
     "dist"