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

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/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

@@ -114,17 +114,17 @@ var UploadGridForm = function UploadGridForm(_ref) {
     }
     if (file.status === 'done' && file.response && file.response.code === 1) {
       var _file$response2 = file.response,
-        _list = _file$response2.list,
-        _detail = _file$response2.detail;
+        list = _file$response2.list,
+        detail = _file$response2.detail;
       var data = {
-        uid: _detail[_list[0]].fileName,
+        uid: detail[list[0]].fileName,
         name: file.name,
         size: file.size,
-        fileId: _detail[_list[0]].fileName,
-        stype: _detail[_list[0]].fileExt,
+        fileId: detail[list[0]].fileName,
+        stype: detail[list[0]].fileExt,
         username: currentUser && currentUser.sname,
         uploadDate: moment().valueOf(),
-        previewUrl: _detail[_list[0]].previewUrl
+        previewUrl: detail[list[0]].previewUrl
       };
       gridRef.current.changeData(null, data);
     }
@@ -157,17 +157,18 @@ var UploadGridForm = function UploadGridForm(_ref) {
         data: formData
       }).then(function (res) {
         var code = res.code,
-          content = res.content;
+          list = res.list,
+          detail = res.detail;
         if (code === 1) {
           setUploadLoading(false);
           setVisible(false);
-          content.forEach(function (file, index) {
+          list.forEach(function (i) {
             var data = {
-              uid: detail[list[0]].fileName,
-              name: values.files[index].name,
-              size: values.files[index].size,
-              stype: file.fileExt,
-              fileId: detail[list[0]].fileName,
+              uid: detail[i].fileName,
+              name: detail[i].origFileName,
+              size: detail[i].fileSize,
+              stype: detail[i].fileExt,
+              fileId: detail[i].fileName,
               username: currentUser && currentUser.sname,
               note: snote,
               uploadDate: moment().valueOf(),

package/es/upload/Form/index.js

@@ -14,7 +14,8 @@ function buildComponent(props) {
     _props$note = props.note,
     note = _props$note === void 0 ? '' : _props$note,
     rest = _objectWithoutProperties(props, _excluded);
-  var formId = "annex_".concat(_formId);
+  var formId = "annex_".concat(_formId); //
+
   var getUrl = function getUrl(behaviorKey, _note, docUid) {
     var ticketData = rest.ticketData,
       formData = rest.formData,

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/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

@@ -122,17 +122,17 @@ var UploadGridForm = function UploadGridForm(_ref) {
     }
     if (file.status === 'done' && file.response && file.response.code === 1) {
       var _file$response2 = file.response,
-        _list = _file$response2.list,
-        _detail = _file$response2.detail;
+        list = _file$response2.list,
+        detail = _file$response2.detail;
       var data = {
-        uid: _detail[_list[0]].fileName,
+        uid: detail[list[0]].fileName,
         name: file.name,
         size: file.size,
-        fileId: _detail[_list[0]].fileName,
-        stype: _detail[_list[0]].fileExt,
+        fileId: detail[list[0]].fileName,
+        stype: detail[list[0]].fileExt,
         username: currentUser && currentUser.sname,
         uploadDate: (0, _moment.default)().valueOf(),
-        previewUrl: _detail[_list[0]].previewUrl
+        previewUrl: detail[list[0]].previewUrl
       };
       gridRef.current.changeData(null, data);
     }
@@ -165,17 +165,18 @@ var UploadGridForm = function UploadGridForm(_ref) {
         data: formData
       }).then(function (res) {
         var code = res.code,
-          content = res.content;
+          list = res.list,
+          detail = res.detail;
         if (code === 1) {
           setUploadLoading(false);
           setVisible(false);
-          content.forEach(function (file, index) {
+          list.forEach(function (i) {
             var data = {
-              uid: detail[list[0]].fileName,
-              name: values.files[index].name,
-              size: values.files[index].size,
-              stype: file.fileExt,
-              fileId: detail[list[0]].fileName,
+              uid: detail[i].fileName,
+              name: detail[i].origFileName,
+              size: detail[i].fileSize,
+              stype: detail[i].fileExt,
+              fileId: detail[i].fileName,
               username: currentUser && currentUser.sname,
               note: snote,
               uploadDate: (0, _moment.default)().valueOf(),

package/lib/upload/Form/index.js

@@ -21,7 +21,8 @@ function buildComponent(props) {
     _props$note = props.note,
     note = _props$note === void 0 ? '' : _props$note,
     rest = (0, _objectWithoutProperties2.default)(props, _excluded);
-  var formId = "annex_".concat(_formId);
+  var formId = "annex_".concat(_formId); //
+
   var getUrl = function getUrl(behaviorKey, _note, docUid) {
     var ticketData = rest.ticketData,
       formData = rest.formData,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@luck-design-biz/luckda",
-  "version": "0.0.20-UI-1",
+  "version": "0.0.21-1",
   "scripts": {
     "start": "dumi dev",
     "docs:build": "dumi build",
@@ -62,6 +62,7 @@
   },
   "peerDependencies": {
     "@luck-design-biz/base": ">= 0.0.10",
+    "@luck-design-biz/bpm": ">= 0.0.1",
     "luck-design": ">=0.1.51"
   },
   "description": "前端配置管理中心业务组件库",