@luck-design-biz/luckda 0.0.2 → 0.0.3

package/lib/components/LdTree/index.js

@@ -21,9 +21,9 @@ var _luckDesign = require("luck-design");
 var _utils = require("@luck-design-biz/base/utils");
 var _base = require("@luck-design-biz/base");
 var _ldBuilder = _interopRequireDefault(require("../../helper/ldBuilder"));
-var _services = require("../../services");
+var _utils2 = require("../../utils");
 var _index = _interopRequireDefault(require("./index.less"));
-var _excluded = ["columns", "resources", "actions", "doAction", "wrapperRef", "ldId", "dataSetKey", "defaultParmas", "moduleCode", "readOnly", "title", "rowKey", "treeNodeTitle", "unselectableNodes", "rightMenus", "defaultExpandDeep", "draggable", "onDrop", "className", "treeClassName", "rootAdd", "suppressInit", "afterInit", "isTree", "service"],
+var _excluded = ["columns", "resources", "actions", "doAction", "wrapperRef", "ldId", "dataSetKey", "defaultParmas", "moduleCode", "readOnly", "title", "rowKey", "treeNodeTitle", "unselectableNodes", "rightMenus", "defaultExpandDeep", "draggable", "onDrop", "className", "treeClassName", "rootAdd", "suppressInit", "afterQuery", "afterInit", "isTree", "service"],
   _excluded2 = ["onClick"];
 var LdTree = function LdTree(_ref) {
   var columns = _ref.columns,
@@ -48,6 +48,7 @@ var LdTree = function LdTree(_ref) {
     treeClassName = _ref.treeClassName,
     rootAdd = _ref.rootAdd,
     suppressInit = _ref.suppressInit,
+    afterQuery = _ref.afterQuery,
     afterInit = _ref.afterInit,
     isTree = _ref.isTree,
     service = _ref.service,
@@ -70,23 +71,24 @@ var LdTree = function LdTree(_ref) {
     datasetCode: dataSetKey,
     behaviorKey: 'readTree'
   }, _defaultParmas)];
-  var _useRequest = (0, _ahooks.useRequest)(service || _services.readBehaviorCall, {
+  var _useRequest = (0, _ahooks.useRequest)(service || _utils2.behaviorCall, {
       // 获取树数据源
       defaultParams: defaultParams,
       manual: suppressInit,
-      onSuccess: function onSuccess(data) {
-        var code = data.code,
-          list = data.list,
-          detail = data.detail;
+      onSuccess: function onSuccess(response) {
+        afterQuery && afterQuery(response);
+        var code = response.code,
+          list = response.list,
+          detail = response.detail;
         if (code === 1) {
-          var _data = list.map(function (i) {
+          var data = list.map(function (i) {
             return detail[i];
           });
           // 判断是否默认展开
           if (defaultExpandDeep === 'all') setDefaultExpandedProps({
             defaultExpandAll: true
           });else if ((0, _lodash.isNumber)(defaultExpandDeep) && defaultExpandDeep > 0) {
-            var defaultExpanded = (0, _lodash.transform)(_data, function (result, n) {
+            var defaultExpanded = (0, _lodash.transform)(data, function (result, n) {
               if (n.sidcc.substring(1, n.sidcc.length - 1).split('/').length < defaultExpandDeep + 1) {
                 result.push("".concat(n[rowKey]));
               }
@@ -95,7 +97,7 @@ var LdTree = function LdTree(_ref) {
               defaultExpandedKeys: defaultExpanded
             });
           }
-          var treeData = (0, _utils.dataToTree)(_data);
+          var treeData = (0, _utils.dataToTree)(data);
           setDataSource(treeData);
           afterInit && afterInit(treeData);
         }

package/lib/helper/action.js

@@ -6,12 +6,12 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.onBatchSubmitAction = exports.doAction = void 0;
 var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
+var _react = _interopRequireDefault(require("react"));
 var _antd = require("antd");
 var _utils = require("@luck-design-biz/base/utils");
 var _lodash = require("lodash");
 var _utils2 = require("../utils");
 var _form = require("./form");
-var _services = require("../services");
 // 通用方法
 
 /**
@@ -49,10 +49,9 @@ var doAction = function doAction(action) {
       });
     };
     var handleAction = function handleAction() {
-      (0, _services.readBehaviorCall)({
+      (0, _utils2.behaviorCall)({
         behaviorKey: action,
-        moduleCode: moduleCode,
-        datasetCode: Object.keys(data).join(',')
+        moduleCode: moduleCode
       }, data).then(function (_ref3) {
         var code = _ref3.code,
           data = _ref3.data;

package/lib/utils/action.js

@@ -0,0 +1,40 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.behaviorCall = behaviorCall;
+var _regeneratorRuntime2 = _interopRequireDefault(require("@babel/runtime/helpers/regeneratorRuntime"));
+var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
+var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
+var _services = require("../services");
+// 行为请求同一接口
+function behaviorCall() {
+  return _behaviorCall.apply(this, arguments);
+}
+function _behaviorCall() {
+  _behaviorCall = (0, _asyncToGenerator2.default)( /*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee() {
+    var get,
+      post,
+      datasetCode,
+      _args = arguments;
+    return (0, _regeneratorRuntime2.default)().wrap(function _callee$(_context) {
+      while (1) {
+        switch (_context.prev = _context.next) {
+          case 0:
+            get = _args.length > 0 && _args[0] !== undefined ? _args[0] : {};
+            post = _args.length > 1 && _args[1] !== undefined ? _args[1] : {};
+            datasetCode = get.datasetCode;
+            return _context.abrupt("return", (0, _services.readBehaviorCall)((0, _objectSpread2.default)((0, _objectSpread2.default)({}, get), {}, {
+              datasetCode: datasetCode || Object.keys(post).join(',')
+            }), post));
+          case 4:
+          case "end":
+            return _context.stop();
+        }
+      }
+    }, _callee);
+  }));
+  return _behaviorCall.apply(this, arguments);
+}

package/lib/utils/index.js

@@ -24,4 +24,15 @@ Object.keys(_form).forEach(function (key) {
       return _form[key];
     }
   });
+});
+var _action = require("./action");
+Object.keys(_action).forEach(function (key) {
+  if (key === "default" || key === "__esModule") return;
+  if (key in exports && exports[key] === _action[key]) return;
+  Object.defineProperty(exports, key, {
+    enumerable: true,
+    get: function get() {
+      return _action[key];
+    }
+  });
 });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@luck-design-biz/luckda",
-  "version": "0.0.2",
+  "version": "0.0.3",
   "scripts": {
     "start": "dumi dev",
     "docs:build": "dumi build",