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

Bump org.json:json from 20230227 to 20231013 in /server/api-service/lowcoder-dependencies#768

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to ourterms of service andprivacy statement. We’ll occasionally send you account related emails.

Already on GitHub?Sign in to your account

Open
dependabot wants to merge14 commits intomain
base:main
Choose a base branch
Loading
fromdependabot/maven/server/api-service/lowcoder-dependencies/org.json-json-20231013
Open
Show file tree
Hide file tree
Changes fromall commits
Commits
Show all changes
14 commits
Select commitHold shift + click to select a range
80d78f9
separate defaultValue and value for old input/select comps
raheeliftikhar5Mar 5, 2024
f324f75
map ready state fix
raheeliftikhar5Mar 5, 2024
abe4b20
update lowcoder-comps version
raheeliftikhar5Mar 5, 2024
20f5bc8
New plugin system
ludomikulaFeb 5, 2024
e78671f
Merge pull request #742 from raheeliftikhar5/handle_defaultValue
FalkWolskyMar 5, 2024
b58a742
new: plugin endpoint security basics
ludomikulaMar 5, 2024
800c16c
Merge branch 'lowcoder-org:dev' into dev
ludomikulaMar 6, 2024
eb0e0d5
feature: Extended folder to have more meta-data i.e: title, descripti…
irfan-ikhwaMar 6, 2024
348c98e
Merge branch 'lowcoder-org:dev' into dev
ludomikulaMar 8, 2024
3476223
Merge pull request #767 from Lowcoder-Pro/dev
FalkWolskyMar 24, 2024
eeef89a
Fixing AssetService - after Falk broke it.
Mar 24, 2024
d602bd4
Enabling display of Version Number for Remote Components
Mar 24, 2024
33d8210
Merge pull request #766 from lowcoder-org/cherry-release
FalkWolskyMar 24, 2024
2742a53
Bump org.json:json in /server/api-service/lowcoder-dependencies
dependabot[bot]Mar 24, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions.gitignore
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -9,3 +9,4 @@ client/node_modules/
client/packages/lowcoder-plugin-demo/.yarn/install-state.gz
client/packages/lowcoder-plugin-demo/yarn.lock
client/packages/lowcoder-plugin-demo/.yarn/cache/@types-node-npm-16.18.68-56f72825c0-094ae9ed80.zip
application-dev.yml
2 changes: 1 addition & 1 deletionclient/packages/lowcoder-comps/package.json
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
{
"name": "lowcoder-comps",
"version": "0.0.26",
"version": "0.0.27",
"type": "module",
"license": "MIT",
"dependencies": {
Expand Down
7 changes: 7 additions & 0 deletionsclient/packages/lowcoder/src/components/CompName.tsx
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -112,6 +112,13 @@ export const CompName = (props: Iprops) => {


if (compInfo.isRemote) {
items.push({
text: trans("history.currentVersion") + ": " + compInfo.packageVersion,
onClick: () => {

},
});

items.push({
text: trans("comp.menuUpgradeToLatest"),
onClick: () => {
Expand Down
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -52,6 +52,8 @@ import {

import { useContext } from "react";
import { EditorContext } from "comps/editorState";
import { migrateOldData } from "comps/generators/simpleGenerators";
import { fixOldInputCompData } from "../textInputComp/textInputConstants";

const getStyle = (style: InputLikeStyleType) => {
return css`
Expand DownExpand Up@@ -372,7 +374,7 @@ const CustomInputNumber = (props: RecordConstructorToView<typeof childrenMap>) =
);
};

const NumberInputTmpComp = (function () {
let NumberInputTmpComp = (function () {
return new UICompBuilder(childrenMap, (props) => {
return props.label({
required: props.required,
Expand DownExpand Up@@ -434,6 +436,8 @@ const NumberInputTmpComp = (function () {
.build();
})();

NumberInputTmpComp = migrateOldData(NumberInputTmpComp, fixOldInputCompData);

const NumberInputTmp2Comp = withMethodExposing(
NumberInputTmpComp,
refMethods([
Expand Down
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -22,6 +22,8 @@ import { ValueFromOption } from "lowcoder-design";
import { EllipsisTextCss } from "lowcoder-design";
import { trans } from "i18n";
import { RefControl } from "comps/controls/refControl";
import { migrateOldData } from "comps/generators/simpleGenerators";
import { fixOldInputCompData } from "../textInputComp/textInputConstants";

export const getStyle = (style: CheckboxStyleType) => {
return css`
Expand DownExpand Up@@ -126,7 +128,7 @@ const CheckboxGroup = styled(AntdCheckboxGroup) <{
}}
`;

const CheckboxBasicComp = (function () {
let CheckboxBasicComp = (function () {
const childrenMap = {
defaultValue: arrayStringExposingStateControl("defaultValue"),
value: arrayStringExposingStateControl("value"),
Expand DownExpand Up@@ -176,6 +178,8 @@ const CheckboxBasicComp = (function () {
.build();
})();

CheckboxBasicComp = migrateOldData(CheckboxBasicComp, fixOldInputCompData);

export const CheckboxComp = withExposingConfigs(CheckboxBasicComp, [
new NameConfig("value", trans("selectInput.valueDesc")),
SelectInputInvalidConfig,
Expand Down
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -14,9 +14,10 @@ import { SelectInputInvalidConfig, useSelectInputValidate } from "./selectInputC

import { PaddingControl } from "../../controls/paddingControl";
import { MarginControl } from "../../controls/marginControl";
import { useEffect, useRef } from "react";
import { migrateOldData } from "comps/generators/simpleGenerators";
import { fixOldInputCompData } from "../textInputComp/textInputConstants";

const MultiSelectBasicComp = (function () {
let MultiSelectBasicComp = (function () {
const childrenMap = {
...SelectChildrenMap,
defaultValue: arrayStringExposingStateControl("defaultValue", ["1", "2"]),
Expand DownExpand Up@@ -52,6 +53,8 @@ const MultiSelectBasicComp = (function () {
.build();
})();

MultiSelectBasicComp = migrateOldData(MultiSelectBasicComp, fixOldInputCompData);

export const MultiSelectComp = withExposingConfigs(MultiSelectBasicComp, [
new NameConfig("value", trans("selectInput.valueDesc")),
new NameConfig("inputValue", trans("select.inputValueDesc")),
Expand Down
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -11,6 +11,8 @@ import {
} from "./selectInputConstants";
import { EllipsisTextCss, ValueFromOption } from "lowcoder-design";
import { trans } from "i18n";
import { fixOldInputCompData } from "../textInputComp/textInputConstants";
import { migrateOldData } from "comps/generators/simpleGenerators";

const getStyle = (style: RadioStyleType) => {
return css`
Expand DownExpand Up@@ -93,7 +95,7 @@ const Radio = styled(AntdRadioGroup)<{
}}
`;

const RadioBasicComp = (function () {
let RadioBasicComp = (function () {
return new UICompBuilder(RadioChildrenMap, (props) => {
const [
validateState,
Expand DownExpand Up@@ -129,6 +131,8 @@ const RadioBasicComp = (function () {
.build();
})();

RadioBasicComp = migrateOldData(RadioBasicComp, fixOldInputCompData);

export const RadioComp = withExposingConfigs(RadioBasicComp, [
new NameConfig("value", trans("selectInput.valueDesc")),
SelectInputInvalidConfig,
Expand Down
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -25,6 +25,9 @@ import { RefControl } from "comps/controls/refControl";

import { useContext } from "react";
import { EditorContext } from "comps/editorState";
import { migrateOldData } from "comps/generators/simpleGenerators";
import { fixOldInputCompData } from "../textInputComp/textInputConstants";


const getStyle = (style: SegmentStyleType) => {
return css`
Expand DownExpand Up@@ -83,7 +86,7 @@ const SegmentChildrenMap = {
...formDataChildren,
};

const SegmentedControlBasicComp = (function () {
let SegmentedControlBasicComp = (function () {
return new UICompBuilder(SegmentChildrenMap, (props) => {
const [
validateState,
Expand DownExpand Up@@ -147,6 +150,8 @@ const SegmentedControlBasicComp = (function () {
.build();
})();

SegmentedControlBasicComp = migrateOldData(SegmentedControlBasicComp, fixOldInputCompData);

export const SegmentedControlComp = withExposingConfigs(SegmentedControlBasicComp, [
new NameConfig("value", trans("selectInput.valueDesc")),
SelectInputInvalidConfig,
Expand Down
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -17,8 +17,10 @@ import {
} from "./selectInputConstants";
import { useRef } from "react";
import { RecordConstructorToView } from "lowcoder-core";
import { fixOldInputCompData } from "../textInputComp/textInputConstants";
import { migrateOldData } from "comps/generators/simpleGenerators";

const SelectBasicComp = (function () {
let SelectBasicComp = (function () {
const childrenMap = {
...SelectChildrenMap,
defaultValue: stringExposingStateControl("defaultValue"),
Expand DownExpand Up@@ -55,6 +57,8 @@ const SelectBasicComp = (function () {
.build();
})();

SelectBasicComp = migrateOldData(SelectBasicComp, fixOldInputCompData);

export const SelectComp = withExposingConfigs(SelectBasicComp, [
new NameConfig("value", trans("selectInput.valueDesc")),
new NameConfig("inputValue", trans("select.inputValueDesc")),
Expand Down
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -11,6 +11,7 @@ import styled from "styled-components";
import { UICompBuilder } from "../../generators";
import { FormDataPropertyView } from "../formComp/formDataConstants";
import {
fixOldInputCompData,
getStyle,
inputRefMethods,
TextInputBasicSection,
Expand All@@ -30,6 +31,7 @@ import { IconControl } from "comps/controls/iconControl";
import { hasIcon } from "comps/utils";
import { InputRef } from "antd/es/input";
import { RefControl } from "comps/controls/refControl";
import { migrateOldData } from "comps/generators/simpleGenerators";

import React, { useContext } from "react";
import { EditorContext } from "comps/editorState";
Expand All@@ -52,7 +54,7 @@ const childrenMap = {
suffixIcon: IconControl,
};

export const InputComp = new UICompBuilder(childrenMap, (props) => {
let InputBasicComp = new UICompBuilder(childrenMap, (props) => {
const [inputProps, validateState] = useTextInputProps(props);
return props.label({
required: props.required,
Expand DownExpand Up@@ -108,3 +110,8 @@ export const InputComp = new UICompBuilder(childrenMap, (props) => {
...TextInputConfigs,
])
.build();


const InputComp = migrateOldData(InputBasicComp, fixOldInputCompData);

export { InputComp };
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -12,6 +12,7 @@ import { UICompBuilder } from "../../generators";
import{FormDataPropertyView}from"../formComp/formDataConstants";
import{
checkMentionListData,
fixOldInputCompData,
textInputChildren,
}from"./textInputConstants";
import{
Expand DownExpand Up@@ -42,7 +43,7 @@ import { blurMethod, focusWithOptions } from "comps/utils/methodUtils";
import{
textInputValidate,
}from"../textInputComp/textInputConstants";
import{jsonControl}from"@lowcoder-ee/comps/controls/codeControl";
import{jsonControl}from"comps/controls/codeControl";
import{
submitEvent,
eventHandlerControl,
Expand All@@ -54,6 +55,7 @@ import {

importReact,{useContext}from"react";
import{EditorContext}from"comps/editorState";
import{migrateOldData}from"comps/generators/simpleGenerators";

constWrapper=styled.div<{
$style:InputLikeStyleType;
Expand DownExpand Up@@ -267,12 +269,15 @@ let MentionTmpComp = (function () {
.build();
})();


MentionTmpComp=classextendsMentionTmpComp{
overrideautoHeight():boolean{
returnthis.children.autoHeight.getView();
}
};

MentionTmpComp=migrateOldData(MentionTmpComp,fixOldInputCompData);

constTextareaTmp2Comp=withMethodExposing(
MentionTmpComp,
refMethods([focusWithOptions,blurMethod])
Expand Down
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -13,6 +13,7 @@ import { LabelControl } from "../../controls/labelControl";
import { UICompBuilder, withDefault } from "../../generators";
import { FormDataPropertyView } from "../formComp/formDataConstants";
import {
fixOldInputCompData,
getStyle,
inputRefMethods,
TextInputBasicSection,
Expand DownExpand Up@@ -40,14 +41,15 @@ import { hasIcon } from "comps/utils";
import { RefControl } from "comps/controls/refControl";
import React, { useContext } from "react";
import { EditorContext } from "comps/editorState";
import { migrateOldData } from "comps/generators/simpleGenerators";

const PasswordStyle = styled(InputPassword)<{
$style: InputLikeStyleType;
}>`
${(props) => props.$style && getStyle(props.$style)}
`;

const PasswordTmpComp = (function () {
let PasswordTmpComp = (function () {
const childrenMap = {
...textInputChildren,
viewRef: RefControl<InputRef>,
Expand DownExpand Up@@ -111,6 +113,8 @@ const PasswordTmpComp = (function () {
.build();
})();

PasswordTmpComp = migrateOldData(PasswordTmpComp, fixOldInputCompData);

const PasswordTmp2Comp = withMethodExposing(PasswordTmpComp, inputRefMethods);

export const PasswordComp = withExposingConfigs(PasswordTmp2Comp, [
Expand Down
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -10,6 +10,7 @@ import { AutoHeightControl } from "../../controls/autoHeightControl";
import { UICompBuilder, withDefault } from "../../generators";
import { FormDataPropertyView } from "../formComp/formDataConstants";
import {
fixOldInputCompData,
getStyle,
TextInputBasicSection,
textInputChildren,
Expand All@@ -35,6 +36,7 @@ import { blurMethod, focusWithOptions } from "comps/utils/methodUtils";

import React, { useContext } from "react";
import { EditorContext } from "comps/editorState";
import { migrateOldData } from "comps/generators/simpleGenerators";

const TextAreaStyled = styled(TextArea)<{
$style: InputLikeStyleType;
Expand DownExpand Up@@ -126,6 +128,8 @@ TextAreaTmpComp = class extends TextAreaTmpComp {
}
};

TextAreaTmpComp = migrateOldData(TextAreaTmpComp, fixOldInputCompData);

const TextareaTmp2Comp = withMethodExposing(
TextAreaTmpComp,
refMethods([focusWithOptions, blurMethod])
Expand Down
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -305,3 +305,17 @@ export function checkMentionListData(data: any) {
}
return data
}

// separate defaultValue and value for old components
export function fixOldInputCompData(oldData: any) {
if (!oldData) return oldData;
if (Boolean(oldData.value) && !Boolean(oldData.defaultValue)) {
const value = oldData.value;
return {
...oldData,
defaultValue: value,
value: '',
};
}
return oldData;
}
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -96,7 +96,7 @@ export function PluginCompItem(props: PluginCompItemProps) {
</div>
<div className="module-content">
<div className="module-name">{compMeta.name}</div>
<div className="module-desc">{compMeta.description || "No description."}</div>
<div className="module-desc">{compMeta.description || "No description."} <span>v{packageVersion || ""}</span></div>
</div>
</ItemWrapper>
);
Expand Down
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -7,7 +7,7 @@ import { getUser } from "redux/selectors/usersSelectors";
import { BluePlusIcon, CustomModal, DocLink, TacoButton, TacoInput } from "lowcoder-design";
import { getCommonSettings } from "redux/selectors/commonSettingSelectors";
import styled from "styled-components";
import { normalizeNpmPackage, validateNpmPackage } from "comps/utils/remote";
import {getNpmPackageMeta,normalizeNpmPackage, validateNpmPackage } from "comps/utils/remote";
import { ComListTitle, ExtensionContentWrapper } from "../styledComponent";
import { EmptyContent } from "components/EmptyContent";
import { messageInstance } from "lowcoder-design";
Expand DownExpand Up@@ -37,6 +37,8 @@ export default function PluginPanel() {
[commonSettings?.npmPlugins]
);

console.log("plugins: ", plugins);

const handleSetNpmPlugins = (nextNpmPlugins: string[]) => {
dispatch(
setCommonSettings({
Expand Down
Loading
[8]ページ先頭
©2009-2025 Movatter.jp