@quansitech/antd-admin 1.1.42 → 1.1.43

package/dist/components/Column/Cascader.js

@@ -23,6 +23,7 @@ import React, { useContext, useEffect, useState } from "react";
 import http from "../../lib/http";
 import { FormContext } from "../FormContext";
 import { TableContext } from "../TableContext";
+import { ItemContext } from "../../lib/FormList";
 export default function (props) {
   var _useState = useState(),
     _useState2 = _slicedToArray(_useState, 2),
@@ -34,6 +35,7 @@ export default function (props) {
     setValues = _useState4[1];
   var formContext = useContext(FormContext);
   var tableContext = useContext(TableContext);
+  var itemContext = useContext(ItemContext);
   var findValue = function findValue(options, value) {
     for (var i = 0; i < options.length; i++) {
       var _option$children;
@@ -50,6 +52,7 @@ export default function (props) {
     return [];
   };
   useEffect(function () {
+    var _props$fieldProps, _props$fieldProps2;
     var value = props.fieldProps.value;
     setOptions(props.fieldProps.options || []);
     if (value && props.fieldProps.options) {
@@ -67,12 +70,22 @@ export default function (props) {
       }
     }
     var extraData;
-    if (formContext.extraRenderValues) {
-      extraData = formContext.extraRenderValues[props.fieldProps['data-field']];
+    if ((_props$fieldProps = props.fieldProps) !== null && _props$fieldProps !== void 0 && _props$fieldProps.extraRenderValue) {
+      extraData = props.fieldProps.extraRenderValue;
     }
-    if (tableContext.extraRenderValues) {
-      var _tableContext$extraRe;
-      extraData = (_tableContext$extraRe = tableContext.extraRenderValues[props.index]) === null || _tableContext$extraRe === void 0 ? void 0 : _tableContext$extraRe[props.fieldProps['data-field']];
+    if ((_props$fieldProps2 = props.fieldProps) !== null && _props$fieldProps2 !== void 0 && _props$fieldProps2.extraRenderValues) {
+      var _props$fieldProps$ext;
+      var index = -1;
+      if (tableContext && tableContext !== null && tableContext !== void 0 && tableContext.dataSource) {
+        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 : [];
     }
     if (extraData) {
       setOptions(extraData.options);
@@ -134,22 +147,22 @@ export default function (props) {
     };
   }();
   var onChange = function onChange(values) {
-    var _props$fieldProps3;
+    var _props$fieldProps5;
     setValues(values);
     if (!(values !== null && values !== void 0 && values.length)) {
-      var _props$fieldProps;
-      (_props$fieldProps = props.fieldProps) === null || _props$fieldProps === void 0 || _props$fieldProps.onChange(props.fieldProps['data-field'], undefined);
+      var _props$fieldProps3;
+      (_props$fieldProps3 = props.fieldProps) === null || _props$fieldProps3 === void 0 || _props$fieldProps3.onChange(props.fieldProps['data-field'], undefined);
       return;
     }
     if (props.fieldProps.multiple) {
-      var _props$fieldProps2;
-      (_props$fieldProps2 = props.fieldProps) === null || _props$fieldProps2 === void 0 || _props$fieldProps2.onChange(values.map(function (v) {
+      var _props$fieldProps4;
+      (_props$fieldProps4 = props.fieldProps) === null || _props$fieldProps4 === void 0 || _props$fieldProps4.onChange(values.map(function (v) {
         return v[v.length - 1];
       }));
       return;
     }
     var value = values[values.length - 1];
-    (_props$fieldProps3 = props.fieldProps) === null || _props$fieldProps3 === void 0 || _props$fieldProps3.onChange(value);
+    (_props$fieldProps5 = props.fieldProps) === null || _props$fieldProps5 === void 0 || _props$fieldProps5.onChange(value);
   };
   var fieldProps = _objectSpread({}, props.fieldProps);
   delete fieldProps.loadDataUrl;

package/dist/components/Column/File.js

@@ -22,6 +22,7 @@ import { arrayMove, SortableContext, useSortable, verticalListSortingStrategy }
 import { CSS } from '@dnd-kit/utilities';
 import { FormContext } from "../FormContext";
 import { TableContext } from "../TableContext";
+import { ItemContext } from "../../lib/FormList";
 var DraggableUploadListItem = function DraggableUploadListItem(_ref) {
   var originNode = _ref.originNode,
     file = _ref.file;
@@ -49,7 +50,7 @@ var DraggableUploadListItem = function DraggableUploadListItem(_ref) {
   }, attributes, listeners), file.status === 'error' && isDragging ? originNode.props.children : originNode);
 };
 export default function (props) {
-  var _props$fieldProps2, _props$fieldProps3, _props$fieldProps4, _props$fieldProps5;
+  var _props$fieldProps4, _props$fieldProps5, _props$fieldProps6, _props$fieldProps7;
   var _useState = useState(true),
     _useState2 = _slicedToArray(_useState, 2),
     loading = _useState2[0],
@@ -60,6 +61,7 @@ export default function (props) {
     setFileList = _useState4[1];
   var formContext = useContext(FormContext);
   var tableContext = useContext(TableContext);
+  var itemContext = useContext(ItemContext);
   var handlePreview = /*#__PURE__*/function () {
     var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(file) {
       return _regeneratorRuntime().wrap(function _callee$(_context) {
@@ -90,20 +92,32 @@ export default function (props) {
       }
       return file;
     });
-    (_props$fieldProps = props.fieldProps) === null || _props$fieldProps === void 0 || _props$fieldProps.onChange(values);
+    (_props$fieldProps = props.fieldProps) === null || _props$fieldProps === void 0 || _props$fieldProps.onChange(values.filter(function (file) {
+      return file.status === 'done';
+    }).map(function (file) {
+      var _file$response;
+      return (_file$response = file.response) === null || _file$response === void 0 ? void 0 : _file$response.file_id;
+    }).join(','));
   }, [fileList]);
   useEffect(function () {
+    var _props$fieldProps2, _props$fieldProps3;
     var extraRenderValue = [];
-    if (formContext && formContext.extraRenderValues) {
-      var _formContext$extraRen;
-      extraRenderValue = (_formContext$extraRen = formContext.extraRenderValues[props.fieldProps['data-field']]) !== null && _formContext$extraRen !== void 0 ? _formContext$extraRen : [];
-    } else if (tableContext && tableContext.extraRenderValues) {
-      var _tableContext$extraRe, _tableContext$extraRe2;
-      var key = tableContext.getTableProps().rowKey;
-      var index = tableContext.dataSource.findIndex(function (item) {
-        return item[key] === props.record[key];
-      });
-      extraRenderValue = (_tableContext$extraRe = (_tableContext$extraRe2 = tableContext.extraRenderValues[index]) === null || _tableContext$extraRe2 === void 0 ? void 0 : _tableContext$extraRe2[props.fieldProps['data-field']]) !== null && _tableContext$extraRe !== void 0 ? _tableContext$extraRe : [];
+    if ((_props$fieldProps2 = props.fieldProps) !== null && _props$fieldProps2 !== void 0 && _props$fieldProps2.extraRenderValue) {
+      extraRenderValue = props.fieldProps.extraRenderValue;
+    }
+    if ((_props$fieldProps3 = props.fieldProps) !== null && _props$fieldProps3 !== void 0 && _props$fieldProps3.extraRenderValues) {
+      var _props$fieldProps$ext;
+      var index = -1;
+      if (tableContext && tableContext !== null && tableContext !== void 0 && tableContext.dataSource) {
+        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;
+      }
+      extraRenderValue = (_props$fieldProps$ext = props.fieldProps.extraRenderValues[index]) !== null && _props$fieldProps$ext !== void 0 ? _props$fieldProps$ext : [];
     }
     if (!extraRenderValue.length) {
       setLoading(false);
@@ -125,9 +139,9 @@ export default function (props) {
     setLoading(false);
   }, []);
   var uploadButton = /*#__PURE__*/React.createElement(Tooltip, {
-    title: fileList.length >= (((_props$fieldProps2 = props.fieldProps) === null || _props$fieldProps2 === void 0 ? void 0 : _props$fieldProps2.maxCount) || 1) ? '最多只能上传' + (((_props$fieldProps3 = props.fieldProps) === null || _props$fieldProps3 === void 0 ? void 0 : _props$fieldProps3.maxCount) || 1) + '个文件' : ''
+    title: fileList.length >= (((_props$fieldProps4 = props.fieldProps) === null || _props$fieldProps4 === void 0 ? void 0 : _props$fieldProps4.maxCount) || 1) ? '最多只能上传' + (((_props$fieldProps5 = props.fieldProps) === null || _props$fieldProps5 === void 0 ? void 0 : _props$fieldProps5.maxCount) || 1) + '个文件' : ''
   }, /*#__PURE__*/React.createElement(Button, {
-    disabled: fileList.length >= (((_props$fieldProps4 = props.fieldProps) === null || _props$fieldProps4 === void 0 ? void 0 : _props$fieldProps4.maxCount) || 1)
+    disabled: fileList.length >= (((_props$fieldProps6 = props.fieldProps) === null || _props$fieldProps6 === void 0 ? void 0 : _props$fieldProps6.maxCount) || 1)
   }, "\u4E0A\u4F20\u6587\u4EF6"));
   var sensor = useSensor(PointerSensor, {
     activationConstraint: {
@@ -171,7 +185,7 @@ export default function (props) {
     },
     customRequest: customRequest
   }), props.uploadButton ? props.uploadButton(fileList) : uploadButton);
-  return /*#__PURE__*/React.createElement(React.Fragment, null, (_props$fieldProps5 = props.fieldProps) !== null && _props$fieldProps5 !== void 0 && _props$fieldProps5.uploadRequest ? /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(Spin, {
+  return /*#__PURE__*/React.createElement(React.Fragment, null, (_props$fieldProps7 = props.fieldProps) !== null && _props$fieldProps7 !== void 0 && _props$fieldProps7.uploadRequest ? /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(Spin, {
     spinning: loading
   }, /*#__PURE__*/React.createElement(DndContext, {
     sensors: [sensor],

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

@@ -12,6 +12,7 @@ import React, { useContext, useEffect, useState } from "react";
 import http from "../../../lib/http";
 import { FormContext } from "../../FormContext";
 import { TableContext } from "../../TableContext";
+import { ItemContext } from "../../../lib/FormList";
 export default function (props) {
   var _useState = useState('-'),
     _useState2 = _slicedToArray(_useState, 2),
@@ -19,6 +20,7 @@ export default function (props) {
     setText = _useState2[1];
   var formContext = useContext(FormContext);
   var tableContext = useContext(TableContext);
+  var itemContext = useContext(ItemContext || null);
   var findValue = function findValue(options, value) {
     for (var i = 0; i < options.length; i++) {
       var option = options[i];
@@ -30,20 +32,26 @@ export default function (props) {
     }
   };
   useEffect(function () {
-    var _props$fieldProps;
+    var _props$fieldProps, _props$fieldProps2, _props$fieldProps3;
     setText(props.fieldProps.value);
     var value = props.fieldProps.value;
     var extraData;
-    if (formContext.extraRenderValues) {
-      extraData = formContext.extraRenderValues[props.fieldProps['data-field']];
+    if ((_props$fieldProps = props.fieldProps) !== null && _props$fieldProps !== void 0 && _props$fieldProps.extraRenderValue) {
+      extraData = props.fieldProps.extraRenderValue;
     }
-    if (tableContext.extraRenderValues) {
-      var _tableContext$extraRe;
-      var key = tableContext.getTableProps().rowKey;
-      var index = tableContext.dataSource.findIndex(function (item) {
-        return item[key] === props.record[key];
-      });
-      extraData = (_tableContext$extraRe = tableContext.extraRenderValues[index]) === null || _tableContext$extraRe === void 0 ? void 0 : _tableContext$extraRe[props.fieldProps['data-field']];
+    if ((_props$fieldProps2 = props.fieldProps) !== null && _props$fieldProps2 !== void 0 && _props$fieldProps2.extraRenderValues) {
+      var _props$fieldProps$ext;
+      var index = -1;
+      if (tableContext && tableContext !== null && tableContext !== void 0 && tableContext.dataSource) {
+        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 : [];
     }
     if (extraData) {
       setText(findValue(extraData.options, value).join(' / '));
@@ -51,7 +59,7 @@ export default function (props) {
     }
 
     // 远程获取数据
-    if (!((_props$fieldProps = props.fieldProps) !== null && _props$fieldProps !== void 0 && _props$fieldProps.loadDataUrl)) {
+    if (!((_props$fieldProps3 = props.fieldProps) !== null && _props$fieldProps3 !== void 0 && _props$fieldProps3.loadDataUrl)) {
       return;
     }
     http({

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

@@ -8,6 +8,7 @@ import { Spin, Upload } from "antd";
 import React, { useContext, useEffect, useState } from "react";
 import { FormContext } from "../../FormContext";
 import { TableContext } from "../../TableContext";
+import { ItemContext } from "../../../lib/FormList";
 export default function (props) {
   var _useState = useState(true),
     _useState2 = _slicedToArray(_useState, 2),
@@ -19,18 +20,26 @@ export default function (props) {
     setFileList = _useState4[1];
   var formContext = useContext(FormContext);
   var tableContext = useContext(TableContext);
+  var itemContext = useContext(ItemContext);
   useEffect(function () {
+    var _props$fieldProps, _props$fieldProps2;
     var extraRenderValue = [];
-    if (formContext && formContext.extraRenderValues) {
-      var _formContext$extraRen;
-      extraRenderValue = (_formContext$extraRen = formContext.extraRenderValues[props.fieldProps['data-field']]) !== null && _formContext$extraRen !== void 0 ? _formContext$extraRen : [];
-    } else if (tableContext && tableContext.extraRenderValues) {
-      var _tableContext$extraRe, _tableContext$extraRe2;
-      var key = tableContext.getTableProps().rowKey;
-      var index = tableContext.dataSource.findIndex(function (item) {
-        return item[key] === props.record[key];
-      });
-      extraRenderValue = (_tableContext$extraRe = (_tableContext$extraRe2 = tableContext.extraRenderValues[index]) === null || _tableContext$extraRe2 === void 0 ? void 0 : _tableContext$extraRe2[props.fieldProps['data-field']]) !== null && _tableContext$extraRe !== void 0 ? _tableContext$extraRe : [];
+    if ((_props$fieldProps = props.fieldProps) !== null && _props$fieldProps !== void 0 && _props$fieldProps.extraRenderValue) {
+      extraRenderValue = props.fieldProps.extraRenderValue;
+    }
+    if ((_props$fieldProps2 = props.fieldProps) !== null && _props$fieldProps2 !== void 0 && _props$fieldProps2.extraRenderValues) {
+      var _props$fieldProps$ext;
+      var index = -1;
+      if (tableContext && tableContext !== null && tableContext !== void 0 && tableContext.dataSource) {
+        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;
+      }
+      extraRenderValue = (_props$fieldProps$ext = props.fieldProps.extraRenderValues[index]) !== null && _props$fieldProps$ext !== void 0 ? _props$fieldProps$ext : [];
     }
     setFileList(extraRenderValue.map(function (item) {
       return {

package/dist/components/Form.scss

@@ -1,15 +1,19 @@
 .qs-form-container {
-  .qs-form-list-form_list {
-    .ant-pro-form-list-item {
-      border: 1px dashed #cccccc;
-      margin-top: 10px;
-      border-radius: 5px;
-      padding: 10px;
-
+  .qs-form-list-item{
+    display: flex;
+    border: 1px dashed #cccccc;
+    margin-top: 10px;
+    border-radius: 5px;
+    padding: 10px;
+    align-items: flex-end;
+    .dom{
+      flex: 1;
       .ant-pro-form-list-container {
         display: flex;
         flex-wrap: wrap;
       }
     }
+    .action{
+    }
   }
 }

package/dist/components/Table.js

@@ -33,7 +33,7 @@ import { TabsContext } from "./TabsContext";
 export default function (props) {
   var request = /*#__PURE__*/function () {
     var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(params, sort, filter) {
-      var data, res;
+      var data, res, _props;
       return _regeneratorRuntime().wrap(function _callee$(_context) {
         while (1) switch (_context.prev = _context.next) {
           case 0:
@@ -87,28 +87,26 @@ export default function (props) {
             });
           case 11:
             res = _context.sent;
-            if (res.data.pagination) {
-              setPagination(_objectSpread(_objectSpread({}, res.data.pagination), {}, {
-                current: params.current
-              }));
-            }
-            if (res.data.extraRenderValues) {
-              setExtraRenderValues(res.data.extraRenderValues);
-            }
+            _props = res.data;
+            setToolActions(_props.actions);
+            setColumns(_props.columns);
             setLastQuery(data);
+            setDataSource(postData(_props.dataSource));
+            setExtraRenderValues(_props.extraRenderValues);
+            setPagination(_props.pagination);
             return _context.abrupt("return", {
               data: res.data.dataSource || [],
               success: true
             });
-          case 16:
-            _context.prev = 16;
+          case 20:
+            _context.prev = 20;
             setLoading(false);
-            return _context.finish(16);
-          case 19:
+            return _context.finish(20);
+          case 23:
           case "end":
             return _context.stop();
         }
-      }, _callee, null, [[8,, 16, 19]]);
+      }, _callee, null, [[8,, 20, 23]]);
     }));
     return function request(_x, _x2, _x3) {
       return _ref.apply(this, arguments);

package/dist/lib/FormList/index.d.ts

@@ -0,0 +1,5 @@
+import React from 'react';
+export declare const ItemContext: React.Context<{
+    index?: number;
+}>;
+export declare function itemRender(doms: any, listMeta: any): React.JSX.Element;

package/dist/lib/FormList/index.js

@@ -0,0 +1,15 @@
+import React from 'react';
+export var ItemContext = /*#__PURE__*/React.createContext({});
+export function itemRender(doms, listMeta) {
+  return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(ItemContext.Provider, {
+    value: {
+      index: listMeta.index
+    }
+  }, /*#__PURE__*/React.createElement("div", {
+    className: "qs-form-list-item"
+  }, /*#__PURE__*/React.createElement("div", {
+    className: "dom"
+  }, doms.listDom), /*#__PURE__*/React.createElement("div", {
+    className: "action"
+  }, doms.action))));
+}

package/dist/lib/schemaHandler.js

@@ -10,6 +10,7 @@ function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e
 import http from "./http";
 import { deepSet, handleCondition } from "./helpers";
 import container from "./container";
+import { itemRender } from "./FormList";
 var uploadValidator = function uploadValidator(_, value) {
   return new Promise(function (resolve, reject) {
     if (!value) {
@@ -29,17 +30,6 @@ var uploadValidator = function uploadValidator(_, value) {
     resolve(true);
   });
 };
-var uploadTransform = function uploadTransform(value, _name) {
-  if (value instanceof Array) {
-    return value.filter(function (file) {
-      return file.status === 'done';
-    }).map(function (file) {
-      var _file$response;
-      return (_file$response = file.response) === null || _file$response === void 0 ? void 0 : _file$response.file_id;
-    }).join(',');
-  }
-  return value;
-};
 export var commonHandler = function commonHandler(schema) {
   if (schema.valueEnum) {
     var _schema$valueEnum;
@@ -94,17 +84,13 @@ export var schemaHandler = {
     schema.formItemProps.rules.push({
       validator: uploadValidator
     });
-    return _objectSpread(_objectSpread({}, schema), {}, {
-      transform: uploadTransform
-    });
+    return _objectSpread({}, schema);
   },
   file: function file(schema) {
     schema.formItemProps.rules.push({
       validator: uploadValidator
     });
-    return _objectSpread(_objectSpread({}, schema), {}, {
-      transform: uploadTransform
-    });
+    return _objectSpread({}, schema);
   },
   action: function action(schema) {
     schema.fieldProps = {
@@ -221,12 +207,12 @@ export var schemaHandler = {
       return c;
     });
     deepSet(schema, 'fieldProps.className', "qs-form-list-".concat(schema.mode));
+    deepSet(schema, 'fieldProps.itemRender', itemRender);
     switch (schema.mode) {
       case 'form_list':
         deepSet(schema, 'fieldProps.alwaysShowItemLabel', true);
         break;
     }
-    console.log(schema);
     return schema;
   }
 };

package/package.json

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