@luck-design-biz/luckda 0.0.8-1 → 0.0.9

package/es/components/LdCard/index.js

@@ -9,7 +9,7 @@ import { getDvaApp } from 'umi';
 import PropTypes from 'prop-types';
 import { Icon, Tooltip } from 'antd';
 import { ResultSet, PermissionUtil } from 'luck-design';
-import { includes } from 'lodash';
+import { includes, difference } from 'lodash';
 import { useCreation, useMemoizedFn } from 'ahooks';
 import createModel from './model';
 import ldBuilder from '../../helper/ldBuilder';
@@ -57,7 +57,7 @@ var LdCard = function LdCard(_ref) {
     });
   });
   var _batchOperations = useCreation(function () {
-    return batchOperations.map(function (i) {
+    return (batchOperations || []).map(function (i) {
       return _objectSpread(_objectSpread({}, i), {}, {
         wanted: i.wanted || 'virtual'
       });
@@ -99,7 +99,7 @@ var LdCard = function LdCard(_ref) {
       }), readOnly ? [] : [].concat(_toConsumableArray(item['__infuse_serial__'] || resources), ['virtual']))
     }));
   });
-  return /*#__PURE__*/React.createElement(React.Fragment, null, Object.keys(params).length > 0 && /*#__PURE__*/React.createElement(ResultSet, _extends({
+  return /*#__PURE__*/React.createElement(React.Fragment, null, difference(Object.keys(params), resultSet.invisibleSet || []).length > 0 && /*#__PURE__*/React.createElement(ResultSet, _extends({
     set: params,
     onQuery: onQuery
   }, resultSet, {

package/es/components/LdFormList/index.js

@@ -63,16 +63,17 @@ var LdFormList = function LdFormList(_ref) {
   useImperativeHandle(wrapperRef, function () {
     return _objectSpread(_objectSpread({}, formListRef.current), {}, {
       onLdQuery: function onLdQuery() {
-        var _getDvaApp;
         var _params = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
-        (_getDvaApp = getDvaApp()) === null || _getDvaApp === void 0 ? void 0 : _getDvaApp._store.dispatch({
-          type: "".concat(namespace, "/setTicketData"),
-          payload: {
-            ticketData: _objectSpread(_objectSpread({}, props.ticketData), _params)
-          }
-        }).then(function () {
-          formListRef.current.doQuery(null, _objectSpread(_objectSpread({}, props.ticketData), _params));
-        });
+        if (props.formMode !== 'add') {
+          var _getDvaApp;
+          (_getDvaApp = getDvaApp()) === null || _getDvaApp === void 0 ? void 0 : _getDvaApp._store.dispatch({
+            type: "".concat(namespace, "/setTicketData"),
+            payload: {
+              ticketData: _objectSpread(_objectSpread({}, props.ticketData), _params)
+            }
+          });
+          formListRef.current.doQuery();
+        }
       }
     });
   });
@@ -82,7 +83,7 @@ var LdFormList = function LdFormList(_ref) {
     var data = formRefs && Object.keys(formRefs).map(function (key) {
       var _formRefs$key$current;
       var getValue = formRefs[key].getData || ((_formRefs$key$current = formRefs[key].current) === null || _formRefs$key$current === void 0 ? void 0 : _formRefs$key$current.getFieldsValue);
-      return _defineProperty({}, key, getValue());
+      return _defineProperty({}, key, getValue && getValue());
     });
     onValueChange(change, data);
   });
@@ -121,34 +122,25 @@ var LdFormList = function LdFormList(_ref) {
         } else {
           var _formListRef$current;
           props.parentModelName && ((_formListRef$current = formListRef.current) === null || _formListRef$current === void 0 ? void 0 : _formListRef$current.doParentsQuery());
-          // if (
-          //   !formWindow &&
-          //   formMode === 'add' &&
-          //   window.__INJECTED_FLOAT_MICRO_APP_BY_QIANKUN
-          // ) {
-          //   const { pathname, query } = history.location;
-          //   const _pathname = pathname.replace(
-          //     /\/0(?=[?]|[\/]$|$)/g,
-          //     `/${indocno}?`,
-          //   );
-          //   window.openUrl(
-          //     `layer:${_pathname}${stringify({
-          //       ...query,
-          //       title: window.__INJECTED_APP_NAME_BY_QIANKUN__,
-          //     })}`,
-          //   );
-          // } else {
-          formListRef.current.onQuery(null, _defineProperty({}, mainFormLdId, {
-            indocno: indocno
-          }), function () {
-            return formListRef.current.setFormMode('edit');
-          });
-          // }
+          if (!formWindow && formMode === 'add' && window.__INJECTED_FLOAT_MICRO_APP_BY_QIANKUN) {
+            var _history$location = history.location,
+              pathname = _history$location.pathname,
+              query = _history$location.query;
+            var _pathname = pathname.replace(/\/0(?=[?]|[\/]$|$)/g, "/".concat(indocno, "?"));
+            window.openUrl("layer:".concat(_pathname).concat(stringify(_objectSpread(_objectSpread({}, query), {}, {
+              title: window.__INJECTED_APP_NAME_BY_QIANKUN__
+            }))));
+          } else {
+            formListRef.current.onQuery(null, _defineProperty({}, mainFormLdId, {
+              indocno: indocno
+            }), function () {
+              return formListRef.current.setFormMode('info');
+            });
+          }
         }
       }
     });
   };
-
   var formConfig = _objectSpread(_objectSpread({
     formState: formState,
     formMode: formMode,

package/es/components/LdGrid/index.js

@@ -3,10 +3,10 @@ import _toConsumableArray from "@babel/runtime/helpers/esm/toConsumableArray";
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
 var _excluded = ["columns", "resources", "actions", "doAction", "afterInit", "namespace", "wrapperRef", "list", "detail", "params", "filters", "loading", "unclosableSet", "onQuery", "doQuery", "pageno", "pagesize", "totalCount", "columnsRewrite", "columnsReset", "batchOperations", "formatDataSource", "resultSet", "actionsColumn", "readFilter", "isFlow", "isTreeGrid"],
-  _excluded2 = ["ldId", "moduleCode", "suppressInit", "overModel", "afterQuery"];
+  _excluded2 = ["ldId", "moduleCode", "suppressInit", "overModel", "afterQuery", "isTreeGrid"];
 import React, { forwardRef, useImperativeHandle, useRef, useEffect } from 'react';
 import { getDvaApp } from 'umi';
-import { transform, includes, keyBy, union, keys } from 'lodash';
+import { transform, includes, keyBy, union, keys, isNil } from 'lodash';
 import { useCreation } from 'ahooks';
 import PropTypes from 'prop-types';
 import { build } from '@luck-design-biz/base/Component';
@@ -99,7 +99,7 @@ var LdGrid = function LdGrid(_ref) {
         result.push(customColumns[field]);
       } else if (defaultColumns[field].isShowInGrid)
         // 数据集中存在的字段和自定义结合展示
-        result.push(getGridColumn(defaultColumns[field], customColumns[field] || {}));
+        result.push(getGridColumn(defaultColumns[field], customColumns[field] || {}, isTreeGrid));
     }, []);
   }, [columns, columnsRewrite, columnsReset]);
   var _actionsColumn = useCreation(function () {
@@ -138,7 +138,8 @@ var LdGrid = function LdGrid(_ref) {
       pageSize: pageSize
     },
     dataSource: formatDataSource(list, detail),
-    resultSet: _resultSet
+    resultSet: _resultSet,
+    gridId: namespace
   }, treeConfig, props, {
     modelName: namespace,
     operates: [].concat(_toConsumableArray(resources), ['virtual']),
@@ -156,8 +157,9 @@ var LdIndex = function LdIndex(_ref2) {
     suppressInit = _ref2.suppressInit,
     overModel = _ref2.overModel,
     afterQuery = _ref2.afterQuery,
+    _isTreeGrid = _ref2.isTreeGrid,
     props = _objectWithoutProperties(_ref2, _excluded2);
-  var isTreeGrid = includes(props.isTree, props.dataSetKey);
+  var isTreeGrid = isNil(_isTreeGrid) ? includes(props.isTree, props.dataSetKey) : _isTreeGrid;
   var Component = useCreation(function () {
     var _getDvaApp, _getDvaApp2;
     (_getDvaApp = getDvaApp()) === null || _getDvaApp === void 0 ? void 0 : _getDvaApp.unmodel(namespace);

package/es/utils/grid.js

@@ -1,11 +1,11 @@
 import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
 var _excluded = ["comName", "property"],
-  _excluded2 = ["name", "isVr"],
+  _excluded2 = ["name"],
   _excluded3 = ["filter", "filterParams"];
 var _getDvaApp;
 import React from "react";
 import { getDvaApp } from 'umi';
-import { merge, isNil, isArray } from 'lodash';
+import { merge, isNil, isArray, includes } from 'lodash';
 import { Switch, Tag } from 'antd';
 import moment from 'moment';
 import { defaultComName, translator, formatCustomProps } from '../helper/form';
@@ -80,10 +80,11 @@ export var getGridColumn = function getGridColumn() {
     property = _ref.property,
     props = _objectWithoutProperties(_ref, _excluded);
   var customProps = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
+  var isTreeGrid = arguments.length > 2 ? arguments[2] : undefined;
+  var _props$isVirtual = props.isVirtual,
+    isVirtual = _props$isVirtual === void 0 ? false : _props$isVirtual;
   var _translator = translator(props),
     name = _translator.name,
-    _translator$isVr = _translator.isVr,
-    isVr = _translator$isVr === void 0 ? false : _translator$isVr,
     translateProps = _objectWithoutProperties(_translator, _excluded2);
   var _merge = merge(translateProps, formatCustomProps(customProps)),
     filter = _merge.filter,
@@ -94,13 +95,13 @@ export var getGridColumn = function getGridColumn() {
     title: _props.label,
     render: _props.render || getColumnRender(name, comName || defaultComName[property], _props)
   };
+  if (isTreeGrid || isVirtual || includes(['user', 'select', 'group', 'switch', 'color', 'region'], comName || defaultComName[property])) data.sortable = false;
   // data.filter = false;
   if (filter) {
     // 因为后端升级问题，暂时关闭过滤功能
     data.filter = filter;
     data.filterParams = filterParams;
-  }
-  if (!isVr && !filter) {
+  } else if (!isTreeGrid && !isVirtual) {
     switch (comName || defaultComName[property]) {
       case 'switch':
         data.filter = 'select';
@@ -188,7 +189,8 @@ export var getGridColumn = function getGridColumn() {
         };
         break;
       default:
+        data.filter = 'text';
     }
-  }
+  } else data.filter = false;
   return data;
 };

package/lib/components/LdCard/index.js

@@ -65,7 +65,7 @@ var LdCard = function LdCard(_ref) {
     });
   });
   var _batchOperations = (0, _ahooks.useCreation)(function () {
-    return batchOperations.map(function (i) {
+    return (batchOperations || []).map(function (i) {
       return (0, _objectSpread2.default)((0, _objectSpread2.default)({}, i), {}, {
         wanted: i.wanted || 'virtual'
       });
@@ -107,7 +107,7 @@ var LdCard = function LdCard(_ref) {
       }), readOnly ? [] : [].concat((0, _toConsumableArray2.default)(item['__infuse_serial__'] || resources), ['virtual']))
     }));
   });
-  return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, Object.keys(params).length > 0 && /*#__PURE__*/_react.default.createElement(_luckDesign.ResultSet, (0, _extends2.default)({
+  return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, (0, _lodash.difference)(Object.keys(params), resultSet.invisibleSet || []).length > 0 && /*#__PURE__*/_react.default.createElement(_luckDesign.ResultSet, (0, _extends2.default)({
     set: params,
     onQuery: onQuery
   }, resultSet, {

package/lib/components/LdFormList/index.js

@@ -70,16 +70,17 @@ var LdFormList = function LdFormList(_ref) {
   (0, _react.useImperativeHandle)(wrapperRef, function () {
     return (0, _objectSpread2.default)((0, _objectSpread2.default)({}, formListRef.current), {}, {
       onLdQuery: function onLdQuery() {
-        var _getDvaApp;
         var _params = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
-        (_getDvaApp = (0, _umi.getDvaApp)()) === null || _getDvaApp === void 0 ? void 0 : _getDvaApp._store.dispatch({
-          type: "".concat(namespace, "/setTicketData"),
-          payload: {
-            ticketData: (0, _objectSpread2.default)((0, _objectSpread2.default)({}, props.ticketData), _params)
-          }
-        }).then(function () {
-          formListRef.current.doQuery(null, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, props.ticketData), _params));
-        });
+        if (props.formMode !== 'add') {
+          var _getDvaApp;
+          (_getDvaApp = (0, _umi.getDvaApp)()) === null || _getDvaApp === void 0 ? void 0 : _getDvaApp._store.dispatch({
+            type: "".concat(namespace, "/setTicketData"),
+            payload: {
+              ticketData: (0, _objectSpread2.default)((0, _objectSpread2.default)({}, props.ticketData), _params)
+            }
+          });
+          formListRef.current.doQuery();
+        }
       }
     });
   });
@@ -89,7 +90,7 @@ var LdFormList = function LdFormList(_ref) {
     var data = formRefs && Object.keys(formRefs).map(function (key) {
       var _formRefs$key$current;
       var getValue = formRefs[key].getData || ((_formRefs$key$current = formRefs[key].current) === null || _formRefs$key$current === void 0 ? void 0 : _formRefs$key$current.getFieldsValue);
-      return (0, _defineProperty2.default)({}, key, getValue());
+      return (0, _defineProperty2.default)({}, key, getValue && getValue());
     });
     onValueChange(change, data);
   });
@@ -128,34 +129,25 @@ var LdFormList = function LdFormList(_ref) {
         } else {
           var _formListRef$current;
           props.parentModelName && ((_formListRef$current = formListRef.current) === null || _formListRef$current === void 0 ? void 0 : _formListRef$current.doParentsQuery());
-          // if (
-          //   !formWindow &&
-          //   formMode === 'add' &&
-          //   window.__INJECTED_FLOAT_MICRO_APP_BY_QIANKUN
-          // ) {
-          //   const { pathname, query } = history.location;
-          //   const _pathname = pathname.replace(
-          //     /\/0(?=[?]|[\/]$|$)/g,
-          //     `/${indocno}?`,
-          //   );
-          //   window.openUrl(
-          //     `layer:${_pathname}${stringify({
-          //       ...query,
-          //       title: window.__INJECTED_APP_NAME_BY_QIANKUN__,
-          //     })}`,
-          //   );
-          // } else {
-          formListRef.current.onQuery(null, (0, _defineProperty2.default)({}, mainFormLdId, {
-            indocno: indocno
-          }), function () {
-            return formListRef.current.setFormMode('edit');
-          });
-          // }
+          if (!formWindow && formMode === 'add' && window.__INJECTED_FLOAT_MICRO_APP_BY_QIANKUN) {
+            var _history$location = _umi.history.location,
+              pathname = _history$location.pathname,
+              query = _history$location.query;
+            var _pathname = pathname.replace(/\/0(?=[?]|[\/]$|$)/g, "/".concat(indocno, "?"));
+            window.openUrl("layer:".concat(_pathname).concat((0, _querystring.stringify)((0, _objectSpread2.default)((0, _objectSpread2.default)({}, query), {}, {
+              title: window.__INJECTED_APP_NAME_BY_QIANKUN__
+            }))));
+          } else {
+            formListRef.current.onQuery(null, (0, _defineProperty2.default)({}, mainFormLdId, {
+              indocno: indocno
+            }), function () {
+              return formListRef.current.setFormMode('info');
+            });
+          }
         }
       }
     });
   };
-
   var formConfig = (0, _objectSpread2.default)((0, _objectSpread2.default)({
     formState: formState,
     formMode: formMode,

package/lib/components/LdGrid/index.js

@@ -21,7 +21,7 @@ var _ldBuilder = _interopRequireDefault(require("../../helper/ldBuilder"));
 var _utils = require("../../utils");
 var _model = _interopRequireDefault(require("./model"));
 var _excluded = ["columns", "resources", "actions", "doAction", "afterInit", "namespace", "wrapperRef", "list", "detail", "params", "filters", "loading", "unclosableSet", "onQuery", "doQuery", "pageno", "pagesize", "totalCount", "columnsRewrite", "columnsReset", "batchOperations", "formatDataSource", "resultSet", "actionsColumn", "readFilter", "isFlow", "isTreeGrid"],
-  _excluded2 = ["ldId", "moduleCode", "suppressInit", "overModel", "afterQuery"];
+  _excluded2 = ["ldId", "moduleCode", "suppressInit", "overModel", "afterQuery", "isTreeGrid"];
 var LdGrid = function LdGrid(_ref) {
   var columns = _ref.columns,
     resources = _ref.resources,
@@ -107,7 +107,7 @@ var LdGrid = function LdGrid(_ref) {
         result.push(customColumns[field]);
       } else if (defaultColumns[field].isShowInGrid)
         // 数据集中存在的字段和自定义结合展示
-        result.push((0, _utils.getGridColumn)(defaultColumns[field], customColumns[field] || {}));
+        result.push((0, _utils.getGridColumn)(defaultColumns[field], customColumns[field] || {}, isTreeGrid));
     }, []);
   }, [columns, columnsRewrite, columnsReset]);
   var _actionsColumn = (0, _ahooks.useCreation)(function () {
@@ -146,7 +146,8 @@ var LdGrid = function LdGrid(_ref) {
       pageSize: pageSize
     },
     dataSource: formatDataSource(list, detail),
-    resultSet: _resultSet
+    resultSet: _resultSet,
+    gridId: namespace
   }, treeConfig, props, {
     modelName: namespace,
     operates: [].concat((0, _toConsumableArray2.default)(resources), ['virtual']),
@@ -164,8 +165,9 @@ var LdIndex = function LdIndex(_ref2) {
     suppressInit = _ref2.suppressInit,
     overModel = _ref2.overModel,
     afterQuery = _ref2.afterQuery,
+    _isTreeGrid = _ref2.isTreeGrid,
     props = (0, _objectWithoutProperties2.default)(_ref2, _excluded2);
-  var isTreeGrid = (0, _lodash.includes)(props.isTree, props.dataSetKey);
+  var isTreeGrid = (0, _lodash.isNil)(_isTreeGrid) ? (0, _lodash.includes)(props.isTree, props.dataSetKey) : _isTreeGrid;
   var Component = (0, _ahooks.useCreation)(function () {
     var _getDvaApp, _getDvaApp2;
     (_getDvaApp = (0, _umi.getDvaApp)()) === null || _getDvaApp === void 0 ? void 0 : _getDvaApp.unmodel(namespace);

package/lib/utils/grid.js

@@ -15,7 +15,7 @@ var _moment = _interopRequireDefault(require("moment"));
 var _form = require("../helper/form");
 var _utils = require("@luck-design-biz/base/utils");
 var _excluded = ["comName", "property"],
-  _excluded2 = ["name", "isVr"],
+  _excluded2 = ["name"],
   _excluded3 = ["filter", "filterParams"];
 var _getDvaApp;
 var _getDvaApp$_store = (_getDvaApp = (0, _umi.getDvaApp)()) === null || _getDvaApp === void 0 ? void 0 : _getDvaApp._store,
@@ -88,10 +88,11 @@ var getGridColumn = function getGridColumn() {
     property = _ref.property,
     props = (0, _objectWithoutProperties2.default)(_ref, _excluded);
   var customProps = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
+  var isTreeGrid = arguments.length > 2 ? arguments[2] : undefined;
+  var _props$isVirtual = props.isVirtual,
+    isVirtual = _props$isVirtual === void 0 ? false : _props$isVirtual;
   var _translator = (0, _form.translator)(props),
     name = _translator.name,
-    _translator$isVr = _translator.isVr,
-    isVr = _translator$isVr === void 0 ? false : _translator$isVr,
     translateProps = (0, _objectWithoutProperties2.default)(_translator, _excluded2);
   var _merge = (0, _lodash.merge)(translateProps, (0, _form.formatCustomProps)(customProps)),
     filter = _merge.filter,
@@ -102,13 +103,13 @@ var getGridColumn = function getGridColumn() {
     title: _props.label,
     render: _props.render || getColumnRender(name, comName || _form.defaultComName[property], _props)
   };
+  if (isTreeGrid || isVirtual || (0, _lodash.includes)(['user', 'select', 'group', 'switch', 'color', 'region'], comName || _form.defaultComName[property])) data.sortable = false;
   // data.filter = false;
   if (filter) {
     // 因为后端升级问题，暂时关闭过滤功能
     data.filter = filter;
     data.filterParams = filterParams;
-  }
-  if (!isVr && !filter) {
+  } else if (!isTreeGrid && !isVirtual) {
     switch (comName || _form.defaultComName[property]) {
       case 'switch':
         data.filter = 'select';
@@ -196,8 +197,9 @@ var getGridColumn = function getGridColumn() {
         };
         break;
       default:
+        data.filter = 'text';
     }
-  }
+  } else data.filter = false;
   return data;
 };
 exports.getGridColumn = getGridColumn;

package/package.json

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