cloud-web-corejs 1.0.30 → 1.0.32

package/src/components/xform/form-designer/toolbar-panel/index.vue

@@ -8,9 +8,9 @@
           {{ i18nt('designer.toolbar.pcLayout') }}
         </el-button>
         <!--         <el-button :type="layoutType === 'Pad' ? 'info' : ''" @click="changeLayoutType('Pad')">{{ i18nt('designer.toolbar.padLayout') }}</el-button>-->
-<!--        <el-button :type="layoutType === 'H5' ? 'info' : ''" @click="changeLayoutType('H5')" size="mini">
-          {{ i18nt('designer.toolbar.mobileLayout') }}
-        </el-button>-->
+        <!--        <el-button :type="layoutType === 'H5' ? 'info' : ''" @click="changeLayoutType('H5')" size="mini">
+                  {{ i18nt('designer.toolbar.mobileLayout') }}
+                </el-button>-->
       </el-button-group>
       <!--       <el-button type="" style="margin-left: 20px" :title="i18nt('designer.toolbar.nodeTreeHint')" @click="showNodeTreeDrawer"><svg-icon icon-class="node-tree" /></el-button>-->
     </div>
@@ -42,7 +42,8 @@
                   <i class="iconfont icon-liebiaoshezhi-list-setting"/>
                   表单/列表设置
                 </el-button>-->
-        <el-button type="primary" @click="saveReportTemplate()" plain v-if="designer.vueInstance.isDev">
+        <el-button type="primary" @click="saveReportTemplate()" plain
+                   v-if="designer.vueInstance.isDev && designer.vueInstance.menuKindAuth.editAuth===1">
           <i class="el-icon-check"/>
           保存
         </el-button>
@@ -111,123 +112,123 @@
           </VFormRender>
         </div>
       </div>
-<!--      <el-tabs v-model="activeName" class="tab-box">
-        <el-tab-pane label="常规" name="first">
-          <div>
-            <div class="form-render-wrapper" id="containt"
-                 :class="[layoutType === 'H5' ? 'h5-layout' : layoutType === 'Pad' ? 'pad-layout' : '']">
-              <VFormRender
-                ref="preForm"
-                :form-json="formJson"
-                :form-data="testFormData"
-                :preview-state="true"
-                :option-data="testOptionData"
-                @appendButtonClick="testOnAppendButtonClick"
-                @buttonClick="testOnButtonClick"
-                @formChange="handleFormChange"
-                :reportTemplate.sync="reportTemplate"
-                v-if="showRender" visible-key="showRender" :parent-target="_self" @reload="$reloadHandle"
-              >
-                &lt;!&ndash;
-                <div slot="testSlot">aaaa</div>
-                &ndash;&gt;
-              </VFormRender>
-            </div>
-          </div>
-          <code-editor v-model="testFunc" style="display: none"></code-editor>
-        </el-tab-pane>
-        <el-tab-pane label="列表" name="second">
-          <template v-if="false">
-            <div class="grid-height">
-              <vxe-grid ref="table-m1" v-bind="vxeOption" @resizable-change="$vxeTableUtil.onColumnWitchChange"
-                        @custom="$vxeTableUtil.customHandle">
-                <template #form>
-                  <div class="clearfix screen-btns">
-                    <div class="fl">
-                      <vxe-button status="primary" class="button-sty" icon="el-icon-plus">新增
-                      </vxe-button>
-                    </div>
-                    <div class="fr">
-                      <vxe-button icon="el-icon-brush" class="button-sty" type="text" status="primary" plain
-                                  @click="formData={}">重置
-                      </vxe-button>
-                      <vxe-button status="warning" icon="el-icon-search" class="button-sty">搜索
-                      </vxe-button>
-                    </div>
+      <!--      <el-tabs v-model="activeName" class="tab-box">
+              <el-tab-pane label="常规" name="first">
+                <div>
+                  <div class="form-render-wrapper" id="containt"
+                       :class="[layoutType === 'H5' ? 'h5-layout' : layoutType === 'Pad' ? 'pad-layout' : '']">
+                    <VFormRender
+                      ref="preForm"
+                      :form-json="formJson"
+                      :form-data="testFormData"
+                      :preview-state="true"
+                      :option-data="testOptionData"
+                      @appendButtonClick="testOnAppendButtonClick"
+                      @buttonClick="testOnButtonClick"
+                      @formChange="handleFormChange"
+                      :reportTemplate.sync="reportTemplate"
+                      v-if="showRender" visible-key="showRender" :parent-target="_self" @reload="$reloadHandle"
+                    >
+                      &lt;!&ndash;
+                      <div slot="testSlot">aaaa</div>
+                      &ndash;&gt;
+                    </VFormRender>
                   </div>
