@luck-design-biz/luckda 0.0.21 → 0.0.22-2

package/lib/components/LdTree/index.js

@@ -16,7 +16,7 @@ var _lodash = require("lodash");
 var _ahooks = require("ahooks");
 var _propTypes = _interopRequireDefault(require("prop-types"));
 var _classnames = _interopRequireDefault(require("classnames"));
-var _antd = require("antd");
+var _antd = require("luck-design/antd");
 var _luckDesign = require("luck-design");
 var _utils = require("@luck-design-biz/base/utils");
 var _base = require("@luck-design-biz/base");
@@ -233,7 +233,6 @@ Index.propTypes = {
   // 抑制初始化
   afterInit: _propTypes.default.func // 初始化后
 };
-
 Index.defaultProps = {
   readOnly: false,
   title: false,
@@ -249,9 +248,8 @@ Index.defaultProps = {
   suppressInit: false,
   defaultParmas: {}
 };
-var _default = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
+var _default = exports.default = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
   return /*#__PURE__*/_react.default.createElement(Index, (0, _extends2.default)({
     wrapperRef: ref
   }, props));
-});
-exports.default = _default;
+});

package/lib/helper/FromItems.js

@@ -40,7 +40,7 @@ var _excluded = ["onBlur"],
   _excluded22 = ["handleValueChange", "config"],
   _excluded23 = ["onBlur"],
   _excluded24 = ["handleValueChange", "config"];
-var getNumberItem = function getNumberItem() {
+var getNumberItem = exports.getNumberItem = function getNumberItem() {
   var _ref = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {},
     handleValueChange = _ref.handleValueChange,
     _ref$config = _ref.config,
@@ -59,8 +59,7 @@ var getNumberItem = function getNumberItem() {
     })
   }));
 };
-exports.getNumberItem = getNumberItem;
-var getStringItem = function getStringItem(_ref2) {
+var getStringItem = exports.getStringItem = function getStringItem(_ref2) {
   var handleValueChange = _ref2.handleValueChange,
     _ref2$config = _ref2.config,
     _ref2$config2 = _ref2$config === void 0 ? {} : _ref2$config,
@@ -77,8 +76,7 @@ var getStringItem = function getStringItem(_ref2) {
     type: "input"
   }));
 };
-exports.getStringItem = getStringItem;
-var getTextareaItem = function getTextareaItem() {
+var getTextareaItem = exports.getTextareaItem = function getTextareaItem() {
   var _ref3 = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {},
     handleValueChange = _ref3.handleValueChange,
     _ref3$config = _ref3.config,
@@ -97,8 +95,7 @@ var getTextareaItem = function getTextareaItem() {
     })
   }));
 };
-exports.getTextareaItem = getTextareaItem;
-var getDateItem = function getDateItem() {
+var getDateItem = exports.getDateItem = function getDateItem() {
   var _ref4 = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {},
     handleValueChange = _ref4.handleValueChange,
     _ref4$config = _ref4.config,
@@ -117,8 +114,7 @@ var getDateItem = function getDateItem() {
     })
   }));
 };
-exports.getDateItem = getDateItem;
-var getUserItem = function getUserItem(_ref5) {
+var getUserItem = exports.getUserItem = function getUserItem(_ref5) {
   var handleValueChange = _ref5.handleValueChange,
     _onChange2 = _ref5.onChange,
     props = (0, _objectWithoutProperties2.default)(_ref5, _excluded9);
@@ -129,8 +125,7 @@ var getUserItem = function getUserItem(_ref5) {
     }
   }));
 };
-exports.getUserItem = getUserItem;
-var getSelectItem = function getSelectItem(_ref6) {
+var getSelectItem = exports.getSelectItem = function getSelectItem(_ref6) {
   var handleValueChange = _ref6.handleValueChange,
     _ref6$config = _ref6.config,
     _ref6$config2 = _ref6$config === void 0 ? {} : _ref6$config,
@@ -154,7 +149,6 @@ var getSelectItem = function getSelectItem(_ref6) {
     config: config
   }));
 };
-exports.getSelectItem = getSelectItem;
 var DictRadioItem = function DictRadioItem(_ref7) {
   var renderInfoMode = _ref7.renderInfoMode,
     props = (0, _objectWithoutProperties2.default)(_ref7, _excluded12);
@@ -188,7 +182,7 @@ var DictRadioItem = function DictRadioItem(_ref7) {
   }));
 };
 DictRadioItem.displayName = 'BasicFormItem';
