antd-management-fast-framework 1.12.28 → 1.12.31

package/es/customComponents/FunctionComponent/index.js

@@ -1779,12 +1779,10 @@ function buildTreeSelect(_ref22) {
   });
 
   var listDataSource = (0, _tools.isArray)(listData) ? listData : [];
-  var listDataAdjust = listDataSource.map(function (o) {
-    if (!(0, _tools.isFunction)(dataConvert)) {
-      return o;
-    }
-
-    return dataConvert(o);
+  var listDataAdjust = !(0, _tools.isFunction)(dataConvert) ? listDataSource : (0, _tools.transformListData)({
+    list: listDataSource,
+    convert: dataConvert,
+    recursiveKey: 'children'
   });
   adjustOtherProps.treeData = listDataAdjust;
 

package/es/framework/Base/index.js

@@ -13,8 +13,6 @@ var _nprogress = _interopRequireDefault(require("nprogress"));
 
 var _tools = require("../../utils/tools");
 
-var _actionAssist = require("../../utils/actionAssist");
-
 var _defaultSettingsSpecial = require("../../utils/defaultSettingsSpecial");
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }

package/es/utils/actionAssist.js

@@ -238,7 +238,7 @@ function _actionCore() {
                       }), data),
                           remoteListData = _list$data$extra$data.list,
                           remoteData = _list$data$extra$data.data,
-                          remoteExtraData = _list$data$extra$data.data;
+                          remoteExtraData = _list$data$extra$data.extra;
 
                       var messageText = successMessage;
 
@@ -251,7 +251,9 @@ function _actionCore() {
                         });
                       }
 
