@luck-design-biz/luckda 0.0.2 → 0.0.4

package/lib/components/LdGrid/model.js

@@ -6,38 +6,35 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = _default;
 var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
+var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));
 var _modelHelper = require("@luck-design-biz/base/utils/modelHelper");
-var _services = require("../../services");
+var _utils = require("../../utils");
+var _excluded = ["readAll", "moduleCode", "dataSetKey", "behaviorKey", "afterQuery"];
 function _default(namespace) {
-  var _ref = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {},
-    _ref$isFlow = _ref.isFlow,
-    isFlow = _ref$isFlow === void 0 ? false : _ref$isFlow,
-    dataSetKey = _ref.dataSetKey,
-    moduleCode = _ref.moduleCode,
-    _ref$unclosableSet = _ref.unclosableSet,
-    unclosableSet = _ref$unclosableSet === void 0 ? [] : _ref$unclosableSet,
-    pageSize = _ref.pageSize,
-    _ref$isTreeGrid = _ref.isTreeGrid,
-    isTreeGrid = _ref$isTreeGrid === void 0 ? false : _ref$isTreeGrid,
-    service = _ref.service;
-  return (0, _modelHelper.createMainModel)({
+  var modelProps = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
+  var _readAll = modelProps.readAll,
+    moduleCode = modelProps.moduleCode,
+    dataSetKey = modelProps.dataSetKey,
+    behaviorKey = modelProps.behaviorKey,
+    afterQuery = modelProps.afterQuery,
+    _modelProps = (0, _objectWithoutProperties2.default)(modelProps, _excluded);
+  return (0, _modelHelper.createMainModel)((0, _objectSpread2.default)((0, _objectSpread2.default)({}, _modelProps), {}, {
     namespace: namespace,
-    isFlow: isFlow,
-    unclosableSet: unclosableSet,
-    pageSize: pageSize,
     readAll: function readAll() {
       var get = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
       var post = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
-      return (service || _services.readBehaviorCall)((0, _objectSpread2.default)((0, _objectSpread2.default)({}, get), {}, {
-        moduleCode: moduleCode,
-        datasetCode: dataSetKey,
-        behaviorKey: isTreeGrid ? 'readTree' : 'readGrid'
-      }), {
-        _AutoFilter: post
+      return new Promise(function (resolve) {
+        (_readAll || _utils.behaviorCall)((0, _objectSpread2.default)({
+          moduleCode: moduleCode,
+          datasetCode: dataSetKey,
+          behaviorKey: behaviorKey
+        }, get), {
+          _AutoFilter: post
+        }).then(function (res) {
+          afterQuery && afterQuery(res);
+          resolve(res);
+        });
       });
-    },
-    state: {},
-    effects: {},
-    reducers: {}
-  });
+    }
+  }));
 }

package/lib/components/LdGridForm/index.js

@@ -19,9 +19,9 @@ var _FormList = require("@luck-design-biz/base/FormList");
 var _utils = require("../../utils");
 var _form = require("../../helper/form");
 var _Builder = require("../Builder");
-var _services = require("../../services");
 var _index = _interopRequireDefault(require("./index.less"));
 var _excluded = ["columns", "resources", "actions", "doAction", "ldId", "dataSetKey", "columnsRewrite", "onQuery", "onAdd", "onUpdate", "onDelete", "mainFormLdId", "mainDataSetKey", "onValueChange", "type", "afterOperate", "moduleCode", "defaultDataSourceFormat", "ticketData", "className"];
+var defaultOpe = ['read', 'add', 'update', 'delete'];
 var buildLdGridForm = function buildLdGridForm(_ref) {
   var _ref$columns = _ref.columns,
     columns = _ref$columns === void 0 ? [] : _ref$columns,
@@ -111,7 +111,7 @@ var buildLdGridForm = function buildLdGridForm(_ref) {
     return (0, _objectSpread4.default)((0, _objectSpread4.default)({
       api: function api(get, post, formData) {
         var _formData$mainFormLdI;
-        return (0, _services.readBehaviorCall)((0, _objectSpread4.default)((0, _objectSpread4.default)({}, get), {}, (0, _defineProperty2.default)({}, isMain ? 'indocno' : 'relationId', ((_formData$mainFormLdI = formData[mainFormLdId]) === null || _formData$mainFormLdI === void 0 ? void 0 : _formData$mainFormLdI.indocno) || ticketData.indocno)), post, formData);
+        return (0, _utils.behaviorCall)((0, _objectSpread4.default)((0, _objectSpread4.default)({}, get), {}, (0, _defineProperty2.default)({}, isMain ? 'indocno' : 'relationId', ((_formData$mainFormLdI = formData[mainFormLdId]) === null || _formData$mainFormLdI === void 0 ? void 0 : _formData$mainFormLdI.indocno) || ticketData.indocno)), post, formData);
       },
       get: function get() {
         return {
@@ -132,13 +132,13 @@ var buildLdGridForm = function buildLdGridForm(_ref) {
   });
   return /*#__PURE__*/_react.default.createElement(_FormList.GridForm, (0, _extends2.default)({
     noAddon: true,
-    operates: resources,
+    operates: defaultOpe,
     orderByAdd: "asc",
     rowSelection: true,
     type: type
   }, props, {
     onQuery: (0, _objectSpread4.default)((0, _objectSpread4.default)({
-      api: _services.readBehaviorCall,
+      api: _utils.behaviorCall,
       get: function get(formData) {
         var _formData$mainFormLdI2, _params2;
         var _params = (_params2 = {}, (0, _defineProperty2.default)(_params2, isMain ? 'indocno' : 'relationId', ((_formData$mainFormLdI2 = formData[mainFormLdId]) === null || _formData$mainFormLdI2 === void 0 ? void 0 : _formData$mainFormLdI2.indocno) || ticketData.indocno), (0, _defineProperty2.default)(_params2, "moduleCode", moduleCode), (0, _defineProperty2.default)(_params2, "datasetCode", dataSetKey), (0, _defineProperty2.default)(_params2, "behaviorKey", 'readGrid'), _params2);

package/lib/components/LdInfoPanel/index.js

@@ -14,10 +14,10 @@ var _react = _interopRequireWildcard(require("react"));
 var _propTypes = _interopRequireDefault(require("prop-types"));
 var _ahooks = require("ahooks");
 var _luckDesign = require("luck-design");
-var _services = require("../../services");
+var _utils = require("../../utils");
 var _lodash = require("lodash");
 var _ldBuilder = _interopRequireDefault(require("../../helper/ldBuilder"));
-var _excluded = ["columns", "resources", "actions", "doAction", "wrapperRef", "moduleCode", "dataSetKey", "defaultParmas", "suppressInit", "afterInit", "customColumns", "service"];
+var _excluded = ["columns", "resources", "actions", "doAction", "wrapperRef", "moduleCode", "dataSetKey", "defaultParmas", "suppressInit", "afterInit", "customColumns", "service", "afterQuery"];
 var formatInfoPanelData = function formatInfoPanelData(columns, data) {
   return (0, _lodash.transform)(columns, function (result, col) {
     result[col.dataIndex] = col.render && col.render(data[col.dataIndex], data) || data["".concat(col.dataIndex, "_virtual")] || data[col.dataIndex];
@@ -36,6 +36,7 @@ var LdInfoPanel = function LdInfoPanel(_ref) {
     afterInit = _ref.afterInit,
     customColumns = _ref.customColumns,
     service = _ref.service,
+    afterQuery = _ref.afterQuery,
     props = (0, _objectWithoutProperties2.default)(_ref, _excluded);
   var infoPanelRef = (0, _react.useRef)(null);
   var _useState = (0, _react.useState)({}),
@@ -65,25 +66,26 @@ var LdInfoPanel = function LdInfoPanel(_ref) {
       return (0, _objectSpread2.default)({
         title: xCol.fieldName
       }, col);
-    }) : customColumns.map(function (item) {
+    }) : columns.map(function (item) {
       return {
         title: item.fieldName,
         dataIndex: item.field
       };
     });
   }, [columns]);
-  var _useRequest = (0, _ahooks.useRequest)(service || _services.readBehaviorCall, {
-      // 获取树数据源
+  var _useRequest = (0, _ahooks.useRequest)(service || _utils.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 && list[0]) {
-          var _data = detail[list[0]];
-          setDataSource(_data);
-          afterInit && afterInit(_data);
+          var data = detail[list[0]];
+          setDataSource(data);
+          afterInit && afterInit(data);
         }
       }
     }),

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");
 // 通用方法
 
 /**
@@ -26,7 +26,9 @@ var doAction = function doAction(action) {
   var _ref = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : {},
     _ref$showConfirm = _ref.showConfirm,
     showConfirm = _ref$showConfirm === void 0 ? true : _ref$showConfirm,
-    callback = _ref.callback;
+    callback = _ref.callback,
+    form_id = _ref.form_id,
+    effcode = _ref.effcode;
   var _ref2 = arguments.length > 3 ? arguments[3] : undefined,
     _ref2$actions = _ref2.actions,
     actions = _ref2$actions === void 0 ? {} : _ref2$actions,
@@ -49,10 +51,11 @@ var doAction = function doAction(action) {
       });
     };
     var handleAction = function handleAction() {
-      (0, _services.readBehaviorCall)({
+      (0, _utils2.behaviorCall)({
         behaviorKey: action,
         moduleCode: moduleCode,
-        datasetCode: Object.keys(data).join(',')
+        form_id: form_id,
+        effcode: effcode
       }, data).then(function (_ref3) {
         var code = _ref3.code,
           data = _ref3.data;
@@ -87,7 +90,9 @@ var onBatchSubmitAction = function onBatchSubmitAction(_ref4, callback) {
     } : _ref4$beforeSubmit,
     doAction = _ref4.doAction,
     action = _ref4.action,
-    formData = _ref4.formData;
+    formData = _ref4.formData,
+    form_id = _ref4.form_id,
+    effcode = _ref4.effcode;
   var data = (0, _lodash.transform)(formList, function (result, value) {
     var _formData$value$id, _values$value$id;
     if (values[value.id]) {
@@ -130,7 +135,9 @@ var onBatchSubmitAction = function onBatchSubmitAction(_ref4, callback) {
     if (backData) {
       doAction(action, backData, {
         showConfirm: false,
-        callback: callback
+        callback: callback,
+        form_id: form_id,
+        effcode: effcode
       });
     }
   });

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.4",
   "scripts": {
     "start": "dumi dev",
     "docs:build": "dumi build",
@@ -40,7 +40,7 @@
   },
   "dependencies": {
     "@babel/runtime": "^7.18.9",
-    "@luck-design-biz/base": "^0.0.1",
+    "@luck-design-biz/base": "^0.0.5",
     "@province-city-china/level": "^8.5.4",
     "ahooks": "^3.7.0",
     "antd": "^3.26.6",