-var getRadioItem = function getRadioItem() {
+var getRadioItem = exports.getRadioItem = function getRadioItem() {
   var props = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
   if (props.alias) {
     return /*#__PURE__*/_react.default.createElement(DictRadioItem, props);
@@ -197,8 +191,7 @@ var getRadioItem = function getRadioItem() {
     type: "radio"
   }));
 };
-exports.getRadioItem = getRadioItem;
-var getGroupItem = function getGroupItem(_ref8) {
+var getGroupItem = exports.getGroupItem = function getGroupItem(_ref8) {
   var handleValueChange = _ref8.handleValueChange,
     _ref8$config = _ref8.config,
     _ref8$config2 = _ref8$config === void 0 ? {} : _ref8$config,
@@ -215,8 +208,7 @@ var getGroupItem = function getGroupItem(_ref8) {
     })
   }));
 };
-exports.getGroupItem = getGroupItem;
-var getColorItem = function getColorItem(_ref9) {
+var getColorItem = exports.getColorItem = function getColorItem(_ref9) {
   var handleValueChange = _ref9.handleValueChange,
     _ref9$config = _ref9.config,
     _ref9$config2 = _ref9$config === void 0 ? {} : _ref9$config,
@@ -237,8 +229,7 @@ var getColorItem = function getColorItem(_ref9) {
     })
   }));
 };
-exports.getColorItem = getColorItem;
-var getSwitchItem = function getSwitchItem(_ref10) {
+var getSwitchItem = exports.getSwitchItem = function getSwitchItem(_ref10) {
   var handleValueChange = _ref10.handleValueChange,
     _ref10$config = _ref10.config,
     _ref10$config2 = _ref10$config === void 0 ? {} : _ref10$config,
@@ -255,8 +246,7 @@ var getSwitchItem = function getSwitchItem(_ref10) {
     })
   }));
 };
-exports.getSwitchItem = getSwitchItem;
-var getRegionItem = function getRegionItem(_ref11) {
+var getRegionItem = exports.getRegionItem = function getRegionItem(_ref11) {
   var handleValueChange = _ref11.handleValueChange,
     props = (0, _objectWithoutProperties2.default)(_ref11, _excluded19);
   return /*#__PURE__*/_react.default.createElement(_base.RegionFormItem, (0, _extends2.default)({}, props, {
@@ -271,8 +261,7 @@ var getRegionItem = function getRegionItem(_ref11) {
     })
   }));
 };
-exports.getRegionItem = getRegionItem;
-var getYearItem = function getYearItem() {
+var getYearItem = exports.getYearItem = function getYearItem() {
   var _ref12 = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {},
     handleValueChange = _ref12.handleValueChange,
     _ref12$config = _ref12.config,
@@ -289,8 +278,7 @@ var getYearItem = function getYearItem() {
     })
   }));
 };
-exports.getYearItem = getYearItem;
-var getEditorItem = function getEditorItem() {
+var getEditorItem = exports.getEditorItem = function getEditorItem() {
   var _ref13 = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {},
     handleValueChange = _ref13.handleValueChange,
     _ref13$config = _ref13.config,
@@ -313,8 +301,7 @@ var getEditorItem = function getEditorItem() {
     })
   }));
 };
-exports.getEditorItem = getEditorItem;
-var getUploadItem = function getUploadItem() {
+var getUploadItem = exports.getUploadItem = function getUploadItem() {
   var _ref14 = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {},
     handleValueChange = _ref14.handleValueChange,
     _ref14$config = _ref14.config,
@@ -332,5 +319,4 @@ var getUploadItem = function getUploadItem() {
       }
     })
   })));
-};
-exports.getUploadItem = getUploadItem;
+};

package/lib/helper/action.js

@@ -7,7 +7,7 @@ Object.defineProperty(exports, "__esModule", {
 exports.onBatchSubmitAction = exports.doAction = void 0;
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _objectSpread4 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
-var _antd = require("antd");
+var _antd = require("luck-design/antd");
 var _utils = require("@luck-design-biz/base/utils");
 var _lodash = require("lodash");
 var _utils2 = require("../utils");
@@ -21,7 +21,7 @@ var _form = require("./form");
  * @param parmas 附件设置
  * @param moduleData 当前模块信息
  */
-var doAction = function doAction(action) {
+var doAction = exports.doAction = function doAction(action) {
   var data = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
   var _ref = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : {},
     _ref$showConfirm = _ref.showConfirm,
@@ -97,8 +97,7 @@ var doAction = function doAction(action) {
     (0, _utils.showPop)(errorMsg);
   }
 };
-exports.doAction = doAction;
-var onBatchSubmitAction = function onBatchSubmitAction(_ref3, callback) {
+var onBatchSubmitAction = exports.onBatchSubmitAction = function onBatchSubmitAction(_ref3, callback) {
   var values = _ref3.values,
     _ref3$formList = _ref3.formList,
     formList = _ref3$formList === void 0 ? [] : _ref3$formList,
@@ -190,5 +189,4 @@ var onBatchSubmitAction = function onBatchSubmitAction(_ref3, callback) {
       });
     }
   });
-};
-exports.onBatchSubmitAction = onBatchSubmitAction;
+};