-                  <template v-if="searchFields.length>0">
-                    <vxe-form ref="form" class="screen-box" title-width="92px" title-align="right" :data="formData">
-                      <vxe-form-item v-for="(item,index) in searchFields"
-                                     :key="index" :title="item.label+':'">
-                        <template v-slot>
-                          <el-input v-model="formData[item.prop]" size="small" clearable/>
-                        </template>
-                      </vxe-form-item>
-                    </vxe-form>
-                  </template>
-                </template>
-              </vxe-grid>
-            </div>
-          </template>
-          <template v-else>
-            <div id="containt">
-              <div class="tree-box fl">
-                <div class="tit"><b>机构分类</b></div>
-                <el-tree
-                  :props="treeOption.defaultProps"
-                  :load="loadNode"
-                  node-key="id"
-                  ref="tree"
-                  highlight-current
-                  lazy
-                  :expand-on-click-node="false"
-                  @node-click="handleNodeClick"
-                  class="tree-list"
-                  icon-class="el-icon-arrow-down"
-                ></el-tree>
-              </div>
-              <label id="labBtn">
-                <div class="icon">
-                  <i class="el-icon-more"></i>
-                  <i class="el-icon-more"></i>
                 </div>
-              </label>
-              <div class="main-right fr" style="padding-left:6px;">
-                <div class="grid-height">
-                  <vxe-grid ref="table-m1" v-bind="vxeOption" @resizable-change="$vxeTableUtil.onColumnWitchChange"
-                            @custom="$vxeTableUtil.customHandle">
-                    <template #form>
-                      <div class="clearfix screen-btns">
-                        <div class="fl">
-                          <vxe-button status="primary" class="button-sty" icon="el-icon-plus">新增
-                          </vxe-button>
-                        </div>
-                        <div class="fr">
-                          <vxe-button icon="el-icon-brush" class="button-sty" type="text" status="primary" plain
-                                      @click="formData={}">重置
-                          </vxe-button>
-                          <vxe-button status="warning" icon="el-icon-search" class="button-sty">搜索
-                          </vxe-button>
+                <code-editor v-model="testFunc" style="display: none"></code-editor>
+              </el-tab-pane>
+              <el-tab-pane label="列表" name="second">
+                <template v-if="false">
+                  <div class="grid-height">
+                    <vxe-grid ref="table-m1" v-bind="vxeOption" @resizable-change="$vxeTableUtil.onColumnWitchChange"
+                              @custom="$vxeTableUtil.customHandle">
+                      <template #form>
+                        <div class="clearfix screen-btns">
+                          <div class="fl">
+                            <vxe-button status="primary" class="button-sty" icon="el-icon-plus">新增
+                            </vxe-button>
+                          </div>
+                          <div class="fr">
+                            <vxe-button icon="el-icon-brush" class="button-sty" type="text" status="primary" plain
+                                        @click="formData={}">重置
+                            </vxe-button>
+                            <vxe-button status="warning" icon="el-icon-search" class="button-sty">搜索
+                            </vxe-button>
+                          </div>
                         </div>
