Merge branch 'rc'

hzd822 · hzd822 · commit c52ceba1699d · 2022-03-06T16:47:59.000+08:00
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@alilc/lowcode-engine-ext",
-  "version": "1.0.1-beta.2",
+  "version": "1.0.2-beta.1",
   "description": "",
   "files": [
     "dist",
@@ -70,5 +70,5 @@
     "registry": "https://registry.npmjs.org/"
   },
   "license": "MIT",
-  "homepage": "https://unpkg.com/@alilc/lowcode-engine-ext@1.0.1-beta.2/build/index.html"
+  "homepage": "https://unpkg.com/@alilc/lowcode-engine-ext@1.0.2-beta.1/build/index.html"
 }
diff --git a/src/index.tsx b/src/index.tsx
@@ -2,6 +2,7 @@ import React, { Component } from 'react';
 import { isJSExpression, isJSFunction, isJSSlot } from '@alilc/lowcode-types';
 import { isPlainObject } from './utils';
 import { DatePicker, TimePicker } from '@alifd/next';
+import moment from 'moment';
 import ExpressionSetter from './setter/expression-setter';
 import ColorSetter from './setter/color-setter';
 import JsonSetter from './setter/json-setter';
@@ -26,7 +27,6 @@ import EventBindDialog from './plugin/plugin-event-bind-dialog';
 import VariableBindDialog from './plugin/plugin-variable-bind-dialog';
 import './index.less';
 import packagesInfo from '../package.json';
-
 // suggest: 做成 StringSetter 的一个参数，
 // export const TextAreaSetter = {
 //   component: TextAreaSetter,
@@ -48,9 +48,11 @@ export { ExpressionSetter, EventsSetter, JsonSetter, IconSetter };
 // eslint-disable-next-line react/no-multi-comp
 class StringDateSetter extends Component {
   render() {
-    const { onChange } = this.props;
+    const { onChange, value, showTime } = this.props;
     return (
       <DatePicker
+        value={moment(value)}
+        showTime={showTime}
         onChange={(val) => {
           onChange(val.format());
         }}
@@ -62,9 +64,10 @@ class StringDateSetter extends Component {
 // eslint-disable-next-line react/no-multi-comp
 class StringTimePicker extends Component {
   render() {
-    const { onChange } = this.props;
+    const { onChange, value } = this.props;
     return (
       <TimePicker
+        value={moment(value)}
         onChange={(val) => {
           onChange(val.format('HH:mm:ss'));
         }}
diff --git a/src/setter/expression-setter/index.tsx b/src/setter/expression-setter/index.tsx
@@ -269,11 +269,11 @@ export default class ExpressionView extends PureComponent {
                   innerAfter={<span style={{ color: '#999', marginRight: 4 }}>{'}}'}</span>}
                   popupClassName="expression-setter-item-inner"
                   // eslint-disable-next-line no-shadow
-                  itemRender={({ itemValue }) => {
+                  itemRender={(itemValue) => {
                     return (
-                      <Option key={itemValue} text={itemValue} value={itemValue}>
-                        <div className="code-input-value">{itemValue}</div>
-                        <div className="code-input-help">{helpMap[itemValue]}</div>
+                      <Option key={itemValue.value} text={itemValue.label} value={itemValue.value}>
+                        <div className="code-input-value">{itemValue.value}</div>
+                        <div className="code-input-help">{helpMap[itemValue.value]}</div>
                       </Option>
                     );
                   }}
diff --git a/src/setter/json-setter/index.tsx b/src/setter/json-setter/index.tsx
@@ -2,10 +2,12 @@ import React, { PureComponent } from 'react';
 // import PropTypes from 'prop-types';
 import { Button, Icon, Dialog } from '@alifd/next';
 import MonacoEditor from '@alilc/lowcode-plugin-base-monaco-editor';
+import CustomIcon from '../../components/custom-icon';
 import { js_beautify } from 'js-beautify';
 
 const defaultEditorOption = {
-  style: { width: '100%', height: '100%' },
+  width: '100%',
+  height: 400,
   readOnly: false,
   automaticLayout: true,
   folding: true, // 默认开启折叠代码功能
@@ -115,7 +117,7 @@ export default class JsonSetter extends PureComponent<JsonSetterProps> {
     return (
       <div>
         <Button size="small" type="primary" onClick={this.openDialog}>
-          <Icon type="edit" />
+          <CustomIcon type="icon-ic_edit" />
           编辑数据
         </Button>
       </div>

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "@alilc/lowcode-engine-ext",`
`3`		`- "version": "1.0.1-beta.2",`
	`3`	`+ "version": "1.0.2-beta.1",`
`4`	`4`	`"description": "",`
`5`	`5`	`"files": [`
`6`	`6`	`"dist",`
`@@ -70,5 +70,5 @@`
`70`	`70`	`"registry": "https://registry.npmjs.org/"`
`71`	`71`	`},`
`72`	`72`	`"license": "MIT",`
`73`		`- "homepage": "https://unpkg.com/@alilc/lowcode-engine-ext@1.0.1-beta.2/build/index.html"`
	`73`	`+ "homepage": "https://unpkg.com/@alilc/lowcode-engine-ext@1.0.2-beta.1/build/index.html"`
`74`	`74`	`}`