package/lib/helper/form.js

@@ -14,7 +14,7 @@ var _lodash = require("lodash");
 var _utils = require("@luck-design-biz/base/utils");
 var _excluded = ["extra"];
 // 属性类型=》控件
-var defaultComName = {
+var defaultComName = exports.defaultComName = {
   number: 'number',
   money: 'number',
   decimal: 'number',
@@ -40,8 +40,7 @@ var defaultComName = {
  * @param {label string} labelStr
  * @returns [{key,label}]
  */
-exports.defaultComName = defaultComName;
-var splitStrToObj = function splitStrToObj(keyStr, labelStr) {
+var splitStrToObj = exports.splitStrToObj = function splitStrToObj(keyStr, labelStr) {
   var keys = keyStr && keyStr.length > 0 ? keyStr.split(',') : undefined;
   if (keys) {
     var labels = labelStr && labelStr.length > 0 ? labelStr.split(',') : undefined;
@@ -62,7 +61,6 @@ var splitStrToObj = function splitStrToObj(keyStr, labelStr) {
  * @param {自定义动态表单配置项} customProps
  * @returns {name: '',...}
  */
-exports.splitStrToObj = splitStrToObj;
 function translator() {
   var _ref = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {},
     extra = _ref.extra,
@@ -108,8 +106,8 @@ function translator() {
  */
 function formatCustomProps(props) {
   var _props$confiig;
-  if (props === null || props === void 0 ? void 0 : props.multiple) delete props.multiple;
-  if (props === null || props === void 0 ? void 0 : (_props$confiig = props.confiig) === null || _props$confiig === void 0 ? void 0 : _props$confiig.mode) delete props.confiig.mode;
+  if (props !== null && props !== void 0 && props.multiple) delete props.multiple;
+  if (props !== null && props !== void 0 && (_props$confiig = props.confiig) !== null && _props$confiig !== void 0 && _props$confiig.mode) delete props.confiig.mode;
   // alias、sclassKey?
   return props;
 }

package/lib/helper/ldBuilder.js

@@ -52,5 +52,4 @@ var builder = function builder(wrapped) {
   };
   return LdCom;
 };
-var _default = builder;
-exports.default = _default;
+var _default = exports.default = builder;

package/lib/helper/ldComBuild.js

@@ -16,32 +16,29 @@ var _Builder = require("../components/Builder");
 var _classnames = _interopRequireDefault(require("classnames"));
 var _index = _interopRequireDefault(require("./index.less"));
 var _excluded = ["className"];
-var getResources = function getResources() {
+var getResources = exports.getResources = function getResources() {
   var _ref = (0, _react.useContext)(_Builder.LuckDaContext) || {},
     _ref$resources = _ref.resources,
     resources = _ref$resources === void 0 ? [] : _ref$resources;
   return resources;
 };
-exports.getResources = getResources;
-var ldComBuilder = function ldComBuilder(Com) {
+var ldComBuilder = exports.ldComBuilder = function ldComBuilder(Com) {
   var Component = function Component(props) {
     var _com$props;
     var resources = getResources();
     var com = /*#__PURE__*/_react.default.createElement(Com, props);
-    return !(com === null || com === void 0 ? void 0 : (_com$props = com.props) === null || _com$props === void 0 ? void 0 : _com$props.resource) || (0, _lodash.includes)(resources, com.props.resource) ? com : _react.Fragment;
+    return !(com !== null && com !== void 0 && (_com$props = com.props) !== null && _com$props !== void 0 && _com$props.resource) || (0, _lodash.includes)(resources, com.props.resource) ? com : _react.Fragment;
   };
   return Component;
 };
-exports.ldComBuilder = ldComBuilder;
-var filterOptions = function filterOptions(options) {
+var filterOptions = exports.filterOptions = function filterOptions(options) {
   var key = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 'resource';
   var resources = getResources();
   return (0, _lodash.intersectionWith)(options, resources, function (arrVal, othVal) {
     return !arrVal[key] || arrVal[key] === othVal;
   });
 };
-exports.filterOptions = filterOptions;
-var deepFilterCom = function deepFilterCom(Com, childMark) {
+var deepFilterCom = exports.deepFilterCom = function deepFilterCom(Com, childMark) {
   var Component = function Component(_ref2) {
     var className = _ref2.className,
       props = (0, _objectWithoutProperties2.default)(_ref2, _excluded);
@@ -51,10 +48,9 @@ var deepFilterCom = function deepFilterCom(Com, childMark) {
     }));
     return _utils.ChildrenUtil.deepFilter(com, function (child) {
       var _child$props;
-      var data = !childMark(child) || !(child === null || child === void 0 ? void 0 : (_child$props = child.props) === null || _child$props === void 0 ? void 0 : _child$props.resource) || (0, _lodash.includes)(resources, child.props.resource);
+      var data = !childMark(child) || !(child !== null && child !== void 0 && (_child$props = child.props) !== null && _child$props !== void 0 && _child$props.resource) || (0, _lodash.includes)(resources, child.props.resource);
       return data;
     });
   };
   return Component;
-};
-exports.deepFilterCom = deepFilterCom;
+};

package/lib/services.js

@@ -10,7 +10,7 @@ var _regeneratorRuntime2 = _interopRequireDefault(require("@babel/runtime/helper
 var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
 var _querystring = require("querystring");
 var _utils = require("@luck-design-biz/base/utils");
-var _ApiConfig = _interopRequireDefault(require("@/services/ApiConfig"));
+var _ApiConfig = _interopRequireDefault(require("../src/services/ApiConfig"));
 function readModlue(_x) {
   return _readModlue.apply(this, arguments);
 }

package/lib/upload/Form/gridForm.js

@@ -13,11 +13,11 @@ var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/h
 var _react = _interopRequireWildcard(require("react"));
 var _umi = require("umi");
 var _ahooks = require("ahooks");
-var _antd = require("antd");
+var _antd = require("luck-design/antd");
 var _moment = _interopRequireDefault(require("moment"));
 var _lodash = require("lodash");
 var _luckDesign = require("luck-design");
-var _ApiConfig = _interopRequireDefault(require("@/services/ApiConfig"));
+var _ApiConfig = _interopRequireDefault(require("../../../src/services/ApiConfig"));
 var _FormList = require("@luck-design-biz/base/FormList");
 var _utils = require("@luck-design-biz/base/utils");
 var _excluded = ["formId", "formRef", "showNote", "operates", "loading", "uploadUrl", "forbiddenTypes", "beforeUpload", "formMode", "onUploadChange", "zipName", "resetActions", "getUrl", "wrapperRef"];
@@ -122,17 +122,17 @@ var UploadGridForm = function UploadGridForm(_ref) {
     }
     if (file.status === 'done' && file.response && file.response.code === 1) {
       var _file$response2 = file.response,
-        _list = _file$response2.list,
-        _detail = _file$response2.detail;
+        list = _file$response2.list,
+        detail = _file$response2.detail;
       var data = {
-        uid: _detail[_list[0]].fileName,
+        uid: detail[list[0]].fileName,
         name: file.name,
         size: file.size,
-        fileId: _detail[_list[0]].fileName,
-        stype: _detail[_list[0]].fileExt,
+        fileId: detail[list[0]].fileName,
+        stype: detail[list[0]].fileExt,
         username: currentUser && currentUser.sname,
         uploadDate: (0, _moment.default)().valueOf(),
-        previewUrl: _detail[_list[0]].previewUrl
+        previewUrl: detail[list[0]].previewUrl
       };
       gridRef.current.changeData(null, data);
     }
@@ -165,17 +165,19 @@ var UploadGridForm = function UploadGridForm(_ref) {
         data: formData
       }).then(function (res) {
         var code = res.code,
-          content = res.content;
+          list = res.list,
+          detail = res.detail,
+          msg = res.msg;
         if (code === 1) {
           setUploadLoading(false);
           setVisible(false);
-          content.forEach(function (file, index) {
+          list.forEach(function (i, index) {
             var data = {
-              uid: detail[list[0]].fileName,
-              name: values.files[index].name,
-              size: values.files[index].size,
-              stype: file.fileExt,
-              fileId: detail[list[0]].fileName,
+              uid: detail[i].fileName,
+              name: detail[i].origFileName,
+              size: detail[i].fileSize,
+              stype: detail[i].fileExt,
+              fileId: detail[i].fileName,
               username: currentUser && currentUser.sname,
               note: snote,
               uploadDate: (0, _moment.default)().valueOf(),
@@ -192,6 +194,9 @@ var UploadGridForm = function UploadGridForm(_ref) {
               }, 300);
             }
           });
+        } else {
+          setUploadLoading(false);
+          (0, _utils.showPop)(msg, null, 'error');
         }
       });
     }
@@ -384,6 +389,5 @@ var Com = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
     wrapperRef: ref
   }, props));
 });
-var _default = Com;
-exports.default = _default;
+var _default = exports.default = Com;
 Com.displayName = 'GridForm';

package/lib/upload/Form/index.js

@@ -62,7 +62,8 @@ function buildComponent(props) {
             stype: i.fileExt,
             username: i.sregnm,
             uploadDate: i.dregt,
-            previewUrl: i.previewUrl
+            previewUrl: i.previewUrl,
+            note: i.note
           };
         });
       }
@@ -95,5 +96,4 @@ function buildComponent(props) {
     }
   }));
 }
