Skip to content

Commit

Permalink
chore: formatter code
Browse files Browse the repository at this point in the history
  • Loading branch information
rennzhang committed Nov 7, 2023
1 parent 378f54f commit 618020f
Show file tree
Hide file tree
Showing 25 changed files with 5,493 additions and 2,128 deletions.
18 changes: 9 additions & 9 deletions .eslintrc.cjs
Original file line number Diff line number Diff line change
Expand Up @@ -2,20 +2,20 @@ module.exports = {
env: {
browser: true,
es2021: true,
node: true
node: true,
},
extends: [
"./.eslintrc-auto-import.json",
"airbnb-base",
"plugin:@typescript-eslint/recommended",
"plugin:vue/vue3-recommended",
"prettier",
"plugin:prettier/recommended" // 添加 prettier 插件
"plugin:prettier/recommended", // 添加 prettier 插件
],
parserOptions: {
ecmaVersion: "latest",
parser: "@typescript-eslint/parser",
sourceType: "module"
sourceType: "module",
},
plugins: ["vue", "@typescript-eslint", "import"],
rules: {
Expand All @@ -31,14 +31,14 @@ module.exports = {
"no-underscore-dangle": "off",
"@typescript-eslint/ban-ts-comment": "off",
"vue/multi-word-component-names": "off",
"@typescript-eslint/no-explicit-any": ["off"]
"@typescript-eslint/no-explicit-any": ["off"],
},
overrides: [
{
files: ["*.vue"],
rules: {
"no-undef": "off"
}
}
]
}
"no-undef": "off",
},
},
],
};
4 changes: 2 additions & 2 deletions .prettierrc
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,12 @@
"printWidth": 100,
"tabWidth": 2,
"useTabs": false,
"semi": false,
"semi": true,
"vueIndentScriptAndStyle": true,
"singleQuote": false,
"quoteProps": "as-needed",
"bracketSpacing": true,
"trailingComma": "none",
"trailingComma": "all",
"jsxBracketSameLine": false,
"jsxSingleQuote": false,
"arrowParens": "always",
Expand Down
2 changes: 1 addition & 1 deletion build/plugins/custom/InjectCss.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ const fileRegex = /\.(css)$/;

const injectCode = (code: string) =>
`function styleInject(css,ref){if(ref===void 0){ref={}}var insertAt=ref.insertAt;if(!css||typeof document==="undefined"){return}var head=document.head||document.getElementsByTagName("head")[0];var style=document.createElement("style");style.type="text/css";if(insertAt==="top"){if(head.firstChild){head.insertBefore(style,head.firstChild)}else{head.appendChild(style)}}else{head.appendChild(style)}if(style.styleSheet){style.styleSheet.cssText=css}else{style.appendChild(document.createTextNode(css))}};styleInject(\`${code}\`)`;
const template = `console.warn("__INJECT__")`;
const template = 'console.warn("__INJECT__")';

let viteConfig: ResolvedConfig;
const css: string[] = [];
Expand Down
16 changes: 8 additions & 8 deletions docs/demo/home.vue
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,12 @@
</template>

<script lang="ts" setup>
import { ref } from "vue"
import type { EditorConfiguration } from "codemirror"
import Codemirror from "../../packages/index"
import { ref } from "vue";
import type { EditorConfiguration } from "codemirror";
import Codemirror from "../../packages/index";
// language
import "codemirror/mode/javascript/javascript.js"
import "codemirror/mode/javascript/javascript.js";
const code = ref(
`var arr = [3, 10, 6, 2];
Expand All @@ -23,10 +23,10 @@ for (var i = 0; i < arr.length - 1; i++) {
}
}
}
console.log(arr)`
)
console.log(arr)`,
);
const cmOptions: EditorConfiguration = {
mode: "text/javascript"
}
mode: "text/javascript",
};
</script>
24 changes: 12 additions & 12 deletions docs/demo/index.vue
Original file line number Diff line number Diff line change
Expand Up @@ -12,34 +12,34 @@
</template>

<script setup lang="ts">
import { ref, onMounted } from "vue"
import { Editor } from "codemirror"
import Codemirror from "../../packages/index"
import { ref, onMounted } from "vue";
import { Editor } from "codemirror";
import Codemirror from "../../packages/index";
// language
import "codemirror/mode/javascript/javascript.js"
import "codemirror/mode/javascript/javascript.js";
// theme
// import "codemirror/theme/dracula.css"
const isMounted = ref(false)
const isMounted = ref(false);
const code = ref(`var i = 0;
for (; i < 9; i++) {
console.log(i);
// more statements
}
`)
`);
const onChange = (val: string, cm: Editor) => {
console.log(val, cm)
}
console.log(val, cm);
};
const cmOptions = {
mode: "text/javascript",
theme: "default"
}
theme: "default",
};
onMounted(() => {
isMounted.value = true
})
isMounted.value = true;
});
</script>
20 changes: 10 additions & 10 deletions docs/demo/log/fclog.vue
Original file line number Diff line number Diff line change
Expand Up @@ -3,31 +3,31 @@
</template>

