cloud-web-corejs 1.1.0-dev.10 → 1.1.0-dev.11

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "cloud-web-corejs",
   "private": false,
-  "version": "1.1.0-dev.10",
+  "version": "1.1.0-dev.11",
   "scripts": {
     "dev": "vue-cli-service serve",
     "dev:micro": "vue-cli-service serve --port 17527",

package/src/components/mobile/wf/content.vue

@@ -221,7 +221,7 @@
               </el-select>
             </el-form-item>
             <el-form-item label="驳回意见" field="opinion">
-              <el-input type="textarea" :rows="8"
+              <el-input type="textarea" :rows="5"
                         :placeholder="$t2('请输入内容', 'components.wf.rejectOpinionPlaceholder')"
                         v-model="rejectForm.opinion" class="txt"></el-input>
             </el-form-item>

package/src/components/mobile/wf/selectUserDialog.vue

@@ -13,21 +13,17 @@
           走 xform/styles/h5.scss 的 .h5-pop-dialog（顶层选择器，body 挂载后才命中）。 -->
   <el-dialog
     :visible.sync="dialogVisible"
+    :title="$t1('选择用户')"
     :append-to-body="true"
     :modal="false"
-    :show-close="false"
     :close-on-click-modal="false"
     :destroy-on-close="true"
-    custom-class="h5-pop-dialog"
+    custom-class="dialog-style h5view-dialog"
     width="100%"
     top="0px"
     @close="dialogClose"
   >
-    <div>
-      <div class="header-box">
-        <i class="back el-icon-close" @click="dialogClose"></i>
-        {{ $t1('选择用户') }}
-      </div>
+    <div class="selected-flex-box">
       <div class="search-H5box">
         <div class="txt">
           <el-input placeholder="姓名" suffix-icon="el-icon-search" v-model="formData.nickName"
@@ -68,11 +64,6 @@
           </div>
         </div>
       </div>
-      <div class="fixed-bottom-btns">
-        <el-button type="primary" plain class="btn" @click="dialogClose" icon="el-icon-close">{{ $t1('取 消') }}
-        </el-button>
-        <el-button type="primary" class="btn" @click="dialogPrimary" icon="el-icon-check">{{ $t1('确 定') }}</el-button>
-      </div>
       <h5SearchDialog v-if="popStatus" :visiable.sync="popStatus" @searchEvent="confirmSearchDialog"
                       @resetEvent="resetSearchDialog">
         <el-form label-position="top">
@@ -85,6 +76,11 @@
         </el-form>
       </h5SearchDialog>
     </div>
+    <span slot="footer" class="dialog-footer">
+      <el-button type="primary" plain class="btn" @click="dialogClose" icon="el-icon-close">{{ $t1('取 消') }}
+      </el-button>
+      <el-button type="primary" class="btn" @click="dialogPrimary" icon="el-icon-check">{{ $t1('确 定') }}</el-button>
+    </span>
   </el-dialog>
 </template>
 

package/src/components/xform/form-render/container-item/detail-h5-item.vue

@@ -98,7 +98,7 @@
           <i class="el-icon-arrow-up h5-more-icon"></i>
           <el-dropdown-menu slot="dropdown">
             <el-dropdown-item v-for="(subWidget, swIdx) in overflowButtons()" :key="swIdx">
-              <el-button v-if="subWidget.__builtin" class="button-sty" :type="subWidget.type"
+              <el-button v-if="subWidget.__builtin" class="button-sty h5-dropdown-button" :type="subWidget.type"
                          @click="subWidget.onClick">{{ subWidget.label }}</el-button>
               <component v-else :is="subWidget.type + '-widget'" :field="subWidget" :designer="null"
                          :parent-list="widget.widgetList"