Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commite78671f

Browse files
authored
Merge pull request#742 from raheeliftikhar5/handle_defaultValue
Separate defaultValue and Value for input/select components
2 parents4f80cae +abe4b20 commite78671f

File tree

13 files changed

+72
-12
lines changed

13 files changed

+72
-12
lines changed

‎client/packages/lowcoder-comps/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name":"lowcoder-comps",
3-
"version":"0.0.26",
3+
"version":"0.0.27",
44
"type":"module",
55
"license":"MIT",
66
"dependencies": {

‎client/packages/lowcoder-comps/src/comps/chartComp/chartComp.tsx

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,9 @@ ChartTmpComp = withViewFn(ChartTmpComp, (comp) => {
120120

121121
consthandleOnMapScriptLoad=()=>{
122122
setMapScriptLoaded(true);
123-
loadGoogleMapData();
123+
setTimeout(()=>{
124+
loadGoogleMapData();
125+
})
124126
}
125127

126128
useEffect(()=>{

‎client/packages/lowcoder/src/comps/comps/numberInputComp/numberInputComp.tsx

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,8 @@ import {
5252

5353
import{useContext}from"react";
5454
import{EditorContext}from"comps/editorState";
55+
import{migrateOldData}from"comps/generators/simpleGenerators";
56+
import{fixOldInputCompData}from"../textInputComp/textInputConstants";
5557

5658
constgetStyle=(style:InputLikeStyleType)=>{
5759
returncss`
@@ -372,7 +374,7 @@ const CustomInputNumber = (props: RecordConstructorToView<typeof childrenMap>) =
372374
);
373375
};
374376

375-
constNumberInputTmpComp=(function(){
377+
letNumberInputTmpComp=(function(){
376378
returnnewUICompBuilder(childrenMap,(props)=>{
377379
returnprops.label({
378380
required:props.required,
@@ -434,6 +436,8 @@ const NumberInputTmpComp = (function () {
434436
.build();
435437
})();
436438

439+
NumberInputTmpComp=migrateOldData(NumberInputTmpComp,fixOldInputCompData);
440+
437441
constNumberInputTmp2Comp=withMethodExposing(
438442
NumberInputTmpComp,
439443
refMethods([

‎client/packages/lowcoder/src/comps/comps/selectInputComp/checkboxComp.tsx

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,8 @@ import { ValueFromOption } from "lowcoder-design";
2222
import{EllipsisTextCss}from"lowcoder-design";
2323
import{trans}from"i18n";
2424
import{RefControl}from"comps/controls/refControl";
25+
import{migrateOldData}from"comps/generators/simpleGenerators";
26+
import{fixOldInputCompData}from"../textInputComp/textInputConstants";
2527

2628
exportconstgetStyle=(style:CheckboxStyleType)=>{
2729
returncss`
@@ -126,7 +128,7 @@ const CheckboxGroup = styled(AntdCheckboxGroup) <{
126128
}}
127129
`;
128130

129-
constCheckboxBasicComp=(function(){
131+
letCheckboxBasicComp=(function(){
130132
constchildrenMap={
131133
defaultValue:arrayStringExposingStateControl("defaultValue"),
132134
value:arrayStringExposingStateControl("value"),
@@ -176,6 +178,8 @@ const CheckboxBasicComp = (function () {
176178
.build();
177179
})();
178180

181+
CheckboxBasicComp=migrateOldData(CheckboxBasicComp,fixOldInputCompData);
182+
179183
exportconstCheckboxComp=withExposingConfigs(CheckboxBasicComp,[
180184
newNameConfig("value",trans("selectInput.valueDesc")),
181185
SelectInputInvalidConfig,

‎client/packages/lowcoder/src/comps/comps/selectInputComp/multiSelectComp.tsx

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,10 @@ import { SelectInputInvalidConfig, useSelectInputValidate } from "./selectInputC
1414

1515
import{PaddingControl}from"../../controls/paddingControl";
1616
import{MarginControl}from"../../controls/marginControl";
17-
import{useEffect,useRef}from"react";
17+
import{migrateOldData}from"comps/generators/simpleGenerators";
18+
import{fixOldInputCompData}from"../textInputComp/textInputConstants";
1819

19-
constMultiSelectBasicComp=(function(){
20+
letMultiSelectBasicComp=(function(){
2021
constchildrenMap={
2122
...SelectChildrenMap,
2223
defaultValue:arrayStringExposingStateControl("defaultValue",["1","2"]),
@@ -52,6 +53,8 @@ const MultiSelectBasicComp = (function () {
5253
.build();
5354
})();
5455

56+
MultiSelectBasicComp=migrateOldData(MultiSelectBasicComp,fixOldInputCompData);
57+
5558
exportconstMultiSelectComp=withExposingConfigs(MultiSelectBasicComp,[
5659
newNameConfig("value",trans("selectInput.valueDesc")),
5760
newNameConfig("inputValue",trans("select.inputValueDesc")),

‎client/packages/lowcoder/src/comps/comps/selectInputComp/radioComp.tsx

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,8 @@ import {
1111
}from"./selectInputConstants";
1212
import{EllipsisTextCss,ValueFromOption}from"lowcoder-design";
1313
import{trans}from"i18n";
14+
import{fixOldInputCompData}from"../textInputComp/textInputConstants";
15+
import{migrateOldData}from"comps/generators/simpleGenerators";
1416

1517
constgetStyle=(style:RadioStyleType)=>{
1618
returncss`
@@ -93,7 +95,7 @@ const Radio = styled(AntdRadioGroup)<{
9395
}}
9496
`;
9597

96-
constRadioBasicComp=(function(){
98+
letRadioBasicComp=(function(){
9799
returnnewUICompBuilder(RadioChildrenMap,(props)=>{
98100
const[
99101
validateState,
@@ -129,6 +131,8 @@ const RadioBasicComp = (function () {
129131
.build();
130132
})();
131133

134+
RadioBasicComp=migrateOldData(RadioBasicComp,fixOldInputCompData);
135+
132136
exportconstRadioComp=withExposingConfigs(RadioBasicComp,[
133137
newNameConfig("value",trans("selectInput.valueDesc")),
134138
SelectInputInvalidConfig,

‎client/packages/lowcoder/src/comps/comps/selectInputComp/segmentedControl.tsx

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,9 @@ import { RefControl } from "comps/controls/refControl";
2525

2626
import{useContext}from"react";
2727
import{EditorContext}from"comps/editorState";
28+
import{migrateOldData}from"comps/generators/simpleGenerators";
29+
import{fixOldInputCompData}from"../textInputComp/textInputConstants";
30+
2831

2932
constgetStyle=(style:SegmentStyleType)=>{
3033
returncss`
@@ -83,7 +86,7 @@ const SegmentChildrenMap = {
8386
...formDataChildren,
8487
};
8588

86-
constSegmentedControlBasicComp=(function(){
89+
letSegmentedControlBasicComp=(function(){
8790
returnnewUICompBuilder(SegmentChildrenMap,(props)=>{
8891
const[
8992
validateState,
@@ -147,6 +150,8 @@ const SegmentedControlBasicComp = (function () {
147150
.build();
148151
})();
149152

153+
SegmentedControlBasicComp=migrateOldData(SegmentedControlBasicComp,fixOldInputCompData);
154+
150155
exportconstSegmentedControlComp=withExposingConfigs(SegmentedControlBasicComp,[
151156
newNameConfig("value",trans("selectInput.valueDesc")),
152157
SelectInputInvalidConfig,

‎client/packages/lowcoder/src/comps/comps/selectInputComp/selectComp.tsx

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,10 @@ import {
1717
}from"./selectInputConstants";
1818
import{useRef}from"react";
1919
import{RecordConstructorToView}from"lowcoder-core";
20+
import{fixOldInputCompData}from"../textInputComp/textInputConstants";
21+
import{migrateOldData}from"comps/generators/simpleGenerators";
2022

21-
constSelectBasicComp=(function(){
23+
letSelectBasicComp=(function(){
2224
constchildrenMap={
2325
...SelectChildrenMap,
2426
defaultValue:stringExposingStateControl("defaultValue"),
@@ -55,6 +57,8 @@ const SelectBasicComp = (function () {
5557
.build();
5658
})();
5759

60+
SelectBasicComp=migrateOldData(SelectBasicComp,fixOldInputCompData);
61+
5862
exportconstSelectComp=withExposingConfigs(SelectBasicComp,[
5963
newNameConfig("value",trans("selectInput.valueDesc")),
6064
newNameConfig("inputValue",trans("select.inputValueDesc")),

‎client/packages/lowcoder/src/comps/comps/textInputComp/inputComp.tsx

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ import styled from "styled-components";
1111
import{UICompBuilder}from"../../generators";
1212
import{FormDataPropertyView}from"../formComp/formDataConstants";
1313
import{
14+
fixOldInputCompData,
1415
getStyle,
1516
inputRefMethods,
1617
TextInputBasicSection,
@@ -30,6 +31,7 @@ import { IconControl } from "comps/controls/iconControl";
3031
import{hasIcon}from"comps/utils";
3132
import{InputRef}from"antd/es/input";
3233
import{RefControl}from"comps/controls/refControl";
34+
import{migrateOldData}from"comps/generators/simpleGenerators";
3335

3436
importReact,{useContext}from"react";
3537
import{EditorContext}from"comps/editorState";
@@ -52,7 +54,7 @@ const childrenMap = {
5254
suffixIcon:IconControl,
5355
};
5456

55-
exportconstInputComp=newUICompBuilder(childrenMap,(props)=>{
57+
letInputBasicComp=newUICompBuilder(childrenMap,(props)=>{
5658
const[inputProps,validateState]=useTextInputProps(props);
5759
returnprops.label({
5860
required:props.required,
@@ -108,3 +110,8 @@ export const InputComp = new UICompBuilder(childrenMap, (props) => {
108110
...TextInputConfigs,
109111
])
110112
.build();
113+
114+
115+
constInputComp=migrateOldData(InputBasicComp,fixOldInputCompData);
116+
117+
export{InputComp};

‎client/packages/lowcoder/src/comps/comps/textInputComp/mentionComp.tsx

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ import { UICompBuilder } from "../../generators";
1212
import{FormDataPropertyView}from"../formComp/formDataConstants";
1313
import{
1414
checkMentionListData,
15+
fixOldInputCompData,
1516
textInputChildren,
1617
}from"./textInputConstants";
1718
import{
@@ -42,7 +43,7 @@ import { blurMethod, focusWithOptions } from "comps/utils/methodUtils";
4243
import{
4344
textInputValidate,
4445
}from"../textInputComp/textInputConstants";
45-
import{jsonControl}from"@lowcoder-ee/comps/controls/codeControl";
46+
import{jsonControl}from"comps/controls/codeControl";
4647
import{
4748
submitEvent,
4849
eventHandlerControl,
@@ -54,6 +55,7 @@ import {
5455

5556
importReact,{useContext}from"react";
5657
import{EditorContext}from"comps/editorState";
58+
import{migrateOldData}from"comps/generators/simpleGenerators";
5759

5860
constWrapper=styled.div<{
5961
$style:InputLikeStyleType;
@@ -267,12 +269,15 @@ let MentionTmpComp = (function () {
267269
.build();
268270
})();
269271

272+
270273
MentionTmpComp=classextendsMentionTmpComp{
271274
overrideautoHeight():boolean{
272275
returnthis.children.autoHeight.getView();
273276
}
274277
};
275278

279+
MentionTmpComp=migrateOldData(MentionTmpComp,fixOldInputCompData);
280+
276281
constTextareaTmp2Comp=withMethodExposing(
277282
MentionTmpComp,
278283
refMethods([focusWithOptions,blurMethod])

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp