@luck-design-biz/luckda 1.0.2-10 → 1.0.2-11

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.
@@ -28,6 +28,7 @@ var DisplayComp = function DisplayComp(_ref) {
28
28
  return /*#__PURE__*/React.createElement(Button, _extends({}, props, {
29
29
  disabled: action.serialEffect === 'disable',
30
30
  className: classNames(styles[action.riskLevel], _defineProperty({}, className, !!className)),
31
+ type: action.riskLevel,
31
32
  onClick: onClick
32
33
  }), children);
33
34
  };
@@ -100,7 +100,7 @@ var LdGrid = function LdGrid(_ref) {
100
100
  */
101
101
  var _columns = useCreation(function () {
102
102
  if (columnsReset) {
103
- if (isFunction) {
103
+ if (isFunction(columnsReset)) {
104
104
  return columnsReset(columns);
105
105
  }
106
106
  return columnsReset;
@@ -144,9 +144,6 @@ var LdGrid = function LdGrid(_ref) {
144
144
  unclosableSet: unclosableSet,
145
145
  onQuery: onQuery
146
146
  });
147
-
148
- // console.log('_columns',columns,_columns)
149
-
150
147
  return /*#__PURE__*/React.createElement(GridList, _extends({
151
148
  columns: _columns
152
149
  // 资源串、行为配置
@@ -20,11 +20,11 @@ var Wrapper = styled.div.withConfig({
20
20
  var Title = styled.p.withConfig({
21
21
  displayName: "Title",
22
22
  componentId: "luckda-6530__sc-rwt684-1"
23
- })(["font-weight:700;margin-bottom:8px;color:rgba(0,0,0,0.8);display:flex;-webkit-box-align:center;-ms-flex-align:center;align-items:center;justify-content:space-between;"]);
23
+ })(["font-weight:700;margin-bottom:8px;color:var(--ant-text-color);display:flex;-webkit-box-align:center;-ms-flex-align:center;align-items:center;justify-content:space-between;"]);
24
24
  var LeftBox = styled.div.withConfig({
25
25
  displayName: "LeftBox",
26
26
  componentId: "luckda-6530__sc-rwt684-2"
27
- })(["width:100%;flex:1;border:1px solid #e5e6e8;border-radius:6px;"]);
27
+ })(["width:100%;flex:1;border:1px solid #e5e6e8;border-radius:6px;overflow:hidden;"]);
28
28
  var Option = styled.div.withConfig({
29
29
  displayName: "Option",
30
30
  componentId: "luckda-6530__sc-rwt684-3"
@@ -85,7 +85,7 @@
85
85
  font-size: 14px;
86
86
  font-weight: 700;
87
87
  margin-bottom: 8px;
88
- color: rgba(0, 0, 0, 0.8);
88
+ color: @text-color;
89
89
  display: flex;
90
90
  -webkit-box-align: center;
91
91
  align-items: center;
@@ -16,7 +16,7 @@
16
16
  }
17
17
  .page-node:hover,
18
18
  .page-node.page-node-active {
19
- background-color: #f6f7f8;
19
+ background: ~'var(--@{luck-ant-prefix}-layout-treeNode-wrapper, #f6f7f8)';
20
20
  }
21
21
 
22
22
  :global {
package/es/utils/grid.js CHANGED
@@ -196,6 +196,7 @@ export var getGridColumn = function getGridColumn() {
196
196
  break;
197
197
  case 'select':
198
198
  case 'radio':
199
+ case 'dict':
199
200
  data.filter = 'select';
200
201
  if (_props.alias) {
201
202
  data.filterParams = {
@@ -269,6 +270,7 @@ export var getGridColumn = function getGridColumn() {
269
270
  case 'select':
270
271
  case 'group':
271
272
  case 'complex':
273
+ case 'dict':
272
274
  if (translateProps.multiple) {
273
275
  formItemProps = {
274
276
  dataFormat: function dataFormat(value) {
@@ -36,6 +36,7 @@ var DisplayComp = function DisplayComp(_ref) {
36
36
  return /*#__PURE__*/_react.default.createElement(_antd.Button, (0, _extends2.default)({}, props, {
37
37
  disabled: action.serialEffect === 'disable',
38
38
  className: (0, _classnames.default)(_index.default[action.riskLevel], (0, _defineProperty2.default)({}, className, !!className)),
39
+ type: action.riskLevel,
39
40
  onClick: onClick
40
41
  }), children);
41
42
  };
@@ -108,7 +108,7 @@ var LdGrid = function LdGrid(_ref) {
108
108
  */
109
109
  var _columns = (0, _ahooks.useCreation)(function () {
110
110
  if (columnsReset) {
111
- if (_lodash.isFunction) {
111
+ if ((0, _lodash.isFunction)(columnsReset)) {
112
112
  return columnsReset(columns);
113
113
  }
114
114
  return columnsReset;
@@ -152,9 +152,6 @@ var LdGrid = function LdGrid(_ref) {
152
152
  unclosableSet: unclosableSet,
153
153
  onQuery: onQuery
154
154
  });
155
-
156
- // console.log('_columns',columns,_columns)
157
-
158
155
  return /*#__PURE__*/_react.default.createElement(_List.GridList, (0, _extends2.default)({
159
156
  columns: _columns
160
157
  // 资源串、行为配置
@@ -28,11 +28,11 @@ var Wrapper = _styledComponents.default.div.withConfig({
28
28
  var Title = _styledComponents.default.p.withConfig({
29
29
  displayName: "Title",
30
30
  componentId: "luckda-6530__sc-rwt684-1"
31
- })(["font-weight:700;margin-bottom:8px;color:rgba(0,0,0,0.8);display:flex;-webkit-box-align:center;-ms-flex-align:center;align-items:center;justify-content:space-between;"]);
31
+ })(["font-weight:700;margin-bottom:8px;color:var(--ant-text-color);display:flex;-webkit-box-align:center;-ms-flex-align:center;align-items:center;justify-content:space-between;"]);
32
32
  var LeftBox = _styledComponents.default.div.withConfig({
33
33
  displayName: "LeftBox",
34
34
  componentId: "luckda-6530__sc-rwt684-2"
35
- })(["width:100%;flex:1;border:1px solid #e5e6e8;border-radius:6px;"]);
35
+ })(["width:100%;flex:1;border:1px solid #e5e6e8;border-radius:6px;overflow:hidden;"]);
36
36
  var Option = _styledComponents.default.div.withConfig({
37
37
  displayName: "Option",
38
38
  componentId: "luckda-6530__sc-rwt684-3"
@@ -85,7 +85,7 @@
85
85
  font-size: 14px;
86
86
  font-weight: 700;
87
87
  margin-bottom: 8px;
88
- color: rgba(0, 0, 0, 0.8);
88
+ color: @text-color;
89
89
  display: flex;
90
90
  -webkit-box-align: center;
91
91
  align-items: center;
@@ -16,7 +16,7 @@
16
16
  }
17
17
  .page-node:hover,
18
18
  .page-node.page-node-active {
19
- background-color: #f6f7f8;
19
+ background: ~'var(--@{luck-ant-prefix}-layout-treeNode-wrapper, #f6f7f8)';
20
20
  }
21
21
 
22
22
  :global {
package/lib/utils/grid.js CHANGED
@@ -204,6 +204,7 @@ var getGridColumn = exports.getGridColumn = function getGridColumn() {
204
204
  break;
205
205
  case 'select':
206
206
  case 'radio':
207
+ case 'dict':
207
208
  data.filter = 'select';
208
209
  if (_props.alias) {
209
210
  data.filterParams = {
@@ -277,6 +278,7 @@ var getGridColumn = exports.getGridColumn = function getGridColumn() {
277
278
  case 'select':
278
279
  case 'group':
279
280
  case 'complex':
281
+ case 'dict':
280
282
  if (translateProps.multiple) {
281
283
  formItemProps = {
282
284
  dataFormat: function dataFormat(value) {
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@luck-design-biz/luckda",
3
- "version": "1.0.2-10",
3
+ "version": "1.0.2-11",
4
4
  "description": "前端配置管理中心业务组件库",
5
5
  "scripts": {
6
6
  "start": "cross-env NODE_OPTIONS=--max-old-space-size=10240 USER_RUNTIME=SITE RUNTIME=dev umi dev",