<script>
import { ref, defineComponent } from "vue"
import Codemirror, { createLinkMark, createLog, createTitle } from "../../../packages/index"
import { ref, defineComponent } from "vue";
import Codemirror, { createLinkMark, createLog, createTitle } from "../../../packages/index";
export default defineComponent({
components: { Codemirror },
setup() {
const code = ref(`完整日志下载地址:${createLinkMark({
href: "/logDownload",
download: "",
target: "_blank"
target: "_blank",
})}
${createTitle("带有时间节点和输出类型的日志")}
${createLog("info content", "info")}
${createLog("warning content", "warning")}
${createLog("error content", "error")}
`)
`);
const cmOptions = {
mode: "fclog"
}
mode: "fclog",
};
return {
ref,
code,
cmOptions
}
}
})
cmOptions,
};
},
});
</script>
20 changes: 10 additions & 10 deletions docs/demo/log/index.vue
Original file line number Diff line number Diff line change
Expand Up @@ -3,16 +3,16 @@
</template>

<script>
import { ref, defineComponent } from "vue"
import Codemirror, { createLinkMark, createLogMark, createTitle } from "../../../packages/index"
import { ref, defineComponent } from "vue";
import Codemirror, { createLinkMark, createLogMark, createTitle } from "../../../packages/index";
export default defineComponent({
components: { Codemirror },
setup() {
const code = ref(`完整日志下载地址:${createLinkMark({
href: "/logDownload",
download: "",
target: "_blank"
target: "_blank",
})}
${createTitle("可以标记每一行日志的输出类型")}
${createLogMark("2021-08-26 15:07:09: job is success", "info")}
Expand All @@ -31,20 +31,20 @@ at com.zhiweicloud.dataprocess.engine.FlinkEngine.readFlinkEngineConfig(FlinkEng
at com.zhiweicloud.dataprocess.engine.FlinkEngine.buildFlinkStream(FlinkEngine.
at com.zhiweicloud.dataprocess.engine.FlinkEngine.startFlinkEngine(FlinkEngine.
at com.zhiweicloud.dataprocess.DataStreamMain.main(DataStreamMain.
`)
`);
const cmOptions = {
mode: "log",
theme: "default"
}
theme: "default",
};
return {
Codemirror,
createLinkMark,
createLogMark,
createTitle,
ref,
code,
cmOptions
}
}
})
cmOptions,
};
},
});
</script>
32 changes: 16 additions & 16 deletions docs/demo/mergeDemo.vue
Original file line number Diff line number Diff line change
Expand Up @@ -10,34 +10,34 @@
</template>

<script>
import { ref, defineComponent, onMounted, reactive } from "vue"
import { ref, defineComponent, onMounted, reactive } from "vue";
import Codemirror from "../../packages/index"
import Codemirror from "../../packages/index";
import "codemirror/mode/htmlmixed/htmlmixed.js"
import "codemirror/mode/htmlmixed/htmlmixed.js";
export default defineComponent({
components: {
Codemirror
Codemirror,
},
setup() {
const isMounted = ref(false)
const isMounted = ref(false);
const code = ref(`<head>
<title>codemirror-editor-vue</title>
<meta data-n-head="ssr" charset="utf-8">
</head>`)
</head>`);
const orig2 = ref(`<head>
<title>test title</title>
<meta data-n-head="ssr" charset="utf-8">
</head>`)
</head>`);
onMounted(() => {
isMounted.value = true
})
isMounted.value = true;
});
return {
isMounted,
onChange(val, cminstance) {
console.log(val)
console.log(cminstance)
console.log(val);
console.log(cminstance);
},
cmOptions: reactive({
value: code,
Expand All @@ -47,9 +47,9 @@
mode: "text/html",
lineNumbers: true,
collapseIdentical: false,
highlightDifferences: true
})
}
}
})
highlightDifferences: true,
}),
};
},
});
</script>
3 changes: 0 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,6 @@
"scripts": {
"dev": "vite",
"build": "vite build",
"build:types": "tsc --emitDeclarationOnly vite build",
"docs-dev": "vitepress dev docs --open",
"docs-build": "vitepress build docs",
"docs-serve": "vitepress serve docs",
Expand Down Expand Up @@ -74,7 +73,6 @@
"@vitejs/plugin-vue": "^4.0.0",
"@vitejs/plugin-vue-jsx": "^3.0.0",
"@vue/cli-plugin-typescript": "~4.5.15",
"@vueuse/core": "^9.13.0",
"chalk": "^4.1.2",
"conventional-changelog-cli": "^2.0.31",
"dedent": "^0.7.0",
Expand All @@ -92,7 +90,6 @@
"picocolors": "^1.0.0",
"prettier": "^2.8.4",
"prompts": "^2.4.2",
"rollup-plugin-cpy": "^2.0.1",
"rollup-plugin-vue": "^6.0.0",
"semver": "^7.3.5",
"tsx": "^3.12.3",
Expand Down
5 changes: 1 addition & 4 deletions packages/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,7 @@ import _CodeMirror from "./src/sourceLib";

interface CmComp {
cminstance: Editor;
resize: (
width?: string | number | null,
height?: string | number | null
) => void;
resize: (width?: string | number | null, height?: string | number | null) => void;
refresh: () => void;
destroy: () => void;
}
Expand Down
Loading

0 comments on commit 618020f

Please sign in to comment.