Browse Source

update

main
wangshaoping 1 year ago
parent
commit
3053897f4a
  1. 4
      io.sc.engine.mv.frontend/package.json
  2. 18
      io.sc.platform.core.frontend/src/platform/components/form/elements/WCodeMirror.vue
  3. 4
      io.sc.platform.core.frontend/src/views/FormElements.vue
  4. 4
      io.sc.platform.data/new.csv
  5. 27
      io.sc.platform.data/src/main/java/io/sc/platform/data/csv/CsvItemReader.java
  6. 6
      io.sc.platform.developer.frontend/package.json
  7. 2
      io.sc.platform.developer.frontend/src/components/index.ts
  8. 3
      io.sc.platform.developer.frontend/src/i18n/messages.json
  9. 3
      io.sc.platform.developer.frontend/src/i18n/messages_tw_CN.json
  10. 3
      io.sc.platform.developer.frontend/src/i18n/messages_zh_CN.json
  11. 7
      io.sc.platform.developer.frontend/src/menus/menus.json
  12. 13
      io.sc.platform.developer.frontend/src/routes/routes.json
  13. 55
      io.sc.platform.jdbc.liquibase/src/main/java/io/sc/platform/jdbc/liquibase/task/CsvTaskChange.java
  14. 13
      io.sc.platform.jdbc.liquibase/src/main/java/io/sc/platform/jdbc/liquibase/task/new.cfg.json
  15. 4
      io.sc.platform.jdbc.liquibase/src/main/java/io/sc/platform/jdbc/liquibase/task/new.csv
  16. 4
      io.sc.platform.lcdp.frontend/package.json
  17. 4
      io.sc.platform.mvc.frontend/package.json
  18. 4
      io.sc.platform.security.frontend/package.json
  19. 4
      io.sc.platform.system.frontend/package.json

4
io.sc.engine.mv.frontend/package.json

@ -4,7 +4,7 @@
"description": "",
"private": false,
"keywords": [
],
"author": "",
"license": "ISC",
@ -102,4 +102,4 @@
"codemirror": "6.0.1",
"vue-codemirror6": "1.2.0"
}
}
}

18
io.sc.platform.core.frontend/src/platform/components/form/elements/WCodeMirror.vue

@ -6,7 +6,7 @@
</q-field>
</template>
<script setup lang="ts">
import { ref, useAttrs, onMounted, onUnmounted, onUpdated } from 'vue';
import { ref, useAttrs, onMounted, onUnmounted, watch } from 'vue';
import { Tools } from '@/platform';
import { EditorView } from '@codemirror/view';
import { EditorState, Compartment } from '@codemirror/state';
@ -125,6 +125,15 @@ onMounted(() => {
parent: codemirrorRef.value,
doc: props.modelValue,
});
watch(
() => props.modelValue,
() => {
// ,,
if (!isFocus) {
editorView.dispatch({ changes: { from: 0, to: editorView.state.doc.length, insert: props.modelValue } });
}
},
);
}
});
@ -132,13 +141,6 @@ onUnmounted(() => {
editorView.destroy();
});
onUpdated(() => {
if (!isFocus) {
// ,,
editorView.dispatch({ changes: { from: 0, to: editorView.state.doc.length, insert: props.modelValue } });
}
});
const focus = () => {
isFocus = true;
stackLabelRef.value = true;

4
io.sc.platform.core.frontend/src/views/FormElements.vue

@ -2,8 +2,8 @@
<q-splitter v-model="splitWidthRef">
<template #before>
<q-tabs v-model="selectedTab" vertical no-caps>
<q-tab name="formElements" label="Form Elements" />
<q-tab name="codemirror" label="w-code-mirror" />
<q-tab name="formElements" label="All Form Elements" />
<q-tab name="codemirror" label="code-mirror" />
</q-tabs>
</template>

4
io.sc.platform.data/new.csv

@ -0,0 +1,4 @@
"col1","col2,name
ok,""ok"""
"col1","col2,name
ok,""ok"""
1 col1 col2,name ok,"ok"
2 col1 col2,name ok,"ok"

27
io.sc.platform.data/src/main/java/io/sc/platform/data/csv/CsvItemReader.java

@ -2,14 +2,14 @@ package io.sc.platform.data.csv;
import com.opencsv.CSVReader;
import com.opencsv.CSVReaderBuilder;
import com.opencsv.CSVWriter;
import io.sc.platform.data.ItemReader;
import org.springframework.core.io.DefaultResourceLoader;
import org.springframework.core.io.Resource;
import org.springframework.util.StringUtils;
import java.io.BufferedReader;
import java.io.IOException;
import java.io.InputStreamReader;
import java.io.*;
import java.util.Arrays;
import java.util.Iterator;
public class CsvItemReader implements ItemReader<Record> {
@ -96,4 +96,25 @@ public class CsvItemReader implements ItemReader<Record> {
public void setIterator(Iterator<String[]> iterator) {
this.iterator = iterator;
}
public static void main(String[] args) throws IOException {
FileWriter writer =new FileWriter("/Users/wangshaoping/wspsc/workspace/wangshaoping/v8/platform/io.sc.platform.data/new.csv");
CSVWriter csvWriter = new CSVWriter(writer);
String[] records =new String[2];
records[0] ="col1";
records[1] ="col2,name\nok,\"ok\"";
csvWriter.writeNext(records);
records =new String[2];
records[0] ="col1";
records[1] ="col2,name\nok,\"ok\"";
csvWriter.writeNext(records);
csvWriter.close();
BufferedReader bufferedReader = new BufferedReader(new InputStreamReader(new FileInputStream("/Users/wangshaoping/wspsc/workspace/wangshaoping/v8/platform/io.sc.platform.data/new.csv")));
CSVReader reader = new CSVReaderBuilder(bufferedReader).build();
Iterator<String[]> iterator = reader.iterator();
while(iterator.hasNext()){
System.out.println(Arrays.toString(iterator.next()));
}
}
}

6
io.sc.platform.developer.frontend/package.json

@ -4,7 +4,7 @@
"description": "",
"private": false,
"keywords": [
],
"author": "",
"license": "ISC",
@ -80,7 +80,7 @@
"luckyexcel": "1.0.1",
"mockjs": "1.1.0",
"pinia": "2.1.7",
"platform-core": "8.1.119",
"platform-core": "8.1.126",
"quasar": "2.14.2",
"tailwindcss": "3.4.0",
"vue": "3.4.3",
@ -102,4 +102,4 @@
"codemirror": "6.0.1",
"vue-codemirror6": "1.2.0"
}
}
}

2
io.sc.platform.developer.frontend/src/components/index.ts

@ -24,6 +24,7 @@ import Security from '@/views/plugin/Security.vue';
import Ws from '@/views/plugin/Ws.vue';
import Swagger from '@/views/plugin/Swagger.vue';
import SystemProperties from '@/views/plugin/SystemProperties.vue';
import exportLiquibase from '@/views/backend/ExportLiquibase.vue';
import Icons from '@/views/frontend/Icons.vue';
const localComponents = {
@ -49,6 +50,7 @@ const localComponents = {
'component.developer.plugin.Ws': Ws,
'component.developer.plugin.Swagger': Swagger,
'component.developer.plugin.SystemProperties': SystemProperties,
'component.developer.backend.exportLiquibase': exportLiquibase,
'component.developer.frontend.Icons': Icons,
};

3
io.sc.platform.developer.frontend/src/i18n/messages.json

@ -26,6 +26,9 @@
"menu.developer.plugin.menus" : "Menu",
"menu.developer.plugin.ws" : "WebService",
"menu.developer.backend" : "Back End Tools",
"menu.developer.backend.export.liquibase" : "Data Export(liquibase)",
"menu.developer.frontend" : "Front End Tools",
"menu.developer.frontend.icons" : "Icons"

3
io.sc.platform.developer.frontend/src/i18n/messages_tw_CN.json

@ -26,6 +26,9 @@
"menu.developer.plugin.menus" : "菜單",
"menu.developer.plugin.ws" : "Web 服務",
"menu.developer.backend" : "後端工具",
"menu.developer.backend.export.liquibase" : "數據導出(liquibase)",
"menu.developer.frontend" : "前端工具",
"menu.developer.frontend.icons" : "圖標庫"

3
io.sc.platform.developer.frontend/src/i18n/messages_zh_CN.json

@ -26,6 +26,9 @@
"menu.developer.plugin.menus" : "菜单",
"menu.developer.plugin.ws" : "Web 服务",
"menu.developer.backend" : "后端工具",
"menu.developer.backend.export.liquibase" : "数据导出(liquibase)",
"menu.developer.frontend" : "前端工具",
"menu.developer.frontend.icons" : "图标库"
}

7
io.sc.platform.developer.frontend/src/menus/menus.json

