@luck-design-biz/luckda 1.0.1-12 → 1.0.1-14

package/es/lowcode/painter/DesignToolbar.js

@@ -418,7 +418,7 @@ var DesignToolbar = function DesignToolbar(_ref) {
     },
     bodyStyle: {
       height: 'calc(100% - 54px)',
-      backgroundColor: '#F0F2F5'
+      backgroundColor: 'var(--ant-component-background,#F0F2F5)'
     },
     visible: showPreview,
     destroyOnClose: true,

package/es/lowcode/painter/Ribbon.js

@@ -68,6 +68,10 @@ var Ribbon = function Ribbon() {
     })
   }, /*#__PURE__*/React.createElement(Icon, {
     type: "apartment",
+    style: {
+      color: (drawer === null || drawer === void 0 ? void 0 : drawer.key) === _DRAWER_OUTLINE_.key && '#1d79f2',
+      fontSize: 20
+    },
     onClick: function onClick() {
       return setDrawer((drawer === null || drawer === void 0 ? void 0 : drawer.key) === _DRAWER_OUTLINE_.key ? null : _DRAWER_OUTLINE_);
     }
@@ -79,6 +83,10 @@ var Ribbon = function Ribbon() {
     })
   }, /*#__PURE__*/React.createElement(Icon, {
     type: "appstore",
+    style: {
+      color: (drawer === null || drawer === void 0 ? void 0 : drawer.key) === _DRAWER_COMPONENTS_.key && '#1d79f2',
+      fontSize: 20
+    },
     onClick: function onClick() {
       return setDrawer((drawer === null || drawer === void 0 ? void 0 : drawer.key) === _DRAWER_COMPONENTS_.key ? null : _DRAWER_COMPONENTS_);
     }
@@ -90,6 +98,10 @@ var Ribbon = function Ribbon() {
     })
   }, /*#__PURE__*/React.createElement(Icon, {
     type: "global",
+    style: {
+      color: (drawer === null || drawer === void 0 ? void 0 : drawer.key) === _DRAWER_I18N_.key && '#1d79f2',
+      fontSize: 20
+    },
     onClick: function onClick() {
       return setDrawer((drawer === null || drawer === void 0 ? void 0 : drawer.key) === _DRAWER_I18N_.key ? null : _DRAWER_I18N_);
     }

package/es/lowcode/painter/components/code-editor/BaseEditor.js

@@ -76,7 +76,8 @@ var BaseEditor = /*#__PURE__*/forwardRef(function (_ref, ref) {
           onDidChangeStorage: function onDidChangeStorage() {}
         }
       });
-      editorInstance.current.onDidChangeModelContent(function (event) {
+      // 监听布局变化，重新赋值，解决编辑器全屏切换时，编辑器空白的问题
+      editorInstance.current.onDidLayoutChange(function (event) {
         if (onChange) onChange(editorInstance.current.getValue(), event);
       });
     }

package/es/lowcode/painter/components/field-setting/FieldAttrs.js

@@ -28,8 +28,8 @@ var LeftBox = styled.div.withConfig({
 var Option = styled.div.withConfig({
   displayName: "Option",
   componentId: "luckda-6530__sc-rwt684-3"
-})(["width:100%;height:32px;cursor:pointer;line-height:32px;padding:0 8px;display:flex;justify-content:space-between;align-items:center;", " &:hover{background-color:#e8e8e8;}"], function (props) {
-  return props.actived ? 'background-color: #e8e8e8;' : void 0;
+})(["width:100%;height:32px;cursor:pointer;line-height:32px;padding:0 8px;display:flex;justify-content:space-between;align-items:center;", " &:hover{background-color:var(--ant-border-color-base,#e8e8e8);}"], function (props) {
+  return props.actived ? 'background-color: var(--ant-border-color-base, #e8e8e8);' : void 0;
 });
 var RightBox = styled.div.withConfig({
   displayName: "RightBox",

package/es/lowcode/painter/panel-section/ActionsEditor/ActionEditor.js

@@ -1,10 +1,12 @@
 import React, { useRef } from 'react';
 import { useMemoizedFn } from 'ahooks';
-import { Input, Segmented } from 'luck-design/antd';
+import { Input, Segmented, Popover } from 'luck-design/antd';
 import { cloneDeep } from 'lodash';
 import { PopForm, PopFormItem, PopFormItemLeft, PopFormItemRight } from "../../components/PopForm";
 import SerialsSelector from "../SerialsSelector";
 import { formatMessage } from '@luck-design-biz/base/utils';
+import IconChoice from "../Icon";
+import IconSelector from "../IconSelector";
 var _I18N_PREFIX_ = 'luckda.lowcode.painter.panel-section.actionEditor';
 var _SERIAL_EFFECT_OPTIONS_ = [{
   label: formatMessage({
@@ -48,6 +50,8 @@ var ActionEditor = function ActionEditor(_ref) {
   var action = _ref.action,
     onChange = _ref.onChange,
     suppressName = _ref.suppressName,
+    _ref$suppressIcon = _ref.suppressIcon,
+    suppressIcon = _ref$suppressIcon === void 0 ? true : _ref$suppressIcon,
     suppressRiskLevel = _ref.suppressRiskLevel;
   var valueRef = useRef(cloneDeep(action));
   var handleChange = useMemoizedFn(function (field, value) {
@@ -67,7 +71,21 @@ var ActionEditor = function ActionEditor(_ref) {
       id: "".concat(_I18N_PREFIX_, ".name.placeholder"),
       label: '请输入行为名称'
     })
-  }))), /*#__PURE__*/React.createElement(PopFormItem, null, /*#__PURE__*/React.createElement(PopFormItemLeft, null, formatMessage({
+  }))), !suppressIcon && /*#__PURE__*/React.createElement(PopFormItem, null, /*#__PURE__*/React.createElement(PopFormItemLeft, null, formatMessage({
+    id: "".concat(_I18N_PREFIX_, ".icon"),
+    label: '图标'
+  })), /*#__PURE__*/React.createElement(PopFormItemRight, null, /*#__PURE__*/React.createElement(Popover, {
+    placement: "left",
+    content: /*#__PURE__*/React.createElement(IconSelector, {
+      value: action.icon,
+      onChange: function onChange(value) {
+        return handleChange('icon', value);
+      }
+    }),
+    trigger: "click"
+  }, /*#__PURE__*/React.createElement(IconChoice, {
+    value: action.icon
+  })))), /*#__PURE__*/React.createElement(PopFormItem, null, /*#__PURE__*/React.createElement(PopFormItemLeft, null, formatMessage({
     id: "".concat(_I18N_PREFIX_, ".serial"),
     label: '资源串'
   })), /*#__PURE__*/React.createElement(PopFormItemRight, null, /*#__PURE__*/React.createElement(SerialsSelector, {

package/es/lowcode/painter/panel-section/ActionsEditor/index.js

@@ -12,6 +12,7 @@ import PopConfirm from "../../components/PopConfirm";
 import ActionBindModal from "../../components/ActionBindModal";
 import { formatMessage, suid } from '@luck-design-biz/base/utils';
 import { listReducer } from "../../../engine/tools/helper";
+import IconFont from "../../../../components/IconFont";
 import styles from "../../style/actions-editor.less";
 var _I18N_PREFIX_ = 'luckda.lowcode.painter.panel-section.actionsEditor';
 var _DISPLAY_OPTIONS_ = [{
@@ -32,6 +33,8 @@ var ActionsEditor = function ActionsEditor(_ref) {
     defaultValue = _ref.defaultValue,
     onChange = _ref.onChange,
     suppressDisplay = _ref.suppressDisplay,
+    _ref$suppressIcon = _ref.suppressIcon,
+    suppressIcon = _ref$suppressIcon === void 0 ? true : _ref$suppressIcon,
     suppressMax = _ref.suppressMax,
     suppressMore = _ref.suppressMore,
     defaultCode = _ref.defaultCode;
@@ -53,7 +56,8 @@ var ActionsEditor = function ActionsEditor(_ref) {
         serial: void 0,
         serialEffect: 'hidden',
         riskLevel: 'default',
-        actionPool: []
+        actionPool: [],
+        icon: suppressIcon ? null : 'iconyingyongguanli'
       },
       callback: function callback(newActions) {
         valueRef.current.todoList = newActions;
@@ -110,7 +114,8 @@ var ActionsEditor = function ActionsEditor(_ref) {
         action: action,
         onChange: function onChange(value) {
           return handleValueChange('action', value);
-        }
+        },
+        suppressIcon: suppressIcon
       })
     }, /*#__PURE__*/React.createElement(Icon, {
       type: "edit",
@@ -207,11 +212,21 @@ var ActionsEditor = function ActionsEditor(_ref) {
     }),
     handleAdd: handleAdd
   }, todoList.map(function (action) {
+    var _action$icon;
     return /*#__PURE__*/React.createElement(SortItem, {
       key: action.id,
       id: action.id
     }, /*#__PURE__*/React.createElement(ListEditorItem, {
-      left: /*#__PURE__*/React.createElement("span", null, action.name),
+      left: /*#__PURE__*/React.createElement("p", {
+        style: {
+          margin: 0
+        }
+      }, suppressIcon ? null : /*#__PURE__*/React.createElement(IconFont, {
+        type: (_action$icon = action.icon) !== null && _action$icon !== void 0 ? _action$icon : 'iconyingyongguanli',
+        style: {
+          marginRight: '4px'
+        }
+      }), /*#__PURE__*/React.createElement("span", null, action.name)),
       right: renderItemRight(action),
       item: action,
       dispatch: dispatch

package/es/lowcode/painter/panel-section/GroupClassSelector.js

@@ -4,7 +4,7 @@ import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
 import React, { useState } from 'react';
 import { useAsyncEffect } from 'ahooks';
 import { Select } from 'luck-design/antd';
-import { readAllClass } from '@luck-design-biz/base/sys/services';
+import { readAllClass } from '@luck-design-biz/base/lib/sys/services';
 var GroupClassSelector = function GroupClassSelector(_ref) {
   var defaultValue = _ref.defaultValue,
     _onChange = _ref.onChange;

package/es/lowcode/painter/panel-section/StylePanel/MainPanel.js

@@ -31,6 +31,7 @@ var MainPanel = function MainPanel() {
       type: 'code',
       payload: code
     });
+    editorRef.current.editor.setValue(code);
   }, []);
   var handleEditorLoad = useCallback(function () {
     styleToEditor(style).then(function (css) {

package/es/lowcode/painter/panel-section/TableTopFilter.js

@@ -160,9 +160,9 @@ var TableTopFilter = function TableTopFilter(_ref) {
           id: "".concat(_I18N_PREFIX_, ".field.placeholder"),
           label: '请选择过滤字段'
         }),
-        onChange: function onChange(e) {
+        onChange: function onChange(value) {
           return handleChange(_objectSpread(_objectSpread({}, opt), {}, {
-            field: e.target.value
+            field: value
           }));
         }
       }))))
@@ -184,7 +184,7 @@ var TableTopFilter = function TableTopFilter(_ref) {
         cursor: 'pointer'
       },
       onClick: function onClick() {
-        return handleDelete(action);
+        return handleDelete(opt);
       }
     })));
   });

package/es/lowcode/painter/style/action-bind-modal.less

@@ -1,3 +1,5 @@
+@import '~@luck-helper/ui-design/es/style/themes/default.less';
+
 .lc-painter-panel-action-bind-modal {
   &-body {
     width: 100%;
@@ -11,7 +13,7 @@
       .selector-box {
         width: 100%;
         height: 620px;
-        border: 1px solid #e8e8e8;
+        border: 1px solid @border-color-base;
         border-radius: 6px;
         display: flex;
 
@@ -46,7 +48,7 @@
         }
         .selector-box-ul.action-category {
           width: 120px;
-          border-right: 1px solid #e8e8e8;
+          border-right: 1px solid @border-color-base;
         }
 
         .selecter-items-box {
@@ -69,7 +71,7 @@
       .code-box {
         width: 100%;
         height: 620px;
-        border: 1px solid #e8e8e8;
+        border: 1px solid @border-color-base;
         border-radius: 6px;
         overflow: hidden;
         display: flex;

package/es/lowcode/painter/style/design.less

@@ -1,3 +1,5 @@
+@import '~@luck-helper/ui-design/es/style/themes/default.less';
+
 .box {
   position: absolute;
   width: 0;
@@ -32,8 +34,8 @@
     width: 100%;
     height: 40px;
     padding: 8px 16px;
-    border-bottom: 1px solid #e3e3e3;
-    background-color: white;
+    border-bottom: 1px solid @border-color-base;
+    background-color: @component-background;
     display: flex;
     align-items: center;
     justify-content: flex-end;
@@ -52,16 +54,16 @@
       margin: 0 2px;
       cursor: pointer;
       text-align: center;
-      color: #8c8c8c;
+      color: @text-color-secondary_luck;
     }
 
     .toolbar-item:hover {
-      color: #262626;
+      color: @text-color;
     }
 
     .toolbar-item.actived {
-      color: #8c8c8c;
-      background: #f1f2f3;
+      color: @text-color-secondary_luck;
+      background: @layout-body-background;
     }
 
     .toolbar-item.disabled {
@@ -96,7 +98,8 @@
       .ant-modal-close,
       .ant-modal-footer,
       .ant-drawer-header,
-      .ant-drawer-footer {
+      .ant-drawer-footer,
+      .luck-card-list {
         pointer-events: none;
       }
       .luck-grid-table {

package/es/lowcode/painter/style/list-editor.less

@@ -1,3 +1,5 @@
+@import '~@luck-helper/ui-design/es/style/themes/default.less';
+
 .lc-painter-panel-section-components-listeditor {
   display: flex;
   align-items: center;
@@ -8,8 +10,8 @@
     .list-item {
       height: 28px;
       position: relative;
-      background: #fff;
-      border: 1px solid #e5e6e8;
+      background: @component-background;
+      border: 1px solid @border-color-base;
       border-radius: 6px;
       margin-bottom: 8px;
       display: flex;
@@ -62,7 +64,7 @@
         border-radius: 10px;
         font-weight: bold;
         font-size: 14px;
-        background-color: white;
+        background-color: @component-background;
         padding: 0 8px;
         display: flex;
         align-items: center;

package/es/lowcode/painter/style/number-input.less

@@ -1,3 +1,5 @@
+@import '~@luck-helper/ui-design/es/style/themes/default.less';
+
 .lc-painter-panel-section-components-number-input {
   .num-input-wrap {
     position: relative;
@@ -10,7 +12,7 @@
       display: inline-block;
       position: absolute;
       right: 26px;
-      color: rgba(0, 0, 0, 0.6);
+      color: @text-color;
       cursor: pointer;
     }
   }

package/es/lowcode/painter/style/outline.less

@@ -1,5 +1,7 @@
+@import '~@luck-helper/ui-design/es/style/themes/default.less';
+
 .lc-painter-outline {
-  background-color: #fff;
+  background-color: @component-background;
 
   .page-node {
     cursor: pointer;

package/es/lowcode/painter/style/panel-attrs.less

@@ -1,3 +1,7 @@
+@import '~@luck-helper/ui-design/es/style/themes/default.less';
+
+@colorful-prefix: ~'@{luck-ant-prefix}-colorful';
+
 .lc-painter-panel-attrs {
   position: relative;
   width: 100%;
@@ -13,7 +17,7 @@
 
     &-header {
       height: 28px;
-      background-color: #e8e8e8;
+      background-color: var(~'--@{colorful-prefix}-primary-dark-2',#e8e8e8);
       display: flex;
       align-items: center;
       justify-content: space-between;
@@ -21,14 +25,14 @@
       font-size: 12px;
     }
     &-header:hover {
-      background-color: #e3e3e3;
+      background-color: var(~'--@{colorful-prefix}-primary-dark-1',#e3e3e3);
       cursor: pointer;
     }
 
     &-body {
       flex: 1;
       overflow-y: auto;
-      background-color: white;
+      background-color: @component-background;
       padding: 16px 0 8px;
     }
   }

package/es/lowcode/painter/style/panel.less

@@ -1,11 +1,13 @@
+@import '~@luck-helper/ui-design/es/style/themes/default.less';
+
 .lc-painter-panel {
   position: relative;
   width: 320px;
   height: 100%;
-  border-left: 1px solid #e8e8e8;
+  border-left: 1px solid @border-color-base;
   display: flex;
   flex-direction: column;
-  background-color: #fff;
+  background-color: @component-background;
 
   &-empty {
     position: absolute;
@@ -25,8 +27,8 @@
     width: 100%;
     height: 40px;
     padding: 8px 16px;
-    border-bottom: 1px solid #e3e3e3;
-    background-color: white;
+    border-bottom: 1px solid @border-color-base;
+    background-color: @component-background;
     display: flex;
     align-items: center;
     .active-node-level:hover {
@@ -52,11 +54,11 @@
         align-items: center;
 
         &:hover {
-          color: #363636;
+          color: @text-color;
         }
 
         &.actived {
-          color: #363636;
+          color: @text-color;
         }
 
         & > i {
@@ -66,7 +68,7 @@
 
       :global {
         li#header-active {
-          color: #363636;
+          color: @text-color;
           position: relative;
         }
       }

package/es/lowcode/painter/style/radio.less

@@ -18,7 +18,7 @@
     cursor: pointer;
 
     &.active{
-      background-color: #ffffff;
+      background-color: @layout-body-background;
     }
   }
 }

package/es/lowcode/painter/style/ribbon.less

@@ -1,5 +1,7 @@
+@import '~@luck-helper/ui-design/es/style/themes/default.less';
+
 .lc-painter-ribbon {
-  border-right: 1px solid #e8e8e8;
+  border-right: 1px solid @border-color-base;
   font-size: 16px;
-  background-color: #fff;
+  background-color: @component-background;
 }