首页 发现 帮助
注册 登录
Saas
/
customform
2
0
派生 0
文件 工单管理 0 合并请求 0 Wiki
浏览代码

fix: 修复bug

huangziyang 2 天之前
父节点
4f2bcc558a
当前提交
8f15728d99
共有 14 个文件被更改，包括 39 次插入 和 37 次删除
合并视图 显示文件统计
  1. 0 0
      .env.test
  2. 3 0
      .gitignore
  3. 二进制
      form.zip
  4. 8 8
      form/index.html
  5. 1 1
      scripts/build.js
  6. 4 0
      src/App.vue
  7. 2 6
      src/components/H5-form/H5-form.vue
  8. 1 1
      src/components/rc-checkbox/rc-checkbox.vue
  9. 1 1
      src/components/rc-radio/rc-radio.vue
  10. 15 18
      src/form.config.ts
  11. 0 1
      src/main.ts
  12. 1 0
      src/plugins/components/rc-checkbox.config.ts
  13. 1 0
      src/plugins/components/rc-radio.config.ts
  14. 2 1
      vite.config.ts

+ 0 - 0
.env.release → .env.test
查看文件


+ 3 - 0
.gitignore
查看文件 

@@ -15,6 +15,9 @@ coverage
 
 *.local
 
 *.local
 
 
 
 form
 
 form
 
+form.zip
 
+
 
+.gitignore
 
 
 
 /cypress/videos/
 
 /cypress/videos/
 
 /cypress/screenshots/
 
 /cypress/screenshots/

二进制
form.zip
查看文件


+ 8 - 8
form/index.html
查看文件 

@@ -1,9 +1,9 @@
 
 <!DOCTYPE html><html lang=""><head>
 
 <!DOCTYPE html><html lang=""><head>
 
     <meta charset="UTF-8">
 
     <meta charset="UTF-8">
 
-    <link rel="icon" href="/favicon.ico">
 
+    <link rel="icon" href="/saas/form/favicon.ico">
 
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
 
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
 
     <title>Vite App</title>
 
     <title>Vite App</title>
 
-    <script crossorigin="">import('/static/index.Dmzf96Bk.js').finally(() => {
 
+    <script crossorigin="">import('/saas/form/static/index.IlBjmAfx.js').finally(() => {
 
             
             
     const qiankunLifeCycle = window.moudleQiankunAppLifeCycles && window.moudleQiankunAppLifeCycles['curstom-form'];
 
     const qiankunLifeCycle = window.moudleQiankunAppLifeCycles && window.moudleQiankunAppLifeCycles['curstom-form'];
 
     if (qiankunLifeCycle) {
 
     if (qiankunLifeCycle) {
 
@@ -14,12 +14,12 @@
 
     }
 
     }
 
   
   
           })</script>
 
           })</script>
 
-    <link rel="modulepreload" crossorigin="" href="/static/.pnpm.CRLYFuod.js">
 
-    <link rel="modulepreload" crossorigin="" href="/static/lodash-es.C-xrcuFl.js">
 
-    <link rel="modulepreload" crossorigin="" href="/static/element-plus.Dozcb0Co.js">
 
-    <link rel="modulepreload" crossorigin="" href="/static/@form-create/designer.BQ8hZRqe.js">
 
-    <link rel="stylesheet" crossorigin="" href="/static/element-plus.D92rDM1h.css">
 
-    <link rel="stylesheet" crossorigin="" href="/static/index.nPkbAqeq.css">
 
+    <link rel="modulepreload" crossorigin="" href="/saas/form/static/.pnpm.CRLYFuod.js">
 
+    <link rel="modulepreload" crossorigin="" href="/saas/form/static/lodash-es.C-xrcuFl.js">
 
+    <link rel="modulepreload" crossorigin="" href="/saas/form/static/element-plus.Dozcb0Co.js">
 
+    <link rel="modulepreload" crossorigin="" href="/saas/form/static/@form-create/designer.BQ8hZRqe.js">
 
+    <link rel="stylesheet" crossorigin="" href="/saas/form/static/element-plus.D92rDM1h.css">
 
+    <link rel="stylesheet" crossorigin="" href="/saas/form/static/index.nPkbAqeq.css">
 
   </head>
 
   </head>
 
   <body>
 
   <body>
 
     <div id="app"></div>
 
     <div id="app"></div>

+ 1 - 1
scripts/build.js
查看文件 