@ -69,8 +69,13 @@
/*//Swagger*/
{"type":"ROUTE", "order":1600, "parentId":"menu.developer.plugin", "id":"menu.developer.plugin.swagger", "titleI18nKey":"menu.developer.plugin.swagger", "icon":"bi-filetype-html", "routeName":"route.developer.plugin.swagger"},
/*/*/
{"type":"GROUP", "order":500, "parentId":"menu.developer", "id":"menu.developer.backend", "titleI18nKey":"menu.developer.backend", "icon":"bi-server"},
/*//*/
{"type":"ROUTE", "order":100, "parentId":"menu.developer.backend", "id":"menu.developer.backend.export.liquibase", "titleI18nKey":"menu.developer.backend.export.liquibase", "icon":"bi-database-down", "routeName":"route.developer.backend.export.liquibase"},
/*/*/
{"type":"GROUP", "order":500, "parentId":"menu.developer", "id":"menu.developer.frontend", "titleI18nKey":"menu.developer.frontend", "icon":"bi-layout-text-window"},
{"type":"GROUP", "order":600, "parentId":"menu.developer", "id":"menu.developer.frontend", "titleI18nKey":"menu.developer.frontend", "icon":"bi-layout-text-window"},
/*//*/
{"type":"ROUTE", "order":100, "parentId":"menu.developer.frontend", "id":"menu.developer.frontend.icons", "titleI18nKey":"menu.developer.frontend.icons", "icon":"bi-suit-heart", "routeName":"route.developer.frontend.icons"}
]

13
io.sc.platform.developer.frontend/src/routes/routes.json

@ -329,6 +329,19 @@
]
}
},
{
"name": "route.developer.backend.export.liquibase",
"path": "developer/backend/export/liquibase",
"parent": "/",
"priority": 0,
"module": "io.sc.platform.developer.frontend",
"component": "component.developer.backend.exportLiquibase",
"componentPath": "@/views/backend/ExportLiquibase.vue",
"redirect": null,
"meta": {
}
},
{
"name": "route.developer.frontend.icons",
"path": "developer/frontend/icons",

55
io.sc.platform.jdbc.liquibase/src/main/java/io/sc/platform/jdbc/liquibase/task/CsvTaskChange.java

@ -0,0 +1,55 @@
package io.sc.platform.jdbc.liquibase.task;
import liquibase.change.custom.CustomTaskChange;
import liquibase.database.Database;
import liquibase.exception.CustomChangeException;
import liquibase.exception.SetupException;
import liquibase.exception.ValidationErrors;
import liquibase.repackaged.com.opencsv.CSVReaderBuilder;
import liquibase.resource.ResourceAccessor;
public class CsvTaskChange implements CustomTaskChange {
private String dataFileLocation;
private String cfgFileLocation;
public String getDataFileLocation() {
return dataFileLocation;
}
public void setDataFileLocation(String dataFileLocation) {
this.dataFileLocation = dataFileLocation;
}
public String getCfgFileLocation() {
return cfgFileLocation;
}
public void setCfgFileLocation(String cfgFileLocation) {
this.cfgFileLocation = cfgFileLocation;
}
@Override
public void execute(Database database) throws CustomChangeException {
}
@Override
public String getConfirmationMessage() {
return null;
}
@Override
public void setUp() throws SetupException {
}
@Override
public void setFileOpener(ResourceAccessor resourceAccessor) {
}
@Override
public ValidationErrors validate(Database database) {
return null;
}
}

13
io.sc.platform.jdbc.liquibase/src/main/java/io/sc/platform/jdbc/liquibase/task/new.cfg.json

@ -0,0 +1,13 @@
{
"table" : "",
"sql" : "",
"cols": [
{
"name": "name",
"remark": "remark",
"javaType": "java.lang.String",
"sqlType": "CBLOB",
"skip": false
}
]
}

4
io.sc.platform.jdbc.liquibase/src/main/java/io/sc/platform/jdbc/liquibase/task/new.csv

@ -0,0 +1,4 @@
"col1","col2,name
ok,""ok"""
"col1","col2,name
ok,""ok"""
1 col1 col2,name ok,"ok"
2 col1 col2,name ok,"ok"

4
io.sc.platform.lcdp.frontend/package.json

@ -4,7 +4,7 @@
"description": "",
"private": false,
"keywords": [
],
"author": "",
"license": "ISC",
@ -102,4 +102,4 @@
"vue-router": "4.2.5",
"vue-codemirror6": "1.2.0"
}
}
}

4
io.sc.platform.mvc.frontend/package.json

@ -4,7 +4,7 @@
"description": "",
"private": false,
"keywords": [
],
"author": "",
"license": "ISC",
@ -102,4 +102,4 @@
"codemirror": "6.0.1",
"vue-codemirror6": "1.2.0"
}
}
}

4
io.sc.platform.security.frontend/package.json

@ -4,7 +4,7 @@
"description": "",
"private": false,
"keywords": [
],
"author": "",
"license": "ISC",
@ -101,4 +101,4 @@
"vue-router": "4.2.5",
"platform-core": "8.1.119"
}
}
}

4
io.sc.platform.system.frontend/package.json

@ -4,7 +4,7 @@
"description": "",
"private": false,
"keywords": [
],
"author": "",
"license": "ISC",
@ -102,4 +102,4 @@
"codemirror": "6.0.1",
"vue-codemirror6": "1.2.0"
}
}
}
Loading…
Cancel
Save