@luck-design-biz/luckda 1.0.0-7-alpha → 1.0.0-9-alpha
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.
- package/es/components/LdAutoForm/index.js +4 -3
- package/es/lowcode/painter/components/code-editor/FullScreenEditor.js +2 -2
- package/es/lowcode/painter/panel-section/ComplexPop.js +1 -0
- package/es/lowcode/painter/panel-section/PageVars.js +10 -6
- package/es/lowcode/painter/style/design.less +1 -1
- package/lib/components/LdAutoForm/index.js +3 -2
- package/lib/lowcode/painter/components/code-editor/FullScreenEditor.js +2 -2
- package/lib/lowcode/painter/panel-section/ComplexPop.js +1 -0
- package/lib/lowcode/painter/panel-section/PageVars.js +10 -6
- package/lib/lowcode/painter/style/design.less +1 -1
- package/package.json +1 -1
|
@@ -4,7 +4,7 @@ import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
|
|
|
4
4
|
import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
|
|
5
5
|
var _excluded = ["columns", "resources", "actions", "doAction", "ldId", "dataSetKey", "filedsRewrite", "mainFormLdId", "mainDataSetKey", "onValueChange", "onQuery", "onAdd", "onUpdate", "moduleCode", "defaultDataSourceFormat", "ticketData", "relationKey", "fields", "setVerifyRules"];
|
|
6
6
|
import React, { createRef, useContext } from 'react';
|
|
7
|
-
import { reduce, keyBy, isEmpty, pick, union, omit, forEach, debounce } from 'lodash';
|
|
7
|
+
import { reduce, keyBy, isEmpty, pick, union, omit, forEach, debounce, isNil } from 'lodash';
|
|
8
8
|
import { BasicDivider } from 'luck-design';
|
|
9
9
|
import { AutoForm } from '@luck-design-biz/base/FormList';
|
|
10
10
|
import ldBuilder from "../../helper/ldBuilder";
|
|
@@ -54,7 +54,8 @@ var buildLdAutoForm = function buildLdAutoForm(_ref) {
|
|
|
54
54
|
ticketData = _ref$ticketData === void 0 ? {} : _ref$ticketData,
|
|
55
55
|
_ref$relationKey = _ref.relationKey,
|
|
56
56
|
relationKey = _ref$relationKey === void 0 ? window.appConfig.constraintKeys.PRIMARY : _ref$relationKey,
|
|
57
|
-
fields = _ref.fields,
|
|
57
|
+
_ref$fields = _ref.fields,
|
|
58
|
+
fields = _ref$fields === void 0 ? [] : _ref$fields,
|
|
58
59
|
setVerifyRules = _ref.setVerifyRules,
|
|
59
60
|
props = _objectWithoutProperties(_ref, _excluded);
|
|
60
61
|
var _ref2 = useContext(LuckDaContext) || {},
|
|
@@ -73,7 +74,7 @@ var buildLdAutoForm = function buildLdAutoForm(_ref) {
|
|
|
73
74
|
result.push( /*#__PURE__*/React.createElement(BasicDivider, {
|
|
74
75
|
title: setting === null || setting === void 0 ? void 0 : setting.fieldAliasName
|
|
75
76
|
}));
|
|
76
|
-
} else if (col !== null && col !== void 0 && col.isShowInForm && setting !== null && setting !== void 0 && setting.isShow) {
|
|
77
|
+
} else if (col !== null && col !== void 0 && col.isShowInForm && (isNil(setting) || setting !== null && setting !== void 0 && setting.isShow)) {
|
|
77
78
|
var customFiled = filedsRewrite.find(function (_field) {
|
|
78
79
|
return _field.name === col.aliaName;
|
|
79
80
|
}) || {};
|
|
@@ -158,6 +158,7 @@ var ComplexPop = function ComplexPop(_ref2) {
|
|
|
158
158
|
setFields(newItems);
|
|
159
159
|
});
|
|
160
160
|
return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(PanelItem, {
|
|
161
|
+
field: "showPop",
|
|
161
162
|
label: formatMessage({
|
|
162
163
|
id: "".concat(_I18N_PREFIX_, ".assisted"),
|
|
163
164
|
label: "辅助选择"
|
|
@@ -161,18 +161,22 @@ var PageVars = function PageVars(_ref) {
|
|
|
161
161
|
onClick: function onClick(_ref2) {
|
|
162
162
|
var key = _ref2.key;
|
|
163
163
|
var id = suid();
|
|
164
|
-
handleAdd({
|
|
164
|
+
handleAdd(_objectSpread({
|
|
165
165
|
id: id,
|
|
166
166
|
type: key,
|
|
167
|
-
name: id
|
|
168
|
-
|
|
169
|
-
|
|
167
|
+
name: id
|
|
168
|
+
}, {
|
|
169
|
+
var: {
|
|
170
|
+
data: ''
|
|
171
|
+
},
|
|
172
|
+
api: {
|
|
173
|
+
data: {
|
|
170
174
|
auto: true,
|
|
171
175
|
taskType: 'parallel',
|
|
172
176
|
method: 'get'
|
|
173
177
|
}
|
|
174
|
-
}
|
|
175
|
-
});
|
|
178
|
+
}
|
|
179
|
+
}[key]));
|
|
176
180
|
}
|
|
177
181
|
}, _TYPE_KEYS_.map(function (key) {
|
|
178
182
|
return /*#__PURE__*/React.createElement(Menu.Item, {
|
|
@@ -62,7 +62,8 @@ var buildLdAutoForm = function buildLdAutoForm(_ref) {
|
|
|
62
62
|
ticketData = _ref$ticketData === void 0 ? {} : _ref$ticketData,
|
|
63
63
|
_ref$relationKey = _ref.relationKey,
|
|
64
64
|
relationKey = _ref$relationKey === void 0 ? window.appConfig.constraintKeys.PRIMARY : _ref$relationKey,
|
|
65
|
-
fields = _ref.fields,
|
|
65
|
+
_ref$fields = _ref.fields,
|
|
66
|
+
fields = _ref$fields === void 0 ? [] : _ref$fields,
|
|
66
67
|
setVerifyRules = _ref.setVerifyRules,
|
|
67
68
|
props = (0, _objectWithoutProperties2.default)(_ref, _excluded);
|
|
68
69
|
var _ref2 = (0, _react.useContext)(_Builder.LuckDaContext) || {},
|
|
@@ -81,7 +82,7 @@ var buildLdAutoForm = function buildLdAutoForm(_ref) {
|
|
|
81
82
|
result.push( /*#__PURE__*/_react.default.createElement(_luckDesign.BasicDivider, {
|
|
82
83
|
title: setting === null || setting === void 0 ? void 0 : setting.fieldAliasName
|
|
83
84
|
}));
|
|
84
|
-
} else if (col !== null && col !== void 0 && col.isShowInForm && setting !== null && setting !== void 0 && setting.isShow) {
|
|
85
|
+
} else if (col !== null && col !== void 0 && col.isShowInForm && ((0, _lodash.isNil)(setting) || setting !== null && setting !== void 0 && setting.isShow)) {
|
|
85
86
|
var customFiled = filedsRewrite.find(function (_field) {
|
|
86
87
|
return _field.name === col.aliaName;
|
|
87
88
|
}) || {};
|
|
@@ -84,8 +84,8 @@ var FullScreenEditor = /*#__PURE__*/(0, _react.forwardRef)(function (_ref, ref)
|
|
|
84
84
|
},
|
|
85
85
|
overviewRulerLanes: 0,
|
|
86
86
|
scrollbar: {
|
|
87
|
-
vertical: '
|
|
88
|
-
horizontal: '
|
|
87
|
+
vertical: 'auto',
|
|
88
|
+
horizontal: 'auto',
|
|
89
89
|
handleMouseWheel: false
|
|
90
90
|
}
|
|
91
91
|
}
|
|
@@ -166,6 +166,7 @@ var ComplexPop = function ComplexPop(_ref2) {
|
|
|
166
166
|
setFields(newItems);
|
|
167
167
|
});
|
|
168
168
|
return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement(_PanelItem.default, {
|
|
169
|
+
field: "showPop",
|
|
169
170
|
label: (0, _utils.formatMessage)({
|
|
170
171
|
id: "".concat(_I18N_PREFIX_, ".assisted"),
|
|
171
172
|
label: "辅助选择"
|
|
@@ -169,18 +169,22 @@ var PageVars = function PageVars(_ref) {
|
|
|
169
169
|
onClick: function onClick(_ref2) {
|
|
170
170
|
var key = _ref2.key;
|
|
171
171
|
var id = (0, _utils.suid)();
|
|
172
|
-
handleAdd({
|
|
172
|
+
handleAdd((0, _objectSpread2.default)({
|
|
173
173
|
id: id,
|
|
174
174
|
type: key,
|
|
175
|
-
name: id
|
|
176
|
-
|
|
177
|
-
|
|
175
|
+
name: id
|
|
176
|
+
}, {
|
|
177
|
+
var: {
|
|
178
|
+
data: ''
|
|
179
|
+
},
|
|
180
|
+
api: {
|
|
181
|
+
data: {
|
|
178
182
|
auto: true,
|
|
179
183
|
taskType: 'parallel',
|
|
180
184
|
method: 'get'
|
|
181
185
|
}
|
|
182
|
-
}
|
|
183
|
-
});
|
|
186
|
+
}
|
|
187
|
+
}[key]));
|
|
184
188
|
}
|
|
185
189
|
}, _TYPE_KEYS_.map(function (key) {
|
|
186
190
|
return /*#__PURE__*/_react.default.createElement(_antd.Menu.Item, {
|
package/package.json
CHANGED