@luck-design-biz/luckda 0.0.20-UI-1 → 0.0.21-UI-1

package/es/components/LdCard/index.js

@@ -7,7 +7,7 @@ var _excluded = ["columns", "resources", "actions", "doAction", "afterInit", "na
 import React, { forwardRef, useImperativeHandle, useRef, useEffect } from 'react';
 import { getDvaApp } from 'umi';
 import PropTypes from 'prop-types';
-import { Icon, Tooltip } from 'antd';
+import { Icon, Tooltip } from 'luck-design/antd';
 import { ResultSet, PermissionUtil } from 'luck-design';
 import { includes, difference } from 'lodash';
 import { useCreation, useMemoizedFn } from 'ahooks';

package/es/components/LdCom/index.js

@@ -2,7 +2,7 @@ import _extends from "@babel/runtime/helpers/esm/extends";
 import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
 var _excluded = ["options"];
 import React from 'react';
-import { Button, Tabs } from 'antd';
+import { Button, Tabs } from 'luck-design/antd';
 import { Collapse, ButtonRadio, IconFont } from '@luck-design-biz/base';
 import { ldComBuilder, filterOptions, deepFilterCom } from '../../helper/ldComBuild';
 export var LdButton = ldComBuilder(Button);

package/es/components/LdFormList/index.js

@@ -25,7 +25,7 @@ import { LuckDaPopContext } from '../LdPop';
 import createModel from './model';
 import { onBatchSubmitAction } from '../../helper/action';
 import { isArray, sortBy, mapValues } from 'lodash';
-import { BpmButton } from '@luck-design-biz/base/bpm';
+import { BpmButton } from '@luck-design-biz/bpm';
 import { readBehaviorCall } from '../../services';
 import { parse, stringify } from 'querystring';
 
@@ -71,7 +71,7 @@ var LdFormList = function LdFormList(_ref) {
     bizData = _useState6[0],
     setBizData = _useState6[1];
   var luckTheme = useCreation(function () {
-    return document.body.getAttribute("luck-theme");
+    return document.body.getAttribute('luck-theme');
   }, []);
   var _ref2 = useContext(LuckDaPopContext) || {},
     defaultLayout = _ref2.affixLayout;
@@ -121,7 +121,7 @@ var LdFormList = function LdFormList(_ref) {
       bizData: bizData,
       suppressDept: false,
       showHistory: luckTheme === 'base' ? 'sider' : 'drawer',
-      placement: luckTheme === 'base' && (affixLayout || defaultLayout) !== 'top' ? "topRight" : "bottomRight"
+      placement: luckTheme === 'base' && (affixLayout || defaultLayout) !== 'top' ? 'topRight' : 'bottomRight'
     }, bpmButtonProps)));
   };
   useAsyncEffect( /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {

package/es/components/LdGrid/index.js

@@ -143,7 +143,8 @@ var LdGrid = function LdGrid(_ref) {
     },
     dataSource: formatDataSource(list, detail),
     resultSet: _resultSet,
-    gridId: namespace
+    gridId: namespace,
+    showSmartSearch: true
   }, treeConfig, props, {
     modelName: namespace,
     operates: [].concat(_toConsumableArray(resources), ['virtual']),

package/es/components/LdGrid/model.js

@@ -1,6 +1,7 @@
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
-var _excluded = ["readAll", "moduleCode", "dataSetKey", "behaviorKey", "afterQuery"];
+var _excluded = ["readAll", "moduleCode", "dataSetKey", "behaviorKey", "afterQuery"],
+  _excluded2 = ["_MultiFieldFilter"];
 import { createMainModel } from '@luck-design-biz/base/utils/modelHelper';
 import { behaviorCall } from '../../utils';
 export default function (namespace) {
@@ -17,12 +18,16 @@ export default function (namespace) {
       var get = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
       var post = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
       return new Promise(function (resolve) {
+        var _ref = post || {},
+          _MultiFieldFilter = _ref._MultiFieldFilter,
+          _AutoFilter = _objectWithoutProperties(_ref, _excluded2);
         (_readAll || behaviorCall)(_objectSpread({
           moduleCode: moduleCode,
           datasetCode: dataSetKey,
           behaviorKey: behaviorKey
         }, get), {
-          _AutoFilter: post
+          _AutoFilter: _AutoFilter,
+          _MultiFieldFilter: _MultiFieldFilter === null || _MultiFieldFilter === void 0 ? void 0 : _MultiFieldFilter.filter
         }).then(function (res) {
           afterQuery && afterQuery(res);
           resolve(res);

package/es/components/LdTree/index.js

@@ -10,7 +10,7 @@ import { isFunction, isNumber, transform, includes, remove, cloneDeep, keys } fr
 import { useRequest, useMemoizedFn, useCreation } from 'ahooks';
 import PropTypes from 'prop-types';
 import classNames from 'classnames';
-import { Icon, Popover } from 'antd';
+import { Icon, Popover } from 'luck-design/antd';
 import { LuckTree } from 'luck-design';
 import { formatMessage, dataToTree, dragTreeData } from '@luck-design-biz/base/utils';
 import { TreeBox } from '@luck-design-biz/base';

package/es/helper/action.js

@@ -1,7 +1,7 @@
 import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 // 通用方法
-import { Modal } from 'antd';
+import { Modal } from 'luck-design/antd';
 import { showPop, formatMessage } from '@luck-design-biz/base/utils';
 import { transform, isArray, startsWith, keyBy } from 'lodash';
 import { dataFormat, behaviorCall } from '../utils';

package/es/services.js

@@ -30,7 +30,10 @@ function _readBehaviorCall() {
         case 0:
           return _context2.abrupt("return", request("".concat(api.LUCKDA_HOST, "/to/behavior/call?").concat(stringify(get)), {
             method: 'POST',
-            body: post
+            body: post,
+            headers: {
+              'Content-Type': 'application/json;charset=UTF-8'
+            }
           }));
         case 1:
         case "end":

package/es/upload/Form/gridForm.js

@@ -6,7 +6,7 @@ var _excluded = ["formId", "formRef", "showNote", "operates", "loading", "upload
 import React, { useState, useRef, forwardRef } from 'react';
 import { getDvaApp } from 'umi';
 import { useMemoizedFn } from 'ahooks';
-import { Button, Upload, Tooltip, Icon } from 'antd';
+import { Button, Upload, Tooltip, Icon } from 'luck-design/antd';
 import moment from 'moment';
 import { last } from 'lodash';
 import { BasicForm, BasicFormItem, PopWindow } from 'luck-design';

package/es/upload/GridCell/index.js

@@ -1,5 +1,5 @@
 import React from 'react';
-import { Popover, Icon } from 'antd';
+import { Popover, Icon } from 'luck-design/antd';
 var UploadGridCell = function UploadGridCell(_ref) {
   var _ref$fileList = _ref.fileList,
     fileList = _ref$fileList === void 0 ? [] : _ref$fileList,

package/es/utils/grid.js

@@ -7,7 +7,7 @@ var _excluded = ["comName", "property"],
 import React from "react";
 import { getDvaApp } from 'umi';
 import { merge, isNil, isArray, includes, capitalize } from 'lodash';
-import { Switch, Tag } from 'antd';
+import { Switch, Tag } from 'luck-design/antd';
 import moment from 'moment';
 import UploadGridCell from '../upload/GridCell';
 import { formatMessage } from '@luck-design-biz/base/utils';

package/lib/components/LdCard/index.js

@@ -13,7 +13,7 @@ var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/h
 var _react = _interopRequireWildcard(require("react"));
 var _umi = require("umi");
 var _propTypes = _interopRequireDefault(require("prop-types"));
-var _antd = require("antd");
+var _antd = require("luck-design/antd");
 var _luckDesign = require("luck-design");
 var _lodash = require("lodash");
 var _ahooks = require("ahooks");

package/lib/components/LdCom/index.js

@@ -8,7 +8,7 @@ exports.LdTabs = exports.LdIconFont = exports.LdCollapse = exports.LdButtonRadio
 var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
 var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));
 var _react = _interopRequireDefault(require("react"));
-var _antd = require("antd");
+var _antd = require("luck-design/antd");
 var _base = require("@luck-design-biz/base");
 var _ldComBuild = require("../../helper/ldComBuild");
 var _excluded = ["options"];

package/lib/components/LdFormList/index.js

@@ -29,7 +29,7 @@ var _LdPop = require("../LdPop");
 var _model = _interopRequireDefault(require("./model"));
 var _action = require("../../helper/action");
 var _lodash = require("lodash");
-var _bpm = require("@luck-design-biz/base/bpm");
+var _bpm = require("@luck-design-biz/bpm");
 var _services = require("../../services");
 var _querystring = require("querystring");
 var _excluded = ["namespace", "formState", "formMode", "formOperates", "loading", "wrapperRef", "readOnly", "mainFormLdId", "renderFormList", "renderAffixLeft", "renderAffixRight", "beforeSubmit", "showSaveBtn", "saveBtnTitle", "affixLayout", "onValueChange", "afterSubmit", "renderFormExtra", "bpmButtonProps"],
@@ -78,7 +78,7 @@ var LdFormList = function LdFormList(_ref) {
     bizData = _useState6[0],
     setBizData = _useState6[1];
   var luckTheme = (0, _ahooks.useCreation)(function () {
-    return document.body.getAttribute("luck-theme");
+    return document.body.getAttribute('luck-theme');
   }, []);
   var _ref2 = (0, _react.useContext)(_LdPop.LuckDaPopContext) || {},
     defaultLayout = _ref2.affixLayout;
@@ -128,7 +128,7 @@ var LdFormList = function LdFormList(_ref) {
       bizData: bizData,
       suppressDept: false,
       showHistory: luckTheme === 'base' ? 'sider' : 'drawer',
-      placement: luckTheme === 'base' && (affixLayout || defaultLayout) !== 'top' ? "topRight" : "bottomRight"
+      placement: luckTheme === 'base' && (affixLayout || defaultLayout) !== 'top' ? 'topRight' : 'bottomRight'
     }, bpmButtonProps)));
   };
   (0, _ahooks.useAsyncEffect)( /*#__PURE__*/(0, _asyncToGenerator2.default)( /*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee() {

package/lib/components/LdGrid/index.js

@@ -151,7 +151,8 @@ var LdGrid = function LdGrid(_ref) {
     },
     dataSource: formatDataSource(list, detail),
     resultSet: _resultSet,
-    gridId: namespace
+    gridId: namespace,
+    showSmartSearch: true
   }, treeConfig, props, {
     modelName: namespace,
     operates: [].concat((0, _toConsumableArray2.default)(resources), ['virtual']),

package/lib/components/LdGrid/model.js

@@ -9,7 +9,8 @@ var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/obje
 var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));
 var _modelHelper = require("@luck-design-biz/base/utils/modelHelper");
 var _utils = require("../../utils");
-var _excluded = ["readAll", "moduleCode", "dataSetKey", "behaviorKey", "afterQuery"];
+var _excluded = ["readAll", "moduleCode", "dataSetKey", "behaviorKey", "afterQuery"],
+  _excluded2 = ["_MultiFieldFilter"];
 function _default(namespace) {
   var modelProps = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
   var _readAll = modelProps.readAll,
@@ -24,12 +25,16 @@ function _default(namespace) {
       var get = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
       var post = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
       return new Promise(function (resolve) {
+        var _ref = post || {},
+          _MultiFieldFilter = _ref._MultiFieldFilter,
+          _AutoFilter = (0, _objectWithoutProperties2.default)(_ref, _excluded2);
         (_readAll || _utils.behaviorCall)((0, _objectSpread2.default)({
           moduleCode: moduleCode,
           datasetCode: dataSetKey,
           behaviorKey: behaviorKey
         }, get), {
-          _AutoFilter: post
+          _AutoFilter: _AutoFilter,
+          _MultiFieldFilter: _MultiFieldFilter === null || _MultiFieldFilter === void 0 ? void 0 : _MultiFieldFilter.filter
         }).then(function (res) {
           afterQuery && afterQuery(res);
           resolve(res);

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");

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");

package/lib/services.js

@@ -38,7 +38,10 @@ function _readBehaviorCall() {
         case 0:
           return _context2.abrupt("return", (0, _utils.request)("".concat(_ApiConfig.default.LUCKDA_HOST, "/to/behavior/call?").concat((0, _querystring.stringify)(get)), {
             method: 'POST',
-            body: post
+            body: post,
+            headers: {
+              'Content-Type': 'application/json;charset=UTF-8'
+            }
           }));
         case 1:
         case "end":

package/lib/upload/Form/gridForm.js

@@ -13,7 +13,7 @@ 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");

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,

package/lib/utils/grid.js

@@ -13,7 +13,7 @@ var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/h
 var _react = _interopRequireDefault(require("react"));
 var _umi = require("umi");
 var _lodash = require("lodash");
-var _antd = require("antd");
+var _antd = require("luck-design/antd");
 var _moment = _interopRequireDefault(require("moment"));
 var _GridCell = _interopRequireDefault(require("../upload/GridCell"));
 var _utils = require("@luck-design-biz/base/utils");

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@luck-design-biz/luckda",
-  "version": "0.0.20-UI-1",
+  "version": "0.0.21-UI-1",
   "scripts": {
     "start": "dumi dev",
     "docs:build": "dumi build",
@@ -42,7 +42,6 @@
   "dependencies": {
     "@babel/runtime": "^7.18.9",
     "ahooks": "^3.7.0",
-    "antd": "^3.26.6",
     "classnames": "^2.3.1",
     "lodash": "^4.17.11",
     "moment": "^2.24.0",
@@ -62,6 +61,7 @@
   },
   "peerDependencies": {
     "@luck-design-biz/base": ">= 0.0.10",
+    "@luck-design-biz/bpm": ">= 0.0.1",
     "luck-design": ">=0.1.51"
   },
   "description": "前端配置管理中心业务组件库",