-var _default = buildComponent;
-exports.default = _default;
+var _default = exports.default = buildComponent;

package/lib/upload/FormItem/index.js

@@ -81,5 +81,4 @@ function buildComponent(props) {
     })
   }), children);
 }
-var _default = buildComponent;
-exports.default = _default;
+var _default = exports.default = buildComponent;

package/lib/upload/GridCell/index.js

@@ -6,7 +6,7 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = void 0;
 var _react = _interopRequireDefault(require("react"));
-var _antd = require("antd");
+var _antd = require("luck-design/antd");
 var UploadGridCell = function UploadGridCell(_ref) {
   var _ref$fileList = _ref.fileList,
     fileList = _ref$fileList === void 0 ? [] : _ref$fileList,
@@ -31,5 +31,4 @@ var UploadGridCell = function UploadGridCell(_ref) {
     content: content
   }, children || /*#__PURE__*/_react.default.createElement("a", null, fileList.length)) : /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, children || /*#__PURE__*/_react.default.createElement("span", null, fileList.length));
 };
-var _default = UploadGridCell;
-exports.default = _default;
+var _default = exports.default = UploadGridCell;

package/lib/utils/form.js

@@ -13,7 +13,7 @@ var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/h
 var _react = _interopRequireDefault(require("react"));
 var _moment = _interopRequireDefault(require("moment"));
 var _lodash = require("lodash");
