!123 【众测版】合并最新的 Vue3 重构

Merge pull request !123 from 芋道源码/dev

Author: YunaiV

.vscode/settings.json

@@ -40,5 +40,15 @@
   "i18n-ally.displayLanguage": "zh-CN",
   "i18n-ally.enabledFrameworks": ["vue", "react"],
   "god.tsconfig": "./tsconfig.json",
-  "vue-i18n.i18nPaths": "src/locales"
+  "vue-i18n.i18nPaths": "src/locales",
+  "explorer.fileNesting.enabled": true,
+  "explorer.fileNesting.expand": false,
+  "explorer.fileNesting.patterns": {
+    "*.ts": "$(capture).test.ts, $(capture).test.tsx",
+    "*.tsx": "$(capture).test.ts, $(capture).test.tsx",
+    "*.env": "$(capture).env.*",
+    "CHANGELOG.md": "CHANGELOG*",
+    "package.json": "pnpm-lock.yaml,pnpm-workspace.yaml,LICENSE,.gitattributes,.gitignore,.gitpod.yml,CNAME,README*,.npmrc,.browserslistrc,vite.config.*,windi.*,tailwind.*,tsconfig.*,postcss*",
+    ".eslintrc.js": ".eslintignore,.eslintrc-*,.prettierignore,.stylelintignore,.commitlintrc.js,.prettierrc.js,.stylelint*,stylelint*,prettier.*,.editorconfig"
+  }
 }

build/vite/optimize.ts

@@ -75,7 +75,8 @@ const include = [
   'element-plus/es/components/dropdown-item/style/css',
   'element-plus/es/components/badge/style/css',
   'element-plus/es/components/breadcrumb/style/css',
-  'element-plus/es/components/breadcrumb-item/style/css'
+  'element-plus/es/components/breadcrumb-item/style/css',
+  'element-plus/es/components/image/style/css'
 ]
 
 const exclude = ['@iconify/json']

package.json

@@ -32,7 +32,6 @@
     "@form-create/element-ui": "^3.1.17",
     "@iconify/iconify": "^3.1.0",
     "@videojs-player/vue": "^1.0.0",
-    "@vueup/vue-quill": "^1.1.1",
     "@vueuse/core": "^9.13.0",
     "@wangeditor/editor": "^5.1.23",
     "@wangeditor/editor-for-vue": "^5.1.10",

src/components/Editor/src/Editor.vue

@@ -20,7 +20,7 @@ const props = defineProps({
   editorId: propTypes.string.def('wangeEditor-1'),
   height: propTypes.oneOfType([Number, String]).def('500px'),
   editorConfig: {
-    type: Object as PropType<IEditorConfig>,
+    type: Object as PropType<Partial<IEditorConfig>>,
     default: () => undefined
   },
   readonly: propTypes.bool.def(false),
@@ -147,6 +147,7 @@ const editorConfig = computed((): IEditorConfig => {
     props.editorConfig || {}
   )
 })
+
 const editorStyle = computed(() => {
   return {
     height: isNumber(props.height) ? `${props.height}px` : props.height

src/components/Icon/src/IconSelect.vue

@@ -95,7 +95,7 @@ watch(
     return props.modelValue
   },
   () => {
-    if (props.modelValue && props.modelValue.contains(':')) {
+    if (props.modelValue && props.modelValue.indexOf(':') >= 0) {
       currentActiveType.value = props.modelValue.substring(0, props.modelValue.indexOf(':') + 1)
       icon.value = props.modelValue.substring(props.modelValue.indexOf(':') + 1)
     }

src/components/bpmnProcessDesigner/package/penal/form/ElementForm.vue

@@ -111,7 +111,8 @@
               >
               <el-divider direction="vertical" />
               <el-button
-                type="text"
+                type="primary"
+                link
                 style="color: #ff4d4f"
                 @click="removeFieldOptionItem(scope, scope.$index, 'enum')"
                 >移除</el-button
@@ -143,7 +144,8 @@
             >
             <el-divider direction="vertical" />
             <el-button
-              type="text"
+              type="primary"
+              link
               style="color: #ff4d4f"
               @click="removeFieldOptionItem(scope, scope.$index, 'constraint')"
               >移除</el-button
@@ -174,7 +176,8 @@
             >
             <el-divider direction="vertical" />
             <el-button
-              type="text"
+              type="primary"
+              link
               style="color: #ff4d4f"
               @click="removeFieldOptionItem(scope, scope.$index, 'property')"
               >移除</el-button

src/types/.gitignore

@@ -0,0 +1 @@
+auto-*.d.ts

src/types/auto-components.d.ts

@@ -18,7 +18,8 @@
       <el-col :span="24" style="padding-left: 10px; padding-right: 10px">
         <el-form-item prop="tenantName" v-if="loginData.tenantEnable === 'true'">
           <el-input
-            type="text"
+            type="primary"
+            link
             v-model="loginData.loginForm.tenantName"
             :placeholder="t('login.tenantNamePlaceholder')"
             :prefix-icon="iconHouse"