+                        <template v-if="searchFields.length>0">
+                          <vxe-form ref="form" class="screen-box" title-width="92px" title-align="right" :data="formData">
+                            <vxe-form-item v-for="(item,index) in searchFields"
+                                           :key="index" :title="item.label+':'">
+                              <template v-slot>
+                                <el-input v-model="formData[item.prop]" size="small" clearable/>
+                              </template>
+                            </vxe-form-item>
+                          </vxe-form>
+                        </template>
+                      </template>
+                    </vxe-grid>
+                  </div>
+                </template>
+                <template v-else>
+                  <div id="containt">
+                    <div class="tree-box fl">
+                      <div class="tit"><b>机构分类</b></div>
+                      <el-tree
+                        :props="treeOption.defaultProps"
+                        :load="loadNode"
+                        node-key="id"
+                        ref="tree"
+                        highlight-current
+                        lazy
+                        :expand-on-click-node="false"
+                        @node-click="handleNodeClick"
+                        class="tree-list"
+                        icon-class="el-icon-arrow-down"
+                      ></el-tree>
+                    </div>
+                    <label id="labBtn">
+                      <div class="icon">
+                        <i class="el-icon-more"></i>
+                        <i class="el-icon-more"></i>
                       </div>
-                      <template v-if="searchFields.length>0">
-                        <vxe-form ref="form" class="screen-box" title-width="92px" title-align="right" :data="formData">
-                          <vxe-form-item v-for="(item,index) in searchFields"
-                                         :key="index" :title="item.label+':'">
-                            <template v-slot>
-                              <el-input v-model="formData[item.prop]" size="small" clearable/>
+                    </label>
+                    <div class="main-right fr" style="padding-left:6px;">
+                      <div class="grid-height">
+                        <vxe-grid ref="table-m1" v-bind="vxeOption" @resizable-change="$vxeTableUtil.onColumnWitchChange"
+                                  @custom="$vxeTableUtil.customHandle">
+                          <template #form>
+                            <div class="clearfix screen-btns">
+                              <div class="fl">
+                                <vxe-button status="primary" class="button-sty" icon="el-icon-plus">新增
+                                </vxe-button>
+                              </div>
+                              <div class="fr">
+                                <vxe-button icon="el-icon-brush" class="button-sty" type="text" status="primary" plain
+                                            @click="formData={}">重置
+                                </vxe-button>
+                                <vxe-button status="warning" icon="el-icon-search" class="button-sty">搜索
+                                </vxe-button>
+                              </div>
+                            </div>
+                            <template v-if="searchFields.length>0">
+                              <vxe-form ref="form" class="screen-box" title-width="92px" title-align="right" :data="formData">
+                                <vxe-form-item v-for="(item,index) in searchFields"
+                                               :key="index" :title="item.label+':'">
+                                  <template v-slot>
+                                    <el-input v-model="formData[item.prop]" size="small" clearable/>
+                                  </template>
+                                </vxe-form-item>
+                              </vxe-form>
                             </template>
-                          </vxe-form-item>
-                        </vxe-form>
-                      </template>
-                    </template>
-                  </vxe-grid>
-                </div>
-              </div>
-            </div>
-          </template>
-        </el-tab-pane>
-      </el-tabs>-->
+                          </template>
+                        </vxe-grid>
+                      </div>
+                    </div>
+                  </div>
+                </template>
+              </el-tab-pane>
+            </el-tabs>-->
       <div slot="footer" class="dialog-footer" v-if="false">
         <!-- <el-button type="primary" @click="getFormData" class="button-sty">{{ i18nt('designer.hint.getFormData') }}</el-button>
         <el-button type="primary" @click="resetForm" class="button-sty">{{ i18nt('designer.hint.resetForm') }}</el-button>
@@ -530,10 +531,13 @@ div.toolbar-container {
 
     .el-button {
       margin-left: 15px;
-      margin-right:15px;
+      margin-right: 15px;
       font-size: 14px;
       vertical-align: middle;
-      &.el-button--primary{    padding: 7px 14px;}
+
+      &.el-button--primary {
+        padding: 7px 14px;
+      }
     }
   }
 }