@luck-design-biz/luckda 0.0.11 → 0.0.12-2

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -87,8 +87,7 @@ var buildLdAutoForm = function buildLdAutoForm(_ref) {
87
87
  var behaviorKey = arguments.length > 1 ? arguments[1] : undefined;
88
88
  return _objectSpread(_objectSpread({
89
89
  api: function api(get, post, formData) {
90
- var _formData$mainFormLdI;
91
- post[dataSetKey][isMain ? 'indocno' : 'relationId'] = ((_formData$mainFormLdI = formData[mainFormLdId]) === null || _formData$mainFormLdI === void 0 ? void 0 : _formData$mainFormLdI.indocno) || ticketData.indocno;
90
+ post[dataSetKey][isMain ? 'indocno' : 'relationId'] = formData[mainFormLdId] && formData[mainFormLdId][window.appConfig.constraintKeys.PRIMARY] || ticketData[window.appConfig.constraintKeys.PRIMARY];
92
91
  return behaviorCall(get, post, formData);
93
92
  },
94
93
  get: function get() {
@@ -117,8 +116,8 @@ var buildLdAutoForm = function buildLdAutoForm(_ref) {
117
116
  onQuery: _objectSpread(_objectSpread({
118
117
  api: behaviorCall,
119
118
  get: function get(formData) {
120
- var _formData$mainFormLdI2, _params2;
121
- var _params = (_params2 = {}, _defineProperty(_params2, isMain ? 'indocno' : 'relationId', ((_formData$mainFormLdI2 = formData[mainFormLdId]) === null || _formData$mainFormLdI2 === void 0 ? void 0 : _formData$mainFormLdI2.indocno) || ticketData.indocno), _defineProperty(_params2, "moduleCode", moduleCode), _defineProperty(_params2, "datasetCode", dataSetKey), _defineProperty(_params2, "behaviorKey", 'readForm'), _params2);
119
+ var _params2;
120
+ var _params = (_params2 = {}, _defineProperty(_params2, isMain ? 'indocno' : 'relationId', formData[mainFormLdId] && formData[mainFormLdId][window.appConfig.constraintKeys.PRIMARY] || ticketData[window.appConfig.constraintKeys.PRIMARY]), _defineProperty(_params2, "moduleCode", moduleCode), _defineProperty(_params2, "datasetCode", dataSetKey), _defineProperty(_params2, "behaviorKey", 'readForm'), _params2);
122
121
  if (!isMain) _params.relationDs = mainDataSetKey;
123
122
  return _params;
124
123
  }
@@ -174,7 +174,9 @@ Index.propTypes = {
174
174
  // 卡片配置项
175
175
  onOperationsClick: PropTypes.func,
176
176
  // 操作
177
- cardActions: PropTypes.array // 卡片行为
177
+ cardActions: PropTypes.array,
178
+ // 卡片行为
179
+ cardKey: PropTypes.string // 卡片主键
178
180
  };
179
181
 
180
182
  Index.defaultProps = {
@@ -183,12 +185,13 @@ Index.defaultProps = {
183
185
  isFlow: false,
184
186
  cardConfig: {},
185
187
  formatDataSource: function formatDataSource(_list, _detail) {
186
- return _list.map(function (indocno) {
187
- return _detail[indocno];
188
+ return _list.map(function (id) {
189
+ return _detail[id];
188
190
  });
189
191
  },
190
192
  cardActions: [],
191
- overModel: {}
193
+ overModel: {},
194
+ cardKey: window.appConfig.constraintKeys.PRIMARY
192
195
  };
193
196
  export default /*#__PURE__*/forwardRef(function (props, ref) {
194
197
  return /*#__PURE__*/React.createElement(Index, _extends({
@@ -4,15 +4,14 @@ import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
4
4
  import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
5
5
  import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
6
6
  var _excluded = ["namespace", "formState", "formMode", "loading", "wrapperRef", "readOnly", "mainFormLdId", "renderFormList", "renderAffixLeft", "renderAffixRight", "beforeSubmit", "showSaveBtn", "saveBtnTitle", "affixLayout", "onValueChange", "afterSubmit", "renderFormExtra"],
7
- _excluded2 = ["id", "header", "title", "readOnly", "extraConfig"],
7
+ _excluded2 = ["id", "header", "title", "readOnly", "extraConfig", "renderTopLeft"],
8
8
  _excluded3 = ["ldId", "initData", "overModel"];
9
9
  import React, { useContext, useRef, forwardRef, Fragment, useImperativeHandle, useState } from 'react';
10
- import { stringify } from 'querystring';
11
- import { connect, getDvaApp, useRouteMatch, history } from 'umi';
10
+ import { connect, getDvaApp, useRouteMatch } from 'umi';
12
11
  import PropTypes from 'prop-types';
13
12
  import { useCreation, useMemoizedFn } from 'ahooks';
14
13
  import { BasicDivider } from 'luck-design';
15
- import { formatMessage, ChildrenUtil } from '@luck-design-biz/base/utils';
14
+ import { ChildrenUtil } from '@luck-design-biz/base/utils';
16
15
  import { FormList, FormListAffix, FormBtn } from '@luck-design-biz/base/FormList';
17
16
  import buildLdAutoForm from '../LdAutoForm';
18
17
  import buildLdGridForm from '../LdGridForm';
@@ -87,15 +86,9 @@ var LdFormList = function LdFormList(_ref) {
87
86
  });
88
87
  onValueChange(change, data);
89
88
  });
90
- var renderExtra = useMemoizedFn(function (formId, extraConfig) {
91
- return /*#__PURE__*/React.createElement(React.Fragment, null, window['g_sessionStore'].get(window.appConfig['matchPresetAdmin']) === '1' && RUNTIME === 'dev' && /*#__PURE__*/React.createElement("a", {
92
- onClick: function onClick() {
93
- return readFieldProps(formId);
94
- }
95
- }, formatMessage({
96
- id: 'app.luckda.button.readConfig',
97
- label: '查看配置'
98
- })), /*#__PURE__*/React.createElement(FormBtn, _extends({
89
+ var renderExtra = useMemoizedFn(function (formId, extraConfig, type) {
90
+ return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(FormBtn, _extends({
91
+ type: type,
99
92
  formId: formId
100
93
  }, extraConfig)));
101
94
  });
@@ -114,11 +107,11 @@ var LdFormList = function LdFormList(_ref) {
114
107
  formData: props.formData,
115
108
  form_id: formKey,
116
109
  effcode: formCode
117
- }, function (success, indocno, res) {
110
+ }, function (success, mainKey, res) {
118
111
  setSubmitLoading(false);
119
112
  if (success) {
120
113
  if (afterSubmit) {
121
- afterSubmit(success, indocno, res);
114
+ afterSubmit(success, mainKey, res);
122
115
  } else {
123
116
  var _formListRef$current;
124
117
  props.parentModelName && ((_formListRef$current = formListRef.current) === null || _formListRef$current === void 0 ? void 0 : _formListRef$current.doParentsQuery());
@@ -135,9 +128,7 @@ var LdFormList = function LdFormList(_ref) {
135
128
  // })}`,
136
129
  // );
137
130
  // } else {
138
- formListRef.current.onQuery(null, _defineProperty({}, mainFormLdId, {
139
- indocno: indocno
140
- }), function () {
131
+ formListRef.current.onQuery(null, _defineProperty({}, mainFormLdId, _defineProperty({}, window.appConfig.constraintKeys.PRIMARY, mainKey)), function () {
141
132
  return formListRef.current.setFormMode('info');
142
133
  });
143
134
  // }
@@ -190,13 +181,17 @@ var LdFormList = function LdFormList(_ref) {
190
181
  _readOnly = _ref8.readOnly,
191
182
  _ref8$extraConfig = _ref8.extraConfig,
192
183
  extraConfig = _ref8$extraConfig === void 0 ? {} : _ref8$extraConfig,
184
+ _ref8$renderTopLeft = _ref8.renderTopLeft,
185
+ _renderTopLeft = _ref8$renderTopLeft === void 0 ? function () {
186
+ return /*#__PURE__*/React.createElement(React.Fragment, null);
187
+ } : _ref8$renderTopLeft,
193
188
  _props = _objectWithoutProperties(_ref8, _excluded2);
194
189
  var _props$type = _props.type,
195
190
  type = _props$type === void 0 ? 'auto' : _props$type;
196
191
  var renderForm = type === 'auto' ? buildLdAutoForm : buildLdGridForm;
197
192
  if (header === 'collapse' || header === 'collapseFollow') return /*#__PURE__*/React.createElement(Collapse, {
198
193
  title: title || ldId,
199
- extra: renderExtra(ldId, extraConfig),
194
+ extra: type === 'auto' && renderExtra(ldId, extraConfig, 'graphic'),
200
195
  id: ldId,
201
196
  key: ldId,
202
197
  mode: header === 'collapse' && ldId !== mainFormLdId && 'tab'
@@ -208,18 +203,21 @@ var LdFormList = function LdFormList(_ref) {
208
203
  onValueChange: handleValueChange,
209
204
  ticketData: props.ticketData,
210
205
  formRef: formListRef,
211
- formMode: formMode
206
+ formMode: formMode,
207
+ renderTopLeft: function renderTopLeft() {
208
+ return type === 'auto' ? _renderTopLeft() : [renderExtra(ldId, extraConfig, 'text'), _renderTopLeft()];
209
+ }
212
210
  })));
213
211
  return /*#__PURE__*/React.createElement(Fragment, {
214
212
  key: ldId
215
213
  }, header === 'divider' && /*#__PURE__*/React.createElement(BasicDivider, {
216
214
  title: title || ldId,
217
215
  id: ldId
218
- }), /*#__PURE__*/React.createElement("div", {
216
+ }), type === 'auto' && /*#__PURE__*/React.createElement("div", {
219
217
  style: {
220
218
  textAlign: 'right'
221
219
  }
222
- }, renderExtra(ldId, extraConfig)), renderForm(_objectSpread(_objectSpread({}, _props), {}, {
220
+ }, renderExtra(ldId, extraConfig, 'graphic')), renderForm(_objectSpread(_objectSpread({}, _props), {}, {
223
221
  ldId: ldId,
224
222
  mainFormLdId: mainFormLdId,
225
223
  mainDataSetKey: mainDataSetKey,
@@ -227,7 +225,10 @@ var LdFormList = function LdFormList(_ref) {
227
225
  onValueChange: handleValueChange,
228
226
  ticketData: props.ticketData,
229
227
  formRef: formListRef,
230
- formMode: formMode
228
+ formMode: formMode,
229
+ renderTopLeft: function renderTopLeft() {
230
+ return type === 'auto' ? _renderTopLeft() : [renderExtra(ldId, extraConfig, 'graphic'), _renderTopLeft()];
231
+ }
231
232
  })));
232
233
  }), ChildrenUtil.deepMap(renderFormExtra(formConfig), function (child) {
233
234
  var _child$type;
@@ -206,7 +206,9 @@ Index.propTypes = {
206
206
  // 行操作
207
207
  suppressInit: PropTypes.bool,
208
208
  // 抑制初始化
209
- afterInit: PropTypes.func // 初始化后
209
+ afterInit: PropTypes.func,
210
+ // 初始化后
211
+ rowKey: PropTypes.string // 初始化后
210
212
  };
211
213
 
212
214
  Index.defaultProps = {
@@ -214,14 +216,15 @@ Index.defaultProps = {
214
216
  columnsReset: null,
215
217
  batchOperations: [],
216
218
  formatDataSource: function formatDataSource(_list, _detail) {
217
- return _list.map(function (indocno) {
218
- return _detail[indocno];
219
+ return _list.map(function (id) {
220
+ return _detail[id];
219
221
  });
220
222
  },
221
223
  resultSet: {},
222
224
  suppressInit: false,
223
225
  isFlow: false,
224
- overModel: {}
226
+ overModel: {},
227
+ rowKey: window.appConfig.constraintKeys.PRIMARY
225
228
  };
226
229
  export default /*#__PURE__*/forwardRef(function (props, ref) {
227
230
  return /*#__PURE__*/React.createElement(Index, _extends({
@@ -102,8 +102,7 @@ var buildLdGridForm = function buildLdGridForm(_ref) {
102
102
  var behaviorKey = arguments.length > 1 ? arguments[1] : undefined;
103
103
  return _objectSpread(_objectSpread({
104
104
  api: function api(get, post, formData) {
105
- var _formData$mainFormLdI;
106
- return behaviorCall(_objectSpread(_objectSpread({}, get), {}, _defineProperty({}, isMain ? 'indocno' : 'relationId', ((_formData$mainFormLdI = formData[mainFormLdId]) === null || _formData$mainFormLdI === void 0 ? void 0 : _formData$mainFormLdI.indocno) || ticketData.indocno)), post, formData);
105
+ return behaviorCall(_objectSpread(_objectSpread({}, get), {}, _defineProperty({}, isMain ? 'indocno' : 'relationId', formData[mainFormLdId] && formData[mainFormLdId][window.appConfig.constraintKeys.PRIMARY] || ticketData[window.appConfig.constraintKeys.PRIMARY])), post, formData);
107
106
  },
108
107
  get: function get() {
109
108
  var _get = {
@@ -136,8 +135,8 @@ var buildLdGridForm = function buildLdGridForm(_ref) {
136
135
  onQuery: _objectSpread(_objectSpread({
137
136
  api: behaviorCall,
138
137
  get: function get(formData) {
139
- var _formData$mainFormLdI2, _params2;
140
- var _params = (_params2 = {}, _defineProperty(_params2, isMain ? 'indocno' : 'relationId', ((_formData$mainFormLdI2 = formData[mainFormLdId]) === null || _formData$mainFormLdI2 === void 0 ? void 0 : _formData$mainFormLdI2.indocno) || ticketData.indocno), _defineProperty(_params2, "moduleCode", moduleCode), _defineProperty(_params2, "datasetCode", dataSetKey), _defineProperty(_params2, "behaviorKey", 'readGrid'), _params2);
138
+ var _params2;
139
+ var _params = (_params2 = {}, _defineProperty(_params2, isMain ? 'indocno' : 'relationId', formData[mainFormLdId] && formData[mainFormLdId][window.appConfig.constraintKeys.PRIMARY] || ticketData[window.appConfig.constraintKeys.PRIMARY]), _defineProperty(_params2, "moduleCode", moduleCode), _defineProperty(_params2, "datasetCode", dataSetKey), _defineProperty(_params2, "behaviorKey", 'readGrid'), _params2);
141
140
  if (!isMain) _params.relationDs = mainDataSetKey;
142
141
  return _params;
143
142
  }
@@ -156,7 +155,7 @@ var buildLdGridForm = function buildLdGridForm(_ref) {
156
155
  post: function post(data) {
157
156
  var _submitData = data.map(function (item) {
158
157
  return {
159
- indocno: item.indocno
158
+ indocno: item[window.appConfig.constraintKeys.PRIMARY]
160
159
  };
161
160
  });
162
161
  if (onDelete === null || onDelete === void 0 ? void 0 : onDelete.post) return onDelete.post(_submitData); // 以预设为主
@@ -3,7 +3,7 @@ import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
3
3
  import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
4
4
  import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
5
5
  import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
6
- 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"],
6
+ 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", "dataToTreeFormat"],
7
7
  _excluded2 = ["onClick"];
8
8
  import React, { useState, useRef, useImperativeHandle, forwardRef } from 'react';
9
9
  import { isFunction, isNumber, transform, includes, remove, cloneDeep, keys } from 'lodash';
@@ -44,6 +44,7 @@ var LdTree = function LdTree(_ref) {
44
44
  afterInit = _ref.afterInit,
45
45
  isTree = _ref.isTree,
46
46
  service = _ref.service,
47
+ dataToTreeFormat = _ref.dataToTreeFormat,
47
48
  props = _objectWithoutProperties(_ref, _excluded);
48
49
  if (!includes(isTree, dataSetKey)) return formatMessage({
49
50
  id: 'luckda.ldTree.notTres',
@@ -89,7 +90,7 @@ var LdTree = function LdTree(_ref) {
89
90
  defaultExpandedKeys: defaultExpanded
90
91
  });
91
92
  }
92
- var treeData = dataToTree(data);
93
+ var treeData = dataToTreeFormat ? dataToTreeFormat(data) : dataToTree(data, null, rowKey, window.appConfig.constraintKeys.PARENT);
93
94
  setDataSource(treeData);
94
95
  afterInit && afterInit(treeData);
95
96
  }
@@ -227,7 +228,7 @@ Index.propTypes = {
227
228
  Index.defaultProps = {
228
229
  readOnly: false,
229
230
  title: false,
230
- rowKey: 'indocno',
231
+ rowKey: window.appConfig.constraintKeys.PRIMARY,
231
232
  treeNodeTitle: 'sname',
232
233
  defaultExpandDeep: 0,
233
234
  draggable: false,
@@ -21,7 +21,9 @@ export var doAction = function doAction(action) {
21
21
  showConfirm = _ref$showConfirm === void 0 ? true : _ref$showConfirm,
22
22
  callback = _ref.callback,
23
23
  _ref$showPopWhenSucce = _ref.showPopWhenSuccess,
24
- showPopWhenSuccess = _ref$showPopWhenSucce === void 0 ? true : _ref$showPopWhenSucce;
24
+ showPopWhenSuccess = _ref$showPopWhenSucce === void 0 ? true : _ref$showPopWhenSucce,
25
+ _ref$customAction = _ref.customAction,
26
+ customAction = _ref$customAction === void 0 ? false : _ref$customAction;
25
27
  var _ref2 = arguments.length > 3 ? arguments[3] : undefined,
26
28
  _ref2$actions = _ref2.actions,
27
29
  actions = _ref2$actions === void 0 ? {} : _ref2$actions,
@@ -50,19 +52,31 @@ export var doAction = function doAction(action) {
50
52
  post = data;
51
53
  }
52
54
  var handleAction = function handleAction() {
53
- behaviorCall(_objectSpread({
54
- behaviorKey: action,
55
- moduleCode: moduleCode
56
- }, get), post).then(function (res) {
57
- var code = res.code,
58
- _data = res.data;
59
- callback && callback(code === 1, _data, res);
60
- if (code === 1 && showPopWhenSuccess) {
61
- showPop(formatMessage({
62
- id: 'app.base.tip.operate.success'
63
- }), null, 'success');
64
- }
65
- });
55
+ if (customAction) {
56
+ customAction({
57
+ api: behaviorCall,
58
+ get: _objectSpread({
59
+ behaviorKey: action,
60
+ moduleCode: moduleCode
61
+ }, get),
62
+ post: post
63
+ });
64
+ } else {
65
+ behaviorCall(_objectSpread({
66
+ behaviorKey: action,
67
+ moduleCode: moduleCode
68
+ }, get), post).then(function (res) {
69
+ var code = res.code,
70
+ _data = res.data;
71
+ callback && callback(code === 1, _data, res);
72
+ if (code === 1 && showPopWhenSuccess) {
73
+ showPop(formatMessage({
74
+ id: 'app.base.tip.operate.success'
75
+ }), null, 'success');
76
+ }
77
+ });
78
+ }
79
+ ;
66
80
  };
67
81
  showConfirm ? makeSure(handleAction) : handleAction();
68
82
  } else {
@@ -90,13 +104,13 @@ export var onBatchSubmitAction = function onBatchSubmitAction(_ref3, callback) {
90
104
  form_id = _ref3.form_id,
91
105
  effcode = _ref3.effcode;
92
106
  var data = transform(formList, function (result, value) {
93
- var _formData$value$id, _values$value$id;
107
+ var _values$value$id;
94
108
  if (values[value.id]) {
95
109
  var _dataSetKey = value.dataSetKey;
96
110
  switch (value.type) {
97
111
  case 'auto':
98
112
  result[_dataSetKey] = _objectSpread({
99
- indocno: (_formData$value$id = formData[value.id]) === null || _formData$value$id === void 0 ? void 0 : _formData$value$id.indocno
113
+ indocno: formData[value.id] && formData[value.id][window.appConfig.constraintKeys.PRIMARY]
100
114
  }, dataFormat(dataSets[_dataSetKey], (_values$value$id = values[value.id]) === null || _values$value$id === void 0 ? void 0 : _values$value$id.submitData));
101
115
  break;
102
116
  case 'grid':
package/es/helper/form.js CHANGED
@@ -9,6 +9,7 @@ export var defaultComName = {
9
9
  number: 'number',
10
10
  money: 'number',
11
11
  decimal: 'number',
12
+ sint: 'number',
12
13
  string: 'string',
13
14
  text: 'textarea',
14
15
  date: 'date',
@@ -0,0 +1,7 @@
1
+ .ldLabs{
2
+ :global{
3
+ .ant-tabs-bar{
4
+ margin: 0 0 4px 0;
5
+ }
6
+ }
7
+ }
@@ -1,7 +1,13 @@
1
+ import _extends from "@babel/runtime/helpers/esm/extends";
2
+ import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
3
+ import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
4
+ var _excluded = ["className"];
1
5
  import React, { useContext, Fragment } from 'react';
2
6
  import { includes, intersectionWith } from 'lodash';
3
7
  import { ChildrenUtil } from '@luck-design-biz/base/utils';
4
8
  import { LuckDaContext } from '../components/Builder';
9
+ import classNames from 'classnames';
10
+ import styles from './index.less';
5
11
  export var getResources = function getResources() {
6
12
  var _ref = useContext(LuckDaContext) || {},
7
13
  _ref$resources = _ref.resources,
@@ -25,9 +31,13 @@ export var filterOptions = function filterOptions(options) {
25
31
  });
26
32
  };
27
33
  export var deepFilterCom = function deepFilterCom(Com, childMark) {
28
- var Component = function Component(props) {
34
+ var Component = function Component(_ref2) {
35
+ var className = _ref2.className,
36
+ props = _objectWithoutProperties(_ref2, _excluded);
29
37
  var resources = getResources();
30
- var com = /*#__PURE__*/React.createElement(Com, props);
38
+ var com = /*#__PURE__*/React.createElement(Com, _extends({}, props, {
39
+ className: classNames(styles.ldLabs, _defineProperty({}, className, !!className))
40
+ }));
31
41
  return ChildrenUtil.deepFilter(com, function (child) {
32
42
  var _child$props;
33
43
  var data = !childMark(child) || !(child === null || child === void 0 ? void 0 : (_child$props = child.props) === null || _child$props === void 0 ? void 0 : _child$props.resource) || includes(resources, child.props.resource);
package/es/utils/form.js CHANGED
@@ -30,6 +30,7 @@ export function getFormItem() {
30
30
  props = _objectWithoutProperties(_ref, _excluded);
31
31
  var customProps = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
32
32
  if (!property) return /*#__PURE__*/React.createElement(React.Fragment, null);
33
+ if (property === 'sint') props.opt_decimal = 0;
33
34
  var _translator = translator(props),
34
35
  name = _translator.name,
35
36
  translateProps = _objectWithoutProperties(_translator, _excluded2);
@@ -62,6 +63,7 @@ export function getFormItem() {
62
63
  export var formItemDataFormat = function formItemDataFormat() {
63
64
  var propsList = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : [];
64
65
  var values = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
66
+ var omitValues = {};
65
67
  var data = transform(propsList, function (result, n) {
66
68
  var _values$name, _values$name2;
67
69
  var _ref2 = n || {},
@@ -106,9 +108,9 @@ export var formItemDataFormat = function formItemDataFormat() {
106
108
  default:
107
109
  if (!isNil(values["".concat(name, "_virtual")] || values[name])) result[name] = values["".concat(name, "_virtual")] || values[name];
108
110
  }
109
- values = omit(values, [name, "".concat(name, "_virtual")]);
111
+ omitValues = omit(values, [name, "".concat(name, "_virtual")]);
110
112
  }, {});
111
- return _objectSpread(_objectSpread({}, values), data);
113
+ return _objectSpread(_objectSpread({}, omitValues), data);
112
114
  };
113
115
 
114
116
  /**
package/es/utils/grid.js CHANGED
@@ -23,7 +23,7 @@ export function getColumnRender(name, type) {
23
23
  case 'textarea':
24
24
  render = function render(text, record) {
25
25
  var _props$config;
26
- return record["".concat(name, "_virtual")] || (((_props$config = props.config) === null || _props$config === void 0 ? void 0 : _props$config.precision) && text ? text.toFixed(props.config.precision) : text);
26
+ return record["".concat(name, "_virtual")] || (((_props$config = props.config) === null || _props$config === void 0 ? void 0 : _props$config.precision) && text ? Number(text).toFixed(props.config.precision) : text);
27
27
  };
28
28
  break;
29
29
  case 'date':
@@ -97,7 +97,7 @@ export var getGridColumn = function getGridColumn() {
97
97
  };
98
98
  if (isTreeGrid || isVirtual || includes(['user', 'select', 'group', 'switch', 'color', 'region'], comName || defaultComName[property])) data.sortable = false;
99
99
  // data.filter = false;
100
- if (filter) {
100
+ if (!isNil(filter)) {
101
101
  // 因为后端升级问题,暂时关闭过滤功能
102
102
  data.filter = filter;
103
103
  data.filterParams = filterParams;
@@ -107,13 +107,13 @@ export var getGridColumn = function getGridColumn() {
107
107
  data.filter = 'select';
108
108
  data.filterParams = {
109
109
  options: [{
110
- key: 0,
110
+ value: 0,
111
111
  label: formatMessage({
112
112
  id: 'app.base.state.no',
113
113
  label: '否'
114
114
  })
115
115
  }, {
116
- key: 1,
116
+ value: 1,
117
117
  label: formatMessage({
118
118
  id: 'app.base.state.yes',
119
119
  label: '是'
@@ -95,8 +95,7 @@ var buildLdAutoForm = function buildLdAutoForm(_ref) {
95
95
  var behaviorKey = arguments.length > 1 ? arguments[1] : undefined;
96
96
  return (0, _objectSpread3.default)((0, _objectSpread3.default)({
97
97
  api: function api(get, post, formData) {
98
- var _formData$mainFormLdI;
99
- post[dataSetKey][isMain ? 'indocno' : 'relationId'] = ((_formData$mainFormLdI = formData[mainFormLdId]) === null || _formData$mainFormLdI === void 0 ? void 0 : _formData$mainFormLdI.indocno) || ticketData.indocno;
98
+ post[dataSetKey][isMain ? 'indocno' : 'relationId'] = formData[mainFormLdId] && formData[mainFormLdId][window.appConfig.constraintKeys.PRIMARY] || ticketData[window.appConfig.constraintKeys.PRIMARY];
100
99
  return (0, _utils.behaviorCall)(get, post, formData);
101
100
  },
102
101
  get: function get() {
@@ -125,8 +124,8 @@ var buildLdAutoForm = function buildLdAutoForm(_ref) {
125
124
  onQuery: (0, _objectSpread3.default)((0, _objectSpread3.default)({
126
125
  api: _utils.behaviorCall,
127
126
  get: function get(formData) {
128
- var _formData$mainFormLdI2, _params2;
129
- 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", 'readForm'), _params2);
127
+ var _params2;
128
+ var _params = (_params2 = {}, (0, _defineProperty2.default)(_params2, isMain ? 'indocno' : 'relationId', formData[mainFormLdId] && formData[mainFormLdId][window.appConfig.constraintKeys.PRIMARY] || ticketData[window.appConfig.constraintKeys.PRIMARY]), (0, _defineProperty2.default)(_params2, "moduleCode", moduleCode), (0, _defineProperty2.default)(_params2, "datasetCode", dataSetKey), (0, _defineProperty2.default)(_params2, "behaviorKey", 'readForm'), _params2);
130
129
  if (!isMain) _params.relationDs = mainDataSetKey;
131
130
  return _params;
132
131
  }
@@ -182,7 +182,9 @@ Index.propTypes = {
182
182
  // 卡片配置项
183
183
  onOperationsClick: _propTypes.default.func,
184
184
  // 操作
185
- cardActions: _propTypes.default.array // 卡片行为
185
+ cardActions: _propTypes.default.array,
186
+ // 卡片行为
187
+ cardKey: _propTypes.default.string // 卡片主键
186
188
  };
187
189
 
188
190
  Index.defaultProps = {
@@ -191,12 +193,13 @@ Index.defaultProps = {
191
193
  isFlow: false,
192
194
  cardConfig: {},
193
195
  formatDataSource: function formatDataSource(_list, _detail) {
194
- return _list.map(function (indocno) {
195
- return _detail[indocno];
196
+ return _list.map(function (id) {
197
+ return _detail[id];
196
198
  });
197
199
  },
198
200
  cardActions: [],
199
- overModel: {}
201
+ overModel: {},
202
+ cardKey: window.appConfig.constraintKeys.PRIMARY
200
203
  };
201
204
  var _default = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
202
205
  return /*#__PURE__*/_react.default.createElement(Index, (0, _extends2.default)({
@@ -12,7 +12,6 @@ var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/obje
12
12
  var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
13
13
  var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));
14
14
  var _react = _interopRequireWildcard(require("react"));
15
- var _querystring = require("querystring");
16
15
  var _umi = require("umi");
17
16
  var _propTypes = _interopRequireDefault(require("prop-types"));
18
17
  var _ahooks = require("ahooks");
@@ -27,7 +26,7 @@ var _LdPop = require("../LdPop");
27
26
  var _model = _interopRequireDefault(require("./model"));
28
27
  var _action = require("../../helper/action");
29
28
  var _excluded = ["namespace", "formState", "formMode", "loading", "wrapperRef", "readOnly", "mainFormLdId", "renderFormList", "renderAffixLeft", "renderAffixRight", "beforeSubmit", "showSaveBtn", "saveBtnTitle", "affixLayout", "onValueChange", "afterSubmit", "renderFormExtra"],
30
- _excluded2 = ["id", "header", "title", "readOnly", "extraConfig"],
29
+ _excluded2 = ["id", "header", "title", "readOnly", "extraConfig", "renderTopLeft"],
31
30
  _excluded3 = ["ldId", "initData", "overModel"];
32
31
  // 组件
33
32
  var LdFormList = function LdFormList(_ref) {
@@ -94,15 +93,9 @@ var LdFormList = function LdFormList(_ref) {
94
93
  });
95
94
  onValueChange(change, data);
96
95
  });
97
- var renderExtra = (0, _ahooks.useMemoizedFn)(function (formId, extraConfig) {
98
- return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, window['g_sessionStore'].get(window.appConfig['matchPresetAdmin']) === '1' && RUNTIME === 'dev' && /*#__PURE__*/_react.default.createElement("a", {
99
- onClick: function onClick() {
100
- return readFieldProps(formId);
101
- }
102
- }, (0, _utils.formatMessage)({
103
- id: 'app.luckda.button.readConfig',
104
- label: '查看配置'
105
- })), /*#__PURE__*/_react.default.createElement(_FormList.FormBtn, (0, _extends2.default)({
96
+ var renderExtra = (0, _ahooks.useMemoizedFn)(function (formId, extraConfig, type) {
97
+ return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement(_FormList.FormBtn, (0, _extends2.default)({
98
+ type: type,
106
99
  formId: formId
107
100
  }, extraConfig)));
108
101
  });
@@ -121,11 +114,11 @@ var LdFormList = function LdFormList(_ref) {
121
114
  formData: props.formData,
122
115
  form_id: formKey,
123
116
  effcode: formCode
124
- }, function (success, indocno, res) {
117
+ }, function (success, mainKey, res) {
125
118
  setSubmitLoading(false);
126
119
  if (success) {
127
120
  if (afterSubmit) {
128
- afterSubmit(success, indocno, res);
121
+ afterSubmit(success, mainKey, res);
129
122
  } else {
130
123
  var _formListRef$current;
131
124
  props.parentModelName && ((_formListRef$current = formListRef.current) === null || _formListRef$current === void 0 ? void 0 : _formListRef$current.doParentsQuery());
@@ -142,9 +135,7 @@ var LdFormList = function LdFormList(_ref) {
142
135
  // })}`,
143
136
  // );
144
137
  // } else {
145
- formListRef.current.onQuery(null, (0, _defineProperty2.default)({}, mainFormLdId, {
146
- indocno: indocno
147
- }), function () {
138
+ formListRef.current.onQuery(null, (0, _defineProperty2.default)({}, mainFormLdId, (0, _defineProperty2.default)({}, window.appConfig.constraintKeys.PRIMARY, mainKey)), function () {
148
139
  return formListRef.current.setFormMode('info');
149
140
  });
150
141
  // }
@@ -197,13 +188,17 @@ var LdFormList = function LdFormList(_ref) {
197
188
  _readOnly = _ref8.readOnly,
198
189
  _ref8$extraConfig = _ref8.extraConfig,
199
190
  extraConfig = _ref8$extraConfig === void 0 ? {} : _ref8$extraConfig,
191
+ _ref8$renderTopLeft = _ref8.renderTopLeft,
192
+ _renderTopLeft = _ref8$renderTopLeft === void 0 ? function () {
193
+ return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null);
194
+ } : _ref8$renderTopLeft,
200
195
  _props = (0, _objectWithoutProperties2.default)(_ref8, _excluded2);
201
196
  var _props$type = _props.type,
202
197
  type = _props$type === void 0 ? 'auto' : _props$type;
203
198
  var renderForm = type === 'auto' ? _LdAutoForm.default : _LdGridForm.default;
204
199
  if (header === 'collapse' || header === 'collapseFollow') return /*#__PURE__*/_react.default.createElement(_base.Collapse, {
205
200
  title: title || ldId,
206
- extra: renderExtra(ldId, extraConfig),
201
+ extra: type === 'auto' && renderExtra(ldId, extraConfig, 'graphic'),
207
202
  id: ldId,
208
203
  key: ldId,
209
204
  mode: header === 'collapse' && ldId !== mainFormLdId && 'tab'
@@ -215,18 +210,21 @@ var LdFormList = function LdFormList(_ref) {
215
210
  onValueChange: handleValueChange,
216
211
  ticketData: props.ticketData,
217
212
  formRef: formListRef,
218
- formMode: formMode
213
+ formMode: formMode,
214
+ renderTopLeft: function renderTopLeft() {
215
+ return type === 'auto' ? _renderTopLeft() : [renderExtra(ldId, extraConfig, 'text'), _renderTopLeft()];
216
+ }
219
217
  })));
220
218
  return /*#__PURE__*/_react.default.createElement(_react.Fragment, {
221
219
  key: ldId
222
220
  }, header === 'divider' && /*#__PURE__*/_react.default.createElement(_luckDesign.BasicDivider, {
223
221
  title: title || ldId,
224
222
  id: ldId
225
- }), /*#__PURE__*/_react.default.createElement("div", {
223
+ }), type === 'auto' && /*#__PURE__*/_react.default.createElement("div", {
226
224
  style: {
227
225
  textAlign: 'right'
228
226
  }
229
- }, renderExtra(ldId, extraConfig)), renderForm((0, _objectSpread2.default)((0, _objectSpread2.default)({}, _props), {}, {
227
+ }, renderExtra(ldId, extraConfig, 'graphic')), renderForm((0, _objectSpread2.default)((0, _objectSpread2.default)({}, _props), {}, {
230
228
  ldId: ldId,
231
229
  mainFormLdId: mainFormLdId,
232
230
  mainDataSetKey: mainDataSetKey,
@@ -234,7 +232,10 @@ var LdFormList = function LdFormList(_ref) {
234
232
  onValueChange: handleValueChange,
235
233
  ticketData: props.ticketData,
236
234
  formRef: formListRef,
237
- formMode: formMode
235
+ formMode: formMode,
236
+ renderTopLeft: function renderTopLeft() {
237
+ return type === 'auto' ? _renderTopLeft() : [renderExtra(ldId, extraConfig, 'graphic'), _renderTopLeft()];
238
+ }
238
239
  })));
239
240
  }), _utils.ChildrenUtil.deepMap(renderFormExtra(formConfig), function (child) {
240
241
  var _child$type;
@@ -214,7 +214,9 @@ Index.propTypes = {
214
214
  // 行操作
215
215
  suppressInit: _propTypes.default.bool,
216
216
  // 抑制初始化
217
- afterInit: _propTypes.default.func // 初始化后
217
+ afterInit: _propTypes.default.func,
218
+ // 初始化后
219
+ rowKey: _propTypes.default.string // 初始化后
218
220
  };
219
221
 
220
222
  Index.defaultProps = {
@@ -222,14 +224,15 @@ Index.defaultProps = {
222
224
  columnsReset: null,
223
225
  batchOperations: [],
224
226
  formatDataSource: function formatDataSource(_list, _detail) {
225
- return _list.map(function (indocno) {
226
- return _detail[indocno];
227
+ return _list.map(function (id) {
228
+ return _detail[id];
227
229
  });
228
230
  },
229
231
  resultSet: {},
230
232
  suppressInit: false,
231
233
  isFlow: false,
232
- overModel: {}
234
+ overModel: {},
235
+ rowKey: window.appConfig.constraintKeys.PRIMARY
233
236
  };
234
237
  var _default = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
235
238
  return /*#__PURE__*/_react.default.createElement(Index, (0, _extends2.default)({
@@ -110,8 +110,7 @@ var buildLdGridForm = function buildLdGridForm(_ref) {
110
110
  var behaviorKey = arguments.length > 1 ? arguments[1] : undefined;
111
111
  return (0, _objectSpread4.default)((0, _objectSpread4.default)({
112
112
  api: function api(get, post, formData) {
113
- var _formData$mainFormLdI;
114
- 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);
113
+ return (0, _utils.behaviorCall)((0, _objectSpread4.default)((0, _objectSpread4.default)({}, get), {}, (0, _defineProperty2.default)({}, isMain ? 'indocno' : 'relationId', formData[mainFormLdId] && formData[mainFormLdId][window.appConfig.constraintKeys.PRIMARY] || ticketData[window.appConfig.constraintKeys.PRIMARY])), post, formData);
115
114
  },
116
115
  get: function get() {
117
116
  var _get = {
@@ -144,8 +143,8 @@ var buildLdGridForm = function buildLdGridForm(_ref) {
144
143
  onQuery: (0, _objectSpread4.default)((0, _objectSpread4.default)({
145
144
  api: _utils.behaviorCall,
146
145
  get: function get(formData) {
147
- var _formData$mainFormLdI2, _params2;
148
- 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);
146
+ var _params2;
147
+ var _params = (_params2 = {}, (0, _defineProperty2.default)(_params2, isMain ? 'indocno' : 'relationId', formData[mainFormLdId] && formData[mainFormLdId][window.appConfig.constraintKeys.PRIMARY] || ticketData[window.appConfig.constraintKeys.PRIMARY]), (0, _defineProperty2.default)(_params2, "moduleCode", moduleCode), (0, _defineProperty2.default)(_params2, "datasetCode", dataSetKey), (0, _defineProperty2.default)(_params2, "behaviorKey", 'readGrid'), _params2);
149
148
  if (!isMain) _params.relationDs = mainDataSetKey;
150
149
  return _params;
151
150
  }
@@ -164,7 +163,7 @@ var buildLdGridForm = function buildLdGridForm(_ref) {
164
163
  post: function post(data) {
165
164
  var _submitData = data.map(function (item) {
166
165
  return {
167
- indocno: item.indocno
166
+ indocno: item[window.appConfig.constraintKeys.PRIMARY]
168
167
  };
169
168
  });
170
169
  if (onDelete === null || onDelete === void 0 ? void 0 : onDelete.post) return onDelete.post(_submitData); // 以预设为主
@@ -23,7 +23,7 @@ var _base = require("@luck-design-biz/base");
23
23
  var _ldBuilder = _interopRequireDefault(require("../../helper/ldBuilder"));
24
24
  var _utils2 = require("../../utils");
25
25
  var _index = _interopRequireDefault(require("./index.less"));
26
- 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"],
26
+ 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", "dataToTreeFormat"],
27
27
  _excluded2 = ["onClick"];
28
28
  var LdTree = function LdTree(_ref) {
29
29
  var columns = _ref.columns,
@@ -52,6 +52,7 @@ var LdTree = function LdTree(_ref) {
52
52
  afterInit = _ref.afterInit,
53
53
  isTree = _ref.isTree,
54
54
  service = _ref.service,
55
+ dataToTreeFormat = _ref.dataToTreeFormat,
55
56
  props = (0, _objectWithoutProperties2.default)(_ref, _excluded);
56
57
  if (!(0, _lodash.includes)(isTree, dataSetKey)) return (0, _utils.formatMessage)({
57
58
  id: 'luckda.ldTree.notTres',
@@ -97,7 +98,7 @@ var LdTree = function LdTree(_ref) {
97
98
  defaultExpandedKeys: defaultExpanded
98
99
  });
99
100
  }
100
- var treeData = (0, _utils.dataToTree)(data);
101
+ var treeData = dataToTreeFormat ? dataToTreeFormat(data) : (0, _utils.dataToTree)(data, null, rowKey, window.appConfig.constraintKeys.PARENT);
101
102
  setDataSource(treeData);
102
103
  afterInit && afterInit(treeData);
103
104
  }
@@ -235,7 +236,7 @@ Index.propTypes = {
235
236
  Index.defaultProps = {
236
237
  readOnly: false,
237
238
  title: false,
238
- rowKey: 'indocno',
239
+ rowKey: window.appConfig.constraintKeys.PRIMARY,
239
240
  treeNodeTitle: 'sname',
240
241
  defaultExpandDeep: 0,
241
242
  draggable: false,
@@ -28,7 +28,9 @@ var doAction = function doAction(action) {
28
28
  showConfirm = _ref$showConfirm === void 0 ? true : _ref$showConfirm,
29
29
  callback = _ref.callback,
30
30
  _ref$showPopWhenSucce = _ref.showPopWhenSuccess,
31
- showPopWhenSuccess = _ref$showPopWhenSucce === void 0 ? true : _ref$showPopWhenSucce;
31
+ showPopWhenSuccess = _ref$showPopWhenSucce === void 0 ? true : _ref$showPopWhenSucce,
32
+ _ref$customAction = _ref.customAction,
33
+ customAction = _ref$customAction === void 0 ? false : _ref$customAction;
32
34
  var _ref2 = arguments.length > 3 ? arguments[3] : undefined,
33
35
  _ref2$actions = _ref2.actions,
34
36
  actions = _ref2$actions === void 0 ? {} : _ref2$actions,
@@ -57,19 +59,31 @@ var doAction = function doAction(action) {
57
59
  post = data;
58
60
  }
59
61
  var handleAction = function handleAction() {
60
- (0, _utils2.behaviorCall)((0, _objectSpread2.default)({
61
- behaviorKey: action,
62
- moduleCode: moduleCode
63
- }, get), post).then(function (res) {
64
- var code = res.code,
65
- _data = res.data;
66
- callback && callback(code === 1, _data, res);
67
- if (code === 1 && showPopWhenSuccess) {
68
- (0, _utils.showPop)((0, _utils.formatMessage)({
69
- id: 'app.base.tip.operate.success'
70
- }), null, 'success');
71
- }
72
- });
62
+ if (customAction) {
63
+ customAction({
64
+ api: _utils2.behaviorCall,
65
+ get: (0, _objectSpread2.default)({
66
+ behaviorKey: action,
67
+ moduleCode: moduleCode
68
+ }, get),
69
+ post: post
70
+ });
71
+ } else {
72
+ (0, _utils2.behaviorCall)((0, _objectSpread2.default)({
73
+ behaviorKey: action,
74
+ moduleCode: moduleCode
75
+ }, get), post).then(function (res) {
76
+ var code = res.code,
77
+ _data = res.data;
78
+ callback && callback(code === 1, _data, res);
79
+ if (code === 1 && showPopWhenSuccess) {
80
+ (0, _utils.showPop)((0, _utils.formatMessage)({
81
+ id: 'app.base.tip.operate.success'
82
+ }), null, 'success');
83
+ }
84
+ });
85
+ }
86
+ ;
73
87
  };
74
88
  showConfirm ? makeSure(handleAction) : handleAction();
75
89
  } else {
@@ -98,13 +112,13 @@ var onBatchSubmitAction = function onBatchSubmitAction(_ref3, callback) {
98
112
  form_id = _ref3.form_id,
99
113
  effcode = _ref3.effcode;
100
114
  var data = (0, _lodash.transform)(formList, function (result, value) {
101
- var _formData$value$id, _values$value$id;
115
+ var _values$value$id;
102
116
  if (values[value.id]) {
103
117
  var _dataSetKey = value.dataSetKey;
104
118
  switch (value.type) {
105
119
  case 'auto':
106
120
  result[_dataSetKey] = (0, _objectSpread2.default)({
107
- indocno: (_formData$value$id = formData[value.id]) === null || _formData$value$id === void 0 ? void 0 : _formData$value$id.indocno
121
+ indocno: formData[value.id] && formData[value.id][window.appConfig.constraintKeys.PRIMARY]
108
122
  }, (0, _utils2.dataFormat)(dataSets[_dataSetKey], (_values$value$id = values[value.id]) === null || _values$value$id === void 0 ? void 0 : _values$value$id.submitData));
109
123
  break;
110
124
  case 'grid':
@@ -18,6 +18,7 @@ var defaultComName = {
18
18
  number: 'number',
19
19
  money: 'number',
20
20
  decimal: 'number',
21
+ sint: 'number',
21
22
  string: 'string',
22
23
  text: 'textarea',
23
24
  date: 'date',
@@ -0,0 +1,7 @@
1
+ .ldLabs{
2
+ :global{
3
+ .ant-tabs-bar{
4
+ margin: 0 0 4px 0;
5
+ }
6
+ }
7
+ }
@@ -1,14 +1,21 @@
1
1
  "use strict";
2
2
 
3
+ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
3
4
  var _interopRequireWildcard = require("@babel/runtime/helpers/interopRequireWildcard").default;
4
5
  Object.defineProperty(exports, "__esModule", {
5
6
  value: true
6
7
  });
7
8
  exports.ldComBuilder = exports.getResources = exports.filterOptions = exports.deepFilterCom = void 0;
9
+ var _extends2 = _interopRequireDefault(require("@babel/runtime/helpers/extends"));
10
+ var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
11
+ var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));
8
12
  var _react = _interopRequireWildcard(require("react"));
9
13
  var _lodash = require("lodash");
10
14
  var _utils = require("@luck-design-biz/base/utils");
11
15
  var _Builder = require("../components/Builder");
16
+ var _classnames = _interopRequireDefault(require("classnames"));
17
+ var _index = _interopRequireDefault(require("./index.less"));
18
+ var _excluded = ["className"];
12
19
  var getResources = function getResources() {
13
20
  var _ref = (0, _react.useContext)(_Builder.LuckDaContext) || {},
14
21
  _ref$resources = _ref.resources,
@@ -35,9 +42,13 @@ var filterOptions = function filterOptions(options) {
35
42
  };
36
43
  exports.filterOptions = filterOptions;
37
44
  var deepFilterCom = function deepFilterCom(Com, childMark) {
38
- var Component = function Component(props) {
45
+ var Component = function Component(_ref2) {
46
+ var className = _ref2.className,
47
+ props = (0, _objectWithoutProperties2.default)(_ref2, _excluded);
39
48
  var resources = getResources();
40
- var com = /*#__PURE__*/_react.default.createElement(Com, props);
49
+ var com = /*#__PURE__*/_react.default.createElement(Com, (0, _extends2.default)({}, props, {
50
+ className: (0, _classnames.default)(_index.default.ldLabs, (0, _defineProperty2.default)({}, className, !!className))
51
+ }));
41
52
  return _utils.ChildrenUtil.deepFilter(com, function (child) {
42
53
  var _child$props;
43
54
  var data = !childMark(child) || !(child === null || child === void 0 ? void 0 : (_child$props = child.props) === null || _child$props === void 0 ? void 0 : _child$props.resource) || (0, _lodash.includes)(resources, child.props.resource);
package/lib/utils/form.js CHANGED
@@ -38,6 +38,7 @@ function getFormItem() {
38
38
  props = (0, _objectWithoutProperties2.default)(_ref, _excluded);
39
39
  var customProps = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
40
40
  if (!property) return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null);
41
+ if (property === 'sint') props.opt_decimal = 0;
41
42
  var _translator = (0, _form.translator)(props),
42
43
  name = _translator.name,
43
44
  translateProps = (0, _objectWithoutProperties2.default)(_translator, _excluded2);
@@ -70,6 +71,7 @@ function getFormItem() {
70
71
  var formItemDataFormat = function formItemDataFormat() {
71
72
  var propsList = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : [];
72
73
  var values = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
74
+ var omitValues = {};
73
75
  var data = (0, _lodash.transform)(propsList, function (result, n) {
74
76
  var _values$name, _values$name2;
75
77
  var _ref2 = n || {},
@@ -114,9 +116,9 @@ var formItemDataFormat = function formItemDataFormat() {
114
116
  default:
115
117
  if (!(0, _lodash.isNil)(values["".concat(name, "_virtual")] || values[name])) result[name] = values["".concat(name, "_virtual")] || values[name];
116
118
  }
117
- values = (0, _lodash.omit)(values, [name, "".concat(name, "_virtual")]);
119
+ omitValues = (0, _lodash.omit)(values, [name, "".concat(name, "_virtual")]);
118
120
  }, {});
119
- return (0, _objectSpread2.default)((0, _objectSpread2.default)({}, values), data);
121
+ return (0, _objectSpread2.default)((0, _objectSpread2.default)({}, omitValues), data);
120
122
  };
121
123
 
122
124
  /**
package/lib/utils/grid.js CHANGED
@@ -30,7 +30,7 @@ function getColumnRender(name, type) {
30
30
  case 'textarea':
31
31
  render = function render(text, record) {
32
32
  var _props$config;
33
- return record["".concat(name, "_virtual")] || (((_props$config = props.config) === null || _props$config === void 0 ? void 0 : _props$config.precision) && text ? text.toFixed(props.config.precision) : text);
33
+ return record["".concat(name, "_virtual")] || (((_props$config = props.config) === null || _props$config === void 0 ? void 0 : _props$config.precision) && text ? Number(text).toFixed(props.config.precision) : text);
34
34
  };
35
35
  break;
36
36
  case 'date':
@@ -104,7 +104,7 @@ var getGridColumn = function getGridColumn() {
104
104
  };
105
105
  if (isTreeGrid || isVirtual || (0, _lodash.includes)(['user', 'select', 'group', 'switch', 'color', 'region'], comName || _form.defaultComName[property])) data.sortable = false;
106
106
  // data.filter = false;
107
- if (filter) {
107
+ if (!(0, _lodash.isNil)(filter)) {
108
108
  // 因为后端升级问题,暂时关闭过滤功能
109
109
  data.filter = filter;
110
110
  data.filterParams = filterParams;
@@ -114,13 +114,13 @@ var getGridColumn = function getGridColumn() {
114
114
  data.filter = 'select';
115
115
  data.filterParams = {
116
116
  options: [{
117
- key: 0,
117
+ value: 0,
118
118
  label: (0, _utils.formatMessage)({
119
119
  id: 'app.base.state.no',
120
120
  label: '否'
121
121
  })
122
122
  }, {
123
- key: 1,
123
+ value: 1,
124
124
  label: (0, _utils.formatMessage)({
125
125
  id: 'app.base.state.yes',
126
126
  label: '是'
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@luck-design-biz/luckda",
3
- "version": "0.0.11",
3
+ "version": "0.0.12-2",
4
4
  "scripts": {
5
5
  "start": "dumi dev",
6
6
  "docs:build": "dumi build",
@@ -40,33 +40,14 @@
40
40
  },
41
41
  "dependencies": {
42
42
  "@babel/runtime": "^7.18.9",
43
- "@province-city-china/level": "^8.5.4",
44
43
  "ahooks": "^3.7.0",
45
44
  "antd": "^3.26.6",
46
- "bpmn-js": "^7.3.0",
47
- "bpmn-js-properties-panel": "^0.35.0",
48
45
  "classnames": "^2.3.1",
49
- "d3-fetch": "^1.2.0",
50
- "d3-selection": "^1.4.1",
51
- "file-saver": "^2.0.2",
52
- "jointjs": "^3.5.4",
53
- "js-file-download": "^0.4.4",
54
46
  "lodash": "^4.17.11",
55
47
  "moment": "^2.24.0",
56
- "nprogress": "^0.2.0",
57
- "path-to-regexp": "^2.4.0",
58
- "postcss-hash-classname": "^0.4.0",
59
- "postcss-prefixer": "^2.1.3",
60
- "promise-sequential": "^1.1.1",
61
48
  "prop-types": "^15.8.1",
62
49
  "querystring": "^0.2.0",
63
- "raphael": "^2.3.0",
64
- "rc-form": "^2.4.10",
65
- "react": "^16.12.0",
66
- "react-copy-to-clipboard": "^5.0.1",
67
- "react-country-flag": "^2.3.0",
68
- "react-dom": "16.8.0",
69
- "uuid": "^3.3.2"
50
+ "react": "^16.12.0"
70
51
  },
71
52
  "devDependencies": {
72
53
  "@umijs/test": "^3.0.5",