-                      (0, _tools.notifySuccess)(messageText);
+                      if (!(0, _tools.stringIsNullOrWhiteSpace)(messageText)) {
+                        (0, _tools.notifySuccess)(messageText);
+                      }
 
                       if ((0, _tools.isFunction)(successCallback)) {
                         successCallback({

package/es/utils/dva.d.ts

@@ -0,0 +1,31 @@
+/**
+ * 占位函数
+ *
+ * @export
+ * @returns
+ */
+export function empty(): {};
+export namespace reducerCommonNameCollection {
+    const handleCommonData: string;
+    const handleListData: string;
+    const handlePageListData: string;
+}
+export namespace reducerCommonCollection {
+    function handleCommonData(state: any, action: any): any;
+    function handleCommonData(state: any, action: any): any;
+    function handleListData(state: any, action: any): any;
+    function handleListData(state: any, action: any): any;
+    function handlePageListData(state: any, action: any): any;
+    function handlePageListData(state: any, action: any): any;
+}
+export namespace tacitlyState {
+    namespace data {
+        export const code: number;
+        export const message: string;
+        export const dataSuccess: boolean;
+        const data_1: {};
+        export { data_1 as data };
+        export const list: never[];
+        export const extra: {};
+    }
+}

package/es/utils/dva.js

@@ -0,0 +1,56 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.empty = empty;
+exports.tacitlyState = exports.reducerCommonNameCollection = exports.reducerCommonCollection = void 0;
+
+var _requestAssistor = require("./requestAssistor");
+
+var _defaultSettingsSpecial = require("./defaultSettingsSpecial");
+
+var reducerCommonNameCollection = {
+  handleCommonData: 'handleCommonData',
+  handleListData: 'handleListData',
+  handlePageListData: 'handlePageListData'
+};
+exports.reducerCommonNameCollection = reducerCommonNameCollection;
+var reducerCommonCollection = {
+  handleCommonData: function handleCommonData(state, action) {
+    return (0, _requestAssistor.handleCommonDataAssist)(state, action);
+  },
+  handleListData: function handleListData(state, action) {
+    return (0, _requestAssistor.handleListDataAssist)(state, action);
+  },
+  handlePageListData: function handlePageListData(state, action) {
+    return (0, _requestAssistor.handlePageListDataAssist)(state, action);
+  }
+};
+/**
+ * 初始化state
+ */
+
+exports.reducerCommonCollection = reducerCommonCollection;
+var tacitlyState = {
+  data: {
+    code: _defaultSettingsSpecial.defaultSettingsLayoutCustom.getApiSuccessCode(),
+    message: 'success',
+    dataSuccess: true,
+    data: {},
+    list: [],
+    extra: {}
+  }
+};
+/**
+ * 占位函数
+ *
+ * @export
+ * @returns
+ */
+
+exports.tacitlyState = tacitlyState;
+
+function empty() {
+  return {};
+}

package/es/utils/tools.d.ts

@@ -551,6 +551,22 @@ export function evil(fn: any): any;
  * @returns
  */
 export function searchFromList(itemKey: any, itemValue: any, sourceData: any): null;
+/**
+ * 转换列表数据
+ */
+export function transformListData({ list, convert, recursiveKey, }: {
+    list?: any[] | undefined;
+    convert?: null | undefined;
+    recursiveKey?: string | undefined;
+}): any[];
+/**
+ * 转换数据
+ */
+export function transformData({ data, convert, recursiveKey, }: {
+    data: any;
+    convert?: null | undefined;
+    recursiveKey?: string | undefined;
+}): any;
 /**
  * 构建描述文本
  * @param {*} v

package/es/utils/tools.js

@@ -129,6 +129,8 @@ exports.toMoney = toMoney;
 exports.toNumber = toNumber;
 exports.toPercentage = toPercentage;
 exports.toString = toString;
+exports.transformData = transformData;
+exports.transformListData = transformListData;
 exports.trim = trim;
 exports.trySendNearestLocalhostNotify = trySendNearestLocalhostNotify;
 
@@ -1583,6 +1585,61 @@ function searchFromList(itemKey, itemValue, sourceData) {
   });
   return result;
 }
+/**
+ * 转换列表数据
+ */
+
+
+function transformListData(_ref20) {
+  var _ref20$list = _ref20.list,
+      list = _ref20$list === void 0 ? [] : _ref20$list,
+      _ref20$convert = _ref20.convert,
+      convert = _ref20$convert === void 0 ? null : _ref20$convert,
+      _ref20$recursiveKey = _ref20.recursiveKey,
+      recursiveKey = _ref20$recursiveKey === void 0 ? 'children' : _ref20$recursiveKey;
+  var listData = isArray(list) ? list : [list];
+  var l = listData.map(function (one) {
+    return transformData({
+      data: one,
+      convert: convert,
+      target: recursiveKey
+    });
+  });
+  return l;
+}
+/**
+ * 转换数据
+ */
+
+
+function transformData(_ref21) {
+  var data = _ref21.data,
+      _ref21$convert = _ref21.convert,
+      convert = _ref21$convert === void 0 ? null : _ref21$convert,
+      _ref21$recursiveKey = _ref21.recursiveKey,
+      recursiveKey = _ref21$recursiveKey === void 0 ? 'children' : _ref21$recursiveKey;
+
+  if (!isFunction(convert)) {
+    return data;
+  }
+
+  var d = convert(data);
+  var children = data[recursiveKey];
+  var listData = [];
+
+  if (isArray(children)) {
+    listData = children.map(function (one) {
+      return transformData({
+        data: one,
+        convert: convert,
+        target: recursiveKey
+      });
+    });
+  }
+
+  d[recursiveKey] = listData;
+  return d;
+}
 /**
  * 构建描述文本
  * @param {*} v
@@ -2128,8 +2185,8 @@ function removeNearestLocalhostNotifyCache() {
  */
 
 
-function trySendNearestLocalhostNotify(_ref20) {
-  var text = _ref20.text;
+function trySendNearestLocalhostNotify(_ref22) {
+  var text = _ref22.text;
   var needSend = false;
   var nearestTime = 0;
 
@@ -2207,11 +2264,11 @@ function notifyInfo(text) {
  */
 
 
-function notify(_ref21) {
-  var type = _ref21.type,
-      placementValue = _ref21.placement,
-      messageValue = _ref21.message,
-      descriptionValue = _ref21.description;
+function notify(_ref23) {
+  var type = _ref23.type,
+      placementValue = _ref23.placement,
+      messageValue = _ref23.message,
+      descriptionValue = _ref23.description;
 
   var _placement$message$de = _objectSpread(_objectSpread({}, {
     placement: 'bottomRight',
@@ -2285,10 +2342,10 @@ function notify(_ref21) {
   }, 600);
 }
 
-function checkFromConfig(_ref22) {
-  var label = _ref22.label,
-      name = _ref22.name,
-      helper = _ref22.helper;
+function checkFromConfig(_ref24) {
+  var label = _ref24.label,
+      name = _ref24.name,
+      helper = _ref24.helper;
   var labelText = 'object';
   var nameText = 'object';
   var helperText = 'object';
@@ -2347,13 +2404,13 @@ var requestAnimFrame = requestAnimFrameCustom;
 
 exports.requestAnimFrame = requestAnimFrame;
 
-function sortCollectionByKey(_ref23) {
-  var operate = _ref23.operate,
-      item = _ref23.item,
-      list = _ref23.list,
-      sortKey = _ref23.sortKey,
-      _ref23$sortMin = _ref23.sortMin,
-      sortMin = _ref23$sortMin === void 0 ? 0 : _ref23$sortMin;
+function sortCollectionByKey(_ref25) {
+  var operate = _ref25.operate,
+      item = _ref25.item,
+      list = _ref25.list,
+      sortKey = _ref25.sortKey,
+      _ref25$sortMin = _ref25.sortMin,
+      sortMin = _ref25$sortMin === void 0 ? 0 : _ref25$sortMin;
 
   if ((item || null) == null) {
     return list;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "antd-management-fast-framework",
-  "version": "1.12.28",
+  "version": "1.12.31",
   "description": "antd-management-fast-framework",
   "keywords": [
     "antd-management-fast-framework"
@@ -170,5 +170,5 @@
   "bugs": {
     "url": "https://github.com/kityandhero/antd-management-fast-framework/issues"
   },
-  "gitHead": "8e09a22466fdcce909277789782bdf5bfb514b32"
+  "gitHead": "b79b8971e41ecd6e6ec7ddd3f6a1bc74489df92c"
 }