-var _ApiConfig = _interopRequireDefault(require("@/services/ApiConfig"));
+var _ApiConfig = _interopRequireDefault(require("../../src/services/ApiConfig"));
 var _form = require("../helper/form");
 var _grid = require("./grid");
 var formItemUtils = _interopRequireWildcard(require("../helper/FromItems"));
@@ -69,7 +69,7 @@ function getFormItem() {
  * @param {对象---后端返回的未处理数据} values
  * @returns
  */
-var formItemDataFormat = function formItemDataFormat() {
+var formItemDataFormat = exports.formItemDataFormat = function formItemDataFormat() {
   var propsList = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : [];
   var values = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
   var omitValues = {};
@@ -137,8 +137,7 @@ var formItemDataFormat = function formItemDataFormat() {
  * @param {对象---表单获取到的未处理数据} values
  * @returns
  */
-exports.formItemDataFormat = formItemDataFormat;
-var dataFormat = function dataFormat() {
+var dataFormat = exports.dataFormat = function dataFormat() {
   var propsList = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : [];
   var _values = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
   // 姚小川说：冗余字段后端处理，不需要前端传给后端
@@ -202,8 +201,7 @@ var dataFormat = function dataFormat() {
  * @param customProps
  * @returns {*&{field: *, editable: (false|{required: *}), renderBasicFormItem: ((function(): (*))|*), title, render: *}}
  */
-exports.dataFormat = dataFormat;
-var getFormColumn = function getFormColumn() {
+var getFormColumn = exports.getFormColumn = function getFormColumn() {
   var _props$config;
   var formType = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : 'grid';
   var _ref4 = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {},
@@ -255,5 +253,4 @@ var getFormColumn = function getFormColumn() {
     },
     field: name
   });
-};
-exports.getFormColumn = getFormColumn;
+};