fix: monaco run error with production

buqiyuan · buqiyuan · commit a0482d493b6a · 2021-05-26T22:15:13.000+08:00
diff --git a/.eslintrc.js b/.eslintrc.js
@@ -23,7 +23,6 @@ module.exports = {
   ],
   rules: {
     'vue/require-default-prop': 'off',
-
     '@typescript-eslint/ban-ts-comment': 'off',
     '@typescript-eslint/no-explicit-any': 'off',
     '@typescript-eslint/ban-types': 'off',
diff --git a/.gitignore b/.gitignore
@@ -12,6 +12,12 @@
 # yarn.lock
 # package-lock.json
 
+# Log files
+npm-debug.log*
+yarn-debug.log*
+yarn-error.log*
+pnpm-debug.log*
+
 # IDEs and editors
 /.idea
 .project
diff --git a/.husky/common.sh b/.husky/common.sh
@@ -0,0 +1,9 @@
+#!/bin/sh
+command_exists () {
+  command -v "$1" >/dev/null 2>&1
+}
+
+# Workaround for Windows 10, Git Bash and Yarn
+if command_exists winpty && test -t 1; then
+  exec < /dev/tty
+fi
diff --git a/.husky/lintstagedrc.js b/.husky/lintstagedrc.js
@@ -0,0 +1,8 @@
+module.exports = {
+  '*.{js,jsx,ts,tsx}': ['eslint --fix', 'prettier --write'],
+  '{!(package)*.json,*.code-snippets,.!(browserslist)*rc}': ['prettier --write--parser json'],
+  'package.json': ['prettier --write'],
+  '*.vue': ['eslint --fix', 'prettier --write', 'stylelint --fix'],
+  '*.{scss,less,styl,html}': ['stylelint --fix', 'prettier --write'],
+  '*.md': ['prettier --write']
+}
diff --git a/.husky/pre-commit b/.husky/pre-commit
@@ -1,4 +1,10 @@
 #!/bin/sh
 . "$(dirname "$0")/_/husky.sh"
+. "$(dirname "$0")/common.sh"
 
-npx lint-staged
+[ -n "$CI" ] && exit 0
+
+# Format and submit code according to lintstagedrc.js configuration
+npm run lint:lint-staged
+
+npm run lint:pretty
diff --git a/.stylelintignore b/.stylelintignore
@@ -0,0 +1,3 @@
+/dist/*
+/public/*
+public/*
diff --git a/README.md b/README.md
@@ -1,4 +1,4 @@
-# Vite2.x + Vue3.x + TypeScript H5低代码平台
+# Vite2.x + Vue3.x + TypeScript H5 低代码平台
 
 ## 技术栈
 
@@ -7,8 +7,8 @@
 - 前端框架：[Vue 3.x](https://v3.cn.vuejs.org/)
 - 路由工具：[Vue Router 4.x](https://next.router.vuejs.org/zh/index.html)
 - 状态管理：[Vuex 4.x](https://next.vuex.vuejs.org/)
-- PC端UI 框架：[Element Plus](https://element-plus.org/#/zh-CN)
-- H5端UI 框架：[vant](https://vant-contrib.gitee.io/vant/v3/#/zh-CN/)
+- PC 端 UI 框架：[Element Plus](https://element-plus.org/#/zh-CN)
+- H5 端 UI 框架：[vant](https://vant-contrib.gitee.io/vant/v3/#/zh-CN/)
 - CSS 预编译：[Stylus](https://stylus-lang.com/) / [Sass](https://sass.bootcss.com/documentation) / [Less](http://lesscss.cn/)
 - HTTP 工具：[Axios](https://axios-http.com/)
 - Git Hook 工具：[husky](https://typicode.github.io/husky/#/) + [lint-staged](https://github.com/okonet/lint-staged)
@@ -18,6 +18,7 @@
 - 自动部署：[GitHub Actions](https://docs.github.com/cn/actions/learn-github-actions)
 
 ### 功能清单
+
 - [x] 动态添加页面
 - [x] 拖拽式生成组件
 - [ ] service worker + indexeddb 实现无服务端的前端交互
@@ -27,9 +28,27 @@
 - [ ] 其他...
 
 ### 简易说明
+
 目前在使用表单时，需要把相关的`表单控件`放到`表单容器`内部，并且需要将`按钮`放到`表单容器`内，
 然后再讲`按钮的type`设置为`表单提交按钮`这时候点击提交按钮才会自动收集表单容器内部的所有字段和值
 
+### 提交规范
+
+- `feat` 增加新功能
+- `fix` 修复问题/BUG
+- `style` 代码风格相关无影响运行结果的
+- `perf` 优化/性能提升
+- `refactor` 重构
+- `revert` 撤销修改
+- `test` 测试相关
+- `docs` 文档/注释
+- `build` 对构建系统或者外部依赖项进行了修改
+- `chore` 依赖更新/脚手架配置修改等
+- `workflow` 工作流改进
+- `ci` 持续集成
+- `types` 类型定义文件更改
+- `wip` 开发中
+
 ## 快速开始
 
 ### 安装依赖
@@ -51,4 +70,3 @@ npm run dev
 ```sh
 npm run build
 ```
-
diff --git a/package.json b/package.json
@@ -12,12 +12,17 @@
     "format": "prettier --write ./src",
     "lint": "eslint ./src --ext .vue,.js,.ts,.tsx",
     "lint-fix": "eslint --fix ./src --ext .vue,.js,.ts,.tsx",
+    "lint:eslint": "eslint \"{src,mock}/**/*.{vue,ts,tsx}\" --fix",
+    "lint:prettier": "prettier --write --loglevel warn \"src/**/*.{js,json,tsx,css,less,scss,vue,html,md}\"",
+    "lint:stylelint": "stylelint --fix \"**/*.{vue,less,postcss,css,scss}\" --cache --cache-location node_modules/.cache/stylelint/",
+    "lint:lint-staged": "lint-staged -c ./.husky/lintstagedrc.js",
+    "lint:pretty": "pretty-quick --staged",
     "prepare": "husky install"
   },
   "dependencies": {
     "@vant/touch-emulator": "^1.2.0",
-    "@vueuse/core": "^4.11.0",
-    "@vueuse/integrations": "^4.11.0",
+    "@vueuse/core": "^4.11.1",
+    "@vueuse/integrations": "^4.11.1",
     "axios": "^0.21.1",
     "dayjs": "^1.10.4",
     "dexie": "^3.0.3",
@@ -27,42 +32,47 @@
     "normalize.css": "^8.0.1",
     "nprogress": "^1.0.0-1",
     "qrcode": "^1.4.4",
-    "vant": "^3.0.16",
-    "vue": "^3.1.0-beta.3",
+    "vant": "^3.0.17",
+    "vue": "^3.1.0-beta.4",
     "vue-router": "^4.0.8",
     "vuedraggable": "^4.0.1",
-    "vuex": "^4.0.0"
+    "vuex": "^4.0.1"
   },
   "devDependencies": {
     "@commitlint/cli": "^12.1.4",
     "@commitlint/config-conventional": "^12.1.4",
-    "@types/node": "^14.17.0",
-    "@typescript-eslint/eslint-plugin": "^4.24.0",
-    "@typescript-eslint/parser": "^4.24.0",
+    "@types/node": "^14.17.1",
+    "@typescript-eslint/eslint-plugin": "^4.25.0",
+    "@typescript-eslint/parser": "^4.25.0",
     "@vitejs/plugin-legacy": "^1.4.0",
     "@vitejs/plugin-vue": "^1.2.2",
     "@vitejs/plugin-vue-jsx": "^1.1.4",
-    "@vue/compiler-sfc": "^3.1.0-beta.3",
+    "@vue/compiler-sfc": "^3.1.0-beta.4",
     "commitizen": "^4.2.4",
     "cz-conventional-changelog": "^3.3.0",
     "cz-customizable": "^6.3.0",
-    "eslint": "^7.26.0",
+    "eslint": "^7.27.0",
     "eslint-config-prettier": "^8.3.0",
-    "eslint-plugin-import": "^2.23.2",
+    "eslint-plugin-import": "^2.23.3",
     "eslint-plugin-prettier": "^3.4.0",
     "eslint-plugin-vue": "^7.9.0",
     "gh-pages": "^3.1.0",
     "husky": "^6.0.0",
     "lint-staged": "^10.5.4",
     "prettier": "^2.3.0",
-    "sass": "^1.32.13",
+    "pretty-quick": "^3.1.0",
+    "sass": "1.32.13",
+    "stylelint": "^13.13.1",
+    "stylelint-config-prettier": "^8.0.2",
+    "stylelint-config-standard": "^22.0.0",
+    "stylelint-order": "^4.1.0",
     "typescript": "^4.2.4",
-    "vite": "2.3.3",
-    "vite-plugin-components": "^0.9.1",
-    "vite-plugin-style-import": "^0.10.0",
-    "vite-plugin-windicss": "^0.16.0-beta.17",
+    "vite": "2.3.4",
+    "vite-plugin-components": "^0.10.2",
+    "vite-plugin-style-import": "^0.10.1",
+    "vite-plugin-windicss": "^0.16.0",
     "vue-eslint-parser": "^7.6.0",
-    "vue-tsc": "^0.1.4",
+    "vue-tsc": "^0.1.6",
     "windicss": "^2.5.14"
   },
   "repository": {
diff --git a/src/packages/base-widgets/checkbox/index.tsx b/src/packages/base-widgets/checkbox/index.tsx
@@ -51,7 +51,15 @@ export default {
     )
   },
   props: {
-    modelValue: createEditorInputProp({ label: '默认值', defaultValue: [] }),
+    modelValue: createEditorSelectProp({
+      label: '默认值',
+      options: [
+        { label: '萝卜', val: 'radish' },
+        { label: '青菜', val: 'greens' }
+      ],
+      multiple: true,
+      defaultValue: []
+    }),
     name: createEditorInputProp({ label: '名称，提交表单的标识符', defaultValue: 'checkbox' }),
     label: createEditorInputProp({ label: '输入框左侧文本', defaultValue: '复选框' }),
     options: createEditorTableProp({
diff --git a/src/visual-editor/components/right-attribute-panel/components/table-prop-editor/table-prop-edit.service.tsx b/src/visual-editor/components/right-attribute-panel/components/table-prop-editor/table-prop-edit.service.tsx
@@ -66,7 +66,7 @@ const ServiceComponent = defineComponent({
 
     return () => (
       <>
-        <ElDialog modelValue={state.showFlag}>
+        <ElDialog v-model={state.showFlag}>
           {{
             default: () => (
               <div>
diff --git a/src/visual-editor/components/right-attribute-panel/index.tsx b/src/visual-editor/components/right-attribute-panel/index.tsx
@@ -54,7 +54,7 @@ export default defineComponent({
         [VisualEditorPropsType.switch]: () => <ElSwitch v-model={propObj[prop]} />,
         [VisualEditorPropsType.color]: () => <ElColorPicker v-model={propObj[prop]} />,
         [VisualEditorPropsType.select]: () => (
-          <ElSelect v-model={propObj[prop]} valueKey={'value'}>
+          <ElSelect v-model={propObj[prop]} valueKey={'value'} multiple={propConfig.multiple}>
             {(() => {
               return propConfig.options!.map((opt) => (
                 <ElOption label={opt.label} value={opt.val} />
diff --git a/src/visual-editor/utils/dialog-service.tsx b/src/visual-editor/utils/dialog-service.tsx
@@ -44,7 +44,9 @@ const ServiceComponent = defineComponent({
       show: () => {
         state.showFlag = true
       },
-      hide: () => (state.showFlag = false)
+      hide: () => {
+        state.showFlag = false
+      }
     }
 
     const handler = {
@@ -61,7 +63,7 @@ const ServiceComponent = defineComponent({
 
     return () => (
       <>
-        <ElDialog modelValue={state.showFlag} title={state.option.title} key={state.key}>
+        <ElDialog v-model={state.showFlag} title={state.option.title} key={state.key}>
           {{
             default: () => (
               <div>
diff --git a/src/visual-editor/visual-editor.props.tsx b/src/visual-editor/visual-editor.props.tsx
@@ -11,6 +11,7 @@ export type VisualEditorProps = {
   type: VisualEditorPropsType
   label: string
   tips?: string
+  multiple?: boolean
   defaultValue?: any
 } & {
   options?: VisualEditorSelectOptions
@@ -115,21 +116,24 @@ interface EditorSelectProp {
   label: string
   options: VisualEditorSelectOptions
   defaultValue?: any
+  multiple?: boolean
   tips?: string
 }
 
 export function createEditorSelectProp({
   label,
   options,
   defaultValue,
-  tips
+  tips,
+  multiple
 }: EditorSelectProp): VisualEditorProps {
   return {
     type: VisualEditorPropsType.select,
     label,
     defaultValue,
     tips,
-    options
+    options,
+    multiple
   }
 }
 
diff --git a/stylelint.config.js b/stylelint.config.js
diff --git a/vite.config.ts b/vite.config.ts
diff --git a/yarn.lock b/yarn.lock
