feat: 查询框展开，新页面打开表单

fast-crud · Nov 9, 2021 · eebd6a3 · eebd6a3
1 parent 3945119
commit eebd6a3
Show file tree

Hide file tree

Showing 6 changed files with 41 additions and 79 deletions.
diff --git a/docs/zh/guide/other/contribution.md b/docs/zh/guide/other/contribution.md
@@ -16,17 +16,9 @@ cd fast-crud
 # 同步fast-admin子模块
 git submodule update --init --recursive
 
-# 可以通过lerna bootstrap命令一次性全部install
-npm install lerna -g
-lerna bootstrap
-
-# 或者
-# 也可以手动进入fast-crud和fast-extends等子项目目录，一个个单独install
-cd ./packages/fast-crud
-npm install
-
-cd ./packages/extends/fast-extends
-npm install
+# 通过pnpm命令一次性全部install
+npm install -g pnpm # 如果没有安装pnpm，则需要先安装
+pnpm install
 
 ```
 
@@ -39,7 +31,7 @@ cd fast-crud/packages/fs-admin/fs-admin-antdv
 npm install  
 #不启用权限模块
 npm run debug
-#启用权限运行
+#启用权限模块运行
 npm run debug:pm
 #启动成功后打开输出链接即可看到效果
 ```
@@ -51,7 +43,7 @@ cd fast-crud/packages/fs-admin/fs-admin-element
 npm install  
 #不启用权限模块
 npm run debug
-#启用权限运行
+#启用权限模块运行
 npm run debug:pm
 #启动成功后打开输出链接即可看到效果
 ```

diff --git a/docs/zh/guide/start/demo.md b/docs/zh/guide/start/demo.md
@@ -51,52 +51,4 @@ npm run dev
 ### 调试运行
 如果你想要贡献代码，那你肯定想要在修改`fast-crud`源码后立即在示例中看到效果。    
 
-请按如下步骤启动：    
-1、 需要先将所有子项目都执行`npm install` 
-```shell script
-git clone https://gitee.com/fast-crud/fast-crud.git
-cd fast-crud
-# 同步fast-admin子模块
-git submodule update --init --recursive
-
-# 可以通过lerna bootstrap命令一次性全部install
-npm install lerna -g
-lerna bootstrap
-
-# 或者
-# 也可以手动进入fast-crud和fast-extends等子项目目录，一个个单独install
-cd ./packages/fast-crud
-npm install
-
-cd ./packages/extends/fast-extends
-npm install
-
-```
-
-2、 然后debug模式启动
-
- * 调试antdv版示例
-```shell script
-# 运行 antdv版示例
-cd fast-crud/packages/fs-admin/fs-admin-antdv  
-npm install  
-#不启用权限模块
-npm run debug
-#启用权限运行
-npm run debug:pm
-#启动成功后打开输出链接即可看到效果
-```
-* 调试element版示例
-```shell script
-# 运行 element版示例
-cd fast-crud/packages/fs-admin/fs-admin-element  
-npm install  
-#不启用权限模块
-npm run debug
-#启用权限运行
-npm run debug:pm
-#启动成功后打开输出链接即可看到效果
-```
-
-
-
+[本章节内容已移至贡献代码章节](../other/contribution.md)
diff --git a/packages/fast-crud/src/components/crud/fs-form-wrapper.less b/packages/fast-crud/src/components/crud/fs-form-wrapper.less
@@ -1,5 +1,7 @@
 
 .fs-form-wrapper{
+  display: flex;
+  flex-direction: column;
   &.fs-dialog-inner{
     position: absolute;
   }
@@ -64,6 +66,8 @@
 
 
   &.fs-fullscreen{
+    display: flex;
+    flex-direction: column;
     .ant-modal{
       width:100% !important;
       height:100% !important;
@@ -79,23 +83,29 @@
           position: relative;
         }
       }
+    }
 
+    .el-dialog__header {
+    }
+    .el-dialog__body {
+      position: relative;
+      flex:1
+    }
 
-      .fs-form-wrapper-body{
-        height: 100%;
-        width: 100%;
-        position: absolute;
-        top:0;
-        left:0;
-        display: flex;
-        flex-direction: column;
-        padding:24px;
-        .fs-form-body{
-          flex:1;
-          overflow:auto;
-        }
-      }
 
+    .fs-form-wrapper-body{
+      height: 100%;
+      width: 100%;
+      position: absolute;
+      top:0;
+      left:0;
+      display: flex;
+      flex-direction: column;
+      padding:24px;
+      .fs-form-body{
+        flex:1;
+        overflow:auto;
+      }
     }
   }
 }
diff --git a/packages/fast-crud/src/components/crud/fs-form.vue b/packages/fast-crud/src/components/crud/fs-form.vue
@@ -362,6 +362,7 @@ export default {
         }
       });
 
+      debugger;
       if (props.doSubmit) {
         await props.doSubmit(submitScope);
       }

diff --git a/packages/fast-crud/src/components/search/index.vue b/packages/fast-crud/src/components/search/index.vue
@@ -440,7 +440,7 @@ export default {
     });
 
     const computedColumnBoxHeight = computed(() => {
-      if (computedIsMultiLine.value) {
+      if (!computedIsMultiLine.value) {
         return "auto";
       }
       if (collapseRef.value) {

diff --git a/packages/fast-extends/src/editor/components/fs-editor-wang/index.vue b/packages/fast-extends/src/editor/components/fs-editor-wang/index.vue
@@ -63,7 +63,7 @@ export default {
             //   this.dispatch("ElFormItem", "el.form.blur");
             // }
             // this.$emit("change", val);
-            this.editor.txt.html(value);
+            this.editor.txt.html(val);
           }
         }
       },
@@ -86,7 +86,14 @@ export default {
   },
   methods: {
     init() {
-      const editor = new WangEditor("#" + this.uniqueId);
+      let editor = null;
+      try {
+        editor = new WangEditor("#" + this.uniqueId);
+      } catch (e) {
+        console.error(e);
+        return;
+      }
+
       _.merge(editor.config, wangConfig, defaultConfig.wangEditor, this.config);
       editor.config.onchange = (newHtml) => {
         this.$emit("update:modelValue", newHtml);