@@ -28,7 +28,7 @@ process.env.npm_lifecycle_script
 
   })
 
   })
 
 
 
 const buildPlatform = async () => {
 
 const buildPlatform = async () => {
 
-  await execa('vite', ['build', '--mode', map.mode])
 
+  await execa('vite', ['build', '--mode', map.mode], { stdio: 'inherit' })
 
 }
 
 }
 
 
 
 ;(async () => {
 
 ;(async () => {

+ 4 - 0
src/App.vue
查看文件 

@@ -15,6 +15,7 @@ import { MenuOptions } from './plugins/menu/options.ts'
 
 import type { FcDesignerInstance } from '@form-create/designer' // 注册组件
 
 import type { FcDesignerInstance } from '@form-create/designer' // 注册组件
 
 import type { Options, Rule } from '@form-create/element-ui'
 
 import type { Options, Rule } from '@form-create/element-ui'
 
 import type { Option } from './components/rc-options/createOptions.ts'
 
 import type { Option } from './components/rc-options/createOptions.ts'
 
+import formCreate from '@form-create/element-ui'
 
 
 
 /**
 
 /**
 
  * @see https://view.form-create.com/methods
 
  * @see https://view.form-create.com/methods
 
@@ -65,6 +66,8 @@ onMounted(async () => {
 
   designer.value?.addComponent(RcSelect)
 
   designer.value?.addComponent(RcSelect)
 
   designer.value?.addComponent(RcRadio)
 
   designer.value?.addComponent(RcRadio)
 
   designer.value?.addComponent(RcCheckbox)
 
   designer.value?.addComponent(RcCheckbox)
 
+  console.log(designer.value)
 
+
 
   const des = designer.value
 
   const des = designer.value
 
   window.__QIANKUN__EVENT__.on('formCoverChange', (cover: string) => {
 
   window.__QIANKUN__EVENT__.on('formCoverChange', (cover: string) => {
 
     const newRule = des?.getRule() as Rule[]
 
     const newRule = des?.getRule() as Rule[]
 
@@ -104,6 +107,7 @@ onMounted(async () => {
 
 <template>
 
 <template>
 
   <fc-designer
 
   <fc-designer
 
     ref="designer"
 
     ref="designer"
 
+    name="form"
 
     :height="height"
 
     :height="height"
 
     :handle="handle"
 
     :handle="handle"
 
     :config="config"
 
     :config="config"

+ 2 - 6
src/components/H5-form/H5-form.vue
查看文件 

@@ -21,6 +21,7 @@ onMounted(async () => {
 
     method: 'post',
 
     method: 'post',
 
     data: {
 
     data: {
 
       id,
 
       id,
 
+      access_token_openwork: localStorage.getItem('access_token_openwork'),
 
     },
 
     },
 
   })
 
   })
 
   res.data.form_field = res.data.form_field.map((item) => {
 
   res.data.form_field = res.data.form_field.map((item) => {
 
@@ -80,12 +81,7 @@ onMounted(async () => {
 
         </el-form-item>
 
         </el-form-item>
 
       </el-form>
 
       </el-form>
 
       <el-form-item>
 
       <el-form-item>
 
-        <el-button
 
-          type="primary"
 
-          style="width: 100%"
 
-          :loading="loading"
 
-          >提交</el-button
 
-        >
 
+        <el-button type="primary" style="width: 100%" :loading="loading">提交</el-button>
 
       </el-form-item>
 
       </el-form-item>
 
     </div>
 
     </div>
 
   </el-scrollbar>
 
   </el-scrollbar>

+ 1 - 1
src/components/rc-checkbox/rc-checkbox.vue
查看文件 

@@ -20,7 +20,7 @@ onMounted(() => {
 
 </script>
 
 </script>
 
 <template>
 
 <template>
 
   <RcCreateOption :formCreateInject="formCreateInject" v-slot="{ options }">
 
   <RcCreateOption :formCreateInject="formCreateInject" v-slot="{ options }">
 
-    <el-checkbox-group v-model="checkList">
 
+    <el-checkbox-group v-model="checkList" v-bind="$attrs">
 
       <el-checkbox
 
       <el-checkbox
 
         v-for="item in options"
 
         v-for="item in options"
 
         size="large"
 
         size="large"

+ 1 - 1
src/components/rc-radio/rc-radio.vue
查看文件 

@@ -20,7 +20,7 @@ onMounted(() => {
 
 </script>
 
 </script>
 
 <template>
 
 <template>
 
   <RcCreateOption :formCreateInject="formCreateInject" v-slot="{ options }">
 
   <RcCreateOption :formCreateInject="formCreateInject" v-slot="{ options }">
 
-    <el-radio-group v-model="radioValue">
 
+    <el-radio-group v-model="radioValue" v-bind="$attrs">
 
       <el-radio v-for="item in options" size="large" :key="item.key" :value="item.label">{{
 
       <el-radio v-for="item in options" size="large" :key="item.key" :value="item.label">{{
 
         item.label
 
         item.label
 
       }}</el-radio>
 
       }}</el-radio>

+ 15 - 18
src/form.config.ts
查看文件 

@@ -96,8 +96,8 @@ export const formConfig: Config = {
 
           {
 
           {
 
             type: 'input',
 
             type: 'input',
 
             field: 'defaultValue',
 
             field: 'defaultValue',
 
-            label: '默认值',
 
-            title: '默认值',
 
+            label: '提示词',
 
+            title: '提示词',
 
             on: {
 
             on: {
 
               change: (val: string) => {
 
               change: (val: string) => {
 
                 rule.value = val
 
                 rule.value = val
 
@@ -107,22 +107,20 @@ export const formConfig: Config = {
 
         ]
 
         ]
 
       },
 
       },
 
     },
 
     },
 
-    input: {
 
-      append: true,
 
-      rule(rule) {
 
-        return [
 
-          {
 
-            type: 'rc-switch',
 
-            field: 'synchronize_field',
 
-            label: '高级功能',
 
-            title: '高级功能',
 
-            props: {
 
-              rule,
 
-            },
 
+    input: (rule) => {
 
+      return [
 
+        {
 
+          type: 'rc-switch',
 
+          field: 'synchronize_field',
 
+          label: '高级功能',
 
+          title: '高级功能',
 
+          props: {
 
+            rule,
 
           },
 
           },
 
-        ]
 
-      },
 
+        },
 
+      ]
 
     },
 
     },
 
+
 
     textarea: {
 
     textarea: {
 
       append: true,
 
       append: true,
 
       rule(rule) {
 
       rule(rule) {
 
@@ -189,8 +187,6 @@ const formatOptions = (result: any) => {
 
     options: result.original.options,
 
     options: result.original.options,
 
     form_content: result.rule
 
     form_content: result.rule
 
       .map((item: any) => {
 
       .map((item: any) => {
 
-        console.log(item)
 
-
 
         const formContentValue = {
 
         const formContentValue = {
 
           field_name: item.title, // 字段名称
 
           field_name: item.title, // 字段名称
 
           field_type: item.type.startsWith('rc-') ? item.type.substring(3) : item.type, // rc- 前缀
 
           field_type: item.type.startsWith('rc-') ? item.type.substring(3) : item.type, // rc- 前缀
 
@@ -202,6 +198,7 @@ const formatOptions = (result: any) => {
 
             tags: op.tags.map((i: any) => i.tag_id),
 
             tags: op.tags.map((i: any) => i.tag_id),
 
           })),
 
           })),
 
           synchronize_field: item.synchronize_field,
 
           synchronize_field: item.synchronize_field,
 
+          submit_count: 0,
 
         }
 
         }
 
 
 
         if (item.props?.type === 'textarea') {
 
         if (item.props?.type === 'textarea') {

+ 0 - 1
src/main.ts
查看文件 

@@ -59,7 +59,6 @@ const initQianKun = () => {
 
     },
 
     },
 
   })
 
   })
 
 }
 
 }
 
-
 
 // 判断当前应用是否在主应用中
 
 // 判断当前应用是否在主应用中
 
 if (qiankunWindow.__POWERED_BY_QIANKUN__) {
 
 if (qiankunWindow.__POWERED_BY_QIANKUN__) {
 
   // 生命周期钩子 - bootstrap
 
   // 生命周期钩子 - bootstrap

+ 1 - 0
src/plugins/components/rc-checkbox.config.ts
查看文件 

@@ -17,6 +17,7 @@ export const RcCheckbox: DragRule = {
 
       title: '多选框',
 
       title: '多选框',
 
       props: {
 
       props: {
 
         clearable: true,
 
         clearable: true,
 
+        value: [1],
 
       },
 
       },
 
     }
 
     }
 
   },
 
   },

+ 1 - 0
src/plugins/components/rc-radio.config.ts
查看文件 

@@ -17,6 +17,7 @@ export const RcRadio: DragRule = {
 
       title: '单选框',
 
       title: '单选框',
 
       props: {
 
       props: {
 
         clearable: true,
 
         clearable: true,
 
+        value: '1',
 
       },
 
       },
 
     }
 
     }
 
   },
 
   },

+ 2 - 1
vite.config.ts
查看文件 

@@ -8,8 +8,9 @@ import qiankun from 'vite-plugin-qiankun'
 
 // https://vite.dev/config/
 
 // https://vite.dev/config/
 
 export default defineConfig(({ mode }) => {
 
 export default defineConfig(({ mode }) => {
 
   const chunkName = ['lodash-es', 'element-plus', '@form-create/designer']
 
   const chunkName = ['lodash-es', 'element-plus', '@form-create/designer']
 
+
 
   // 根据环境变量设置 base
 
   // 根据环境变量设置 base
 
-  const base = mode === 'release' ? '/saas/form/' : '/'
 
+  const base = mode === 'test' ? '/saas/form/' : '/'
 
   return {
 
   return {
 
     plugins: [
 
     plugins: [
 
       vue(),
 
       vue(),