eoss-ui 0.4.58 → 0.4.60

package/packages/flow-group/src/main.vue

@@ -1,42 +1,156 @@
 <template>
   <div class="es-flow-group" :class="{ 'is-hide-flow': !isShow }">
-    <el-tabs
-      class="es-flow-tabs es-tabs"
-      type="border-card"
-      v-model="activeName"
-      ref="tabs"
-      :before-leave="handleBefore"
-    >
-      <template v-for="(items, indexs) in tabs">
-        <el-tab-pane
-          v-if="handleHide(items.hide)"
-          :key="indexs"
-          :immediate="items.label == '流程图' ? false : items.immediate"
-          :label="items.label"
-          :name="String(indexs)"
-          :class="{ 'es-flex-vertical': items.average }"
-        >
-          <span slot="label" v-if="items.title">
-            <template v-if="typeof items.title === 'object'">
-              <i v-if="items.title.icon" :class="items.title.icon"></i>
-              <el-badge
-                v-if="
-                  Object.prototype.hasOwnProperty.call(items.title, 'count')
-                "
-                type="primary"
-                :value="items.title.count"
-                :max="99"
-              >
-              </el-badge>
-              {{ items.title.text }}
-            </template>
-            <template v-else>{{ items.title }}</template>
-          </span>
-          <template v-if="items.contents">
-            <template v-if="Array.isArray(items.contents)">
-              <template v-for="(item, index) in items.contents">
-                <div class="es-tab-pane-list" :key="index" v-if="items.average">
-                  <div class="es-tab-pane-main">
+    <div class="es-flow-group-main">
+      <el-tabs
+        class="es-flow-tabs es-tabs"
+        type="border-card"
+        v-model="activeName"
+        ref="tabs"
+        :before-leave="handleBefore"
+      >
+        <template v-for="(items, indexs) in tabs">
+          <el-tab-pane
+            v-if="handleHide(items.hide)"
+            :key="indexs"
+            :immediate="items.label == '流程图' ? false : items.immediate"
+            :label="items.label"
+            :name="String(indexs)"
+            :class="{ 'es-flex-vertical': items.average }"
+          >
+            <span slot="label" v-if="items.title">
+              <template v-if="typeof items.title === 'object'">
+                <i v-if="items.title.icon" :class="items.title.icon"></i>
+                <el-badge
+                  v-if="
+                    Object.prototype.hasOwnProperty.call(items.title, 'count')
+                  "
+                  type="primary"
+                  :value="items.title.count"
+                  :max="99"
+                >
+                </el-badge>
+                {{ items.title.text }}
+              </template>
+              <template v-else>{{ items.title }}</template>
+            </span>
+            <template v-if="items.contents">
+              <template v-if="Array.isArray(items.contents)">
+                <template v-for="(item, index) in items.contents">
+                  <div
+                    class="es-tab-pane-list"
+                    :key="index"
+                    v-if="items.average"
+                  >
+                    <div class="es-tab-pane-main">
+                      <es-data-table
+                        v-if="
+                          item.type === 'data-table' ||
+                          item.type === 'dataTable' ||
+                          item.type === 'flow-list' ||
+                          item.type === 'flowList'
+                        "
+                        :appId="taskExamineAppId"
+                        v-bind="
+                          handleExclAttribute({
+                            data: item,
+                            attrs: ['events', 'visible', 'type']
+                          })
+                        "
+                        :class="{
+                          'es-flow-group-data-table':
+                            item.type === 'data-table' ||
+                            item.type === 'dataTable',
+                          'es-flow-list':
+                            item.type === 'flow-list' ||
+                            item.type === 'flowList'
+                        }"
+                        :display="activeName === String(indexs)"
+                        v-on="item.events"
+                      >
+                        <template v-if="item.dialog" slot="dialog">
+                          <template v-if="Array.isArray(item.dialog)">
+                            <es-dialog
+                              v-for="(ele, ids) in item.dialog"
+                              :isReload="true"
+                              v-bind="ele"
+                              :key="ids"
+                              :visible.sync="ele.visible"
+                              v-on="{ ...ele.events }"
+                            >
+                            </es-dialog>
+                          </template>
+                          <es-dialog
+                            v-else
+                            :isReload="true"
+                            v-bind="item.dialog"
+                            :visible.sync="item.dialog.visible"
+                            v-on="{ ...item.dialog.events }"
+                          >
+                          </es-dialog>
+                        </template>
+                      </es-data-table>
+                      <es-tree-group
+                        v-if="
+                          item.type === 'tree-group' ||
+                          item.type === 'treeGroup'
+                        "
+                        :appId="taskExamineAppId"
+                        v-bind="
+                          handleExclAttribute({
+                            data: item,
+                            attrs: ['events', 'visible', 'type']
+                          })
+                        "
+                        :display="activeName === String(indexs)"
+                        v-on="{ ...item.events }"
+                      ></es-tree-group>
+                      <iframe
+                        v-if="item.type === 'iframe' && !item.blank"
+                        :id="item.id || item.name"
+                        :name="item.name"
+                        frameborder="0"
+                        width="100%"
+                        height="100%"
+                        :src="handleUrlJoinParams(item)"
+                      ></iframe>
+                      <es-upload
+                        v-if="item.type === 'attachment'"
+                        :file-count.sync="items.title.count"
+                        height="auto"
+                        class="es-attachment"
+                        :ownId="businessId"
+                        v-bind="
+                          handleExclAttribute({
+                            data: item,
+                            attrs: ['events', 'type']
+                          })
+                        "
+                        :display="activeName === String(indexs)"
+                        v-on="{ ...item.events }"
+                      ></es-upload>
+                    </div>
+                  </div>
+                  <template v-else>
+                    <es-form
+                      v-if="item.type === 'form'"
+                      ref="esFlowForm"
+                      :showMsg="showMsg"
+                      v-bind="
+                        handleExclAttribute({
+                          data: item,
+                          attrs: ['events', 'visible', 'type', 'model', 'ref']
+                        })
+                      "
+                      full
+                      :key="index"
+                      :autoId="true"
+                      :show-button="false"
+                      :closeDialog="false"
+                      :display="activeName === String(indexs)"
+                      :model="item.model"
+                      :businessId.sync="businessId"
+                      v-on="{ ...item.events }"
+                    ></es-form>
                     <es-data-table
                       v-if="
                         item.type === 'data-table' ||
@@ -51,6 +165,7 @@
                           attrs: ['events', 'visible', 'type']
                         })
                       "
+                      :key="index"
                       :class="{
                         'es-flow-group-data-table':
                           item.type === 'data-table' ||
@@ -94,21 +209,22 @@
                           attrs: ['events', 'visible', 'type']
                         })
                       "
+                      :key="index"
                       :display="activeName === String(indexs)"
                       v-on="{ ...item.events }"
                     ></es-tree-group>
                     <iframe
                       v-if="item.type === 'iframe' && !item.blank"
-                      :id="item.id || item.name"
-                      :name="item.name"
                       frameborder="0"
                       width="100%"
                       height="100%"
+                      :key="index"
+                      :id="item.id || item.name"
+                      :name="item.name"
                       :src="handleUrlJoinParams(item)"
                     ></iframe>
                     <es-upload
                       v-if="item.type === 'attachment'"
-                      :file-count.sync="items.title.count"
                       height="auto"
                       class="es-attachment"
                       :ownId="businessId"
@@ -118,248 +234,144 @@
                           attrs: ['events', 'type']
                         })
                       "
+                      :key="index"
+                      :file-count.sync="items.title.count"
                       :display="activeName === String(indexs)"
                       v-on="{ ...item.events }"
                     ></es-upload>
-                  </div>
-                </div>
-                <template v-else>
-                  <es-form
-                    v-if="item.type === 'form'"
-                    ref="esFlowForm"
-                    :showMsg="showMsg"
-                    v-bind="
-                      handleExclAttribute({
-                        data: item,
-                        attrs: ['events', 'visible', 'type', 'model', 'ref']
-                      })
-                    "
-                    full
-                    :key="index"
-                    :autoId="true"
-                    :show-button="false"
-                    :closeDialog="false"
-                    :display="activeName === String(indexs)"
-                    :model="item.model"
-                    :businessId.sync="businessId"
-                    v-on="{ ...item.events }"
-                  ></es-form>
-                  <es-data-table
-                    v-if="
-                      item.type === 'data-table' ||
-                      item.type === 'dataTable' ||
-                      item.type === 'flow-list' ||
-                      item.type === 'flowList'
-                    "
-                    :appId="taskExamineAppId"
-                    v-bind="
-                      handleExclAttribute({
-                        data: item,
-                        attrs: ['events', 'visible', 'type']
-                      })
-                    "
-                    :key="index"
-                    :class="{
-                      'es-flow-group-data-table':
-                        item.type === 'data-table' || item.type === 'dataTable',
-                      'es-flow-list':
-                        item.type === 'flow-list' || item.type === 'flowList'
-                    }"
-                    :display="activeName === String(indexs)"
-                    v-on="item.events"
-                  >
-                    <template v-if="item.dialog" slot="dialog">
-                      <template v-if="Array.isArray(item.dialog)">
-                        <es-dialog
-                          v-for="(ele, ids) in item.dialog"
-                          :isReload="true"
-                          v-bind="ele"
-                          :key="ids"
-                          :visible.sync="ele.visible"
-                          v-on="{ ...ele.events }"
-                        >
-                        </es-dialog>
-                      </template>
-                      <es-dialog
-                        v-else
-                        :isReload="true"
-                        v-bind="item.dialog"
-                        :visible.sync="item.dialog.visible"
-                        v-on="{ ...item.dialog.events }"
-                      >
-                      </es-dialog>
-                    </template>
-                  </es-data-table>
-                  <es-tree-group
-                    v-if="
-                      item.type === 'tree-group' || item.type === 'treeGroup'
-                    "
-                    :appId="taskExamineAppId"
-                    v-bind="
-                      handleExclAttribute({
-                        data: item,
-                        attrs: ['events', 'visible', 'type']
-                      })
-                    "
-                    :key="index"
-                    :display="activeName === String(indexs)"
-                    v-on="{ ...item.events }"
-                  ></es-tree-group>
-                  <iframe
-                    v-if="item.type === 'iframe' && !item.blank"
-                    frameborder="0"
-                    width="100%"
-                    height="100%"
-                    :key="index"
-                    :id="item.id || item.name"
-                    :name="item.name"
-                    :src="handleUrlJoinParams(item)"
-                  ></iframe>
-                  <es-upload
-                    v-if="item.type === 'attachment'"
-                    height="auto"
-                    class="es-attachment"
-                    :ownId="businessId"
-                    v-bind="
-                      handleExclAttribute({
-                        data: item,
-                        attrs: ['events', 'type']
-                      })
-                    "
-                    :key="index"
-                    :file-count.sync="items.title.count"
-                    :display="activeName === String(indexs)"
-                    v-on="{ ...item.events }"
-                  ></es-upload>
-                  <es-dialog
-                    v-if="
-                      item.type === 'dialog' && activeName === String(indexs)
-                    "
-                    :isReload="true"
-                    v-bind="item"
-                    :key="index"
-                    :visible.sync="item.visible"
-                    v-on="{ ...item.events }"
-                  >
-                  </es-dialog>
+                    <es-dialog
+                      v-if="
+                        item.type === 'dialog' && activeName === String(indexs)
+                      "
+                      :isReload="true"
+                      v-bind="item"
+                      :key="index"
+                      :visible.sync="item.visible"
+                      v-on="{ ...item.events }"
+                    >
+                    </es-dialog>
+                  </template>
                 </template>
               </template>
-            </template>
-            <template v-else>
-              <es-form
-                v-if="items.contents.type === 'form'"
-                :show-button="false"
-                ref="esFlowForm"
-                :showMsg="showMsg"
-                v-bind="
-                  handleExclAttribute({
-                    data: items.contents,
-                    attrs: ['events', 'visible', 'type', 'model', 'ref']
-                  })
-                "
-                full
-                :autoId="true"
-                :businessId.sync="businessId"
-                :closeDialog="false"
-                :display="activeName === String(indexs)"
-                :model="items.contents.model"
-                v-on="{ ...items.contents.events }"
-              ></es-form>
-              <es-data-table
-                v-if="
-                  items.contents.type === 'data-table' ||
-                  items.contents.type === 'dataTable' ||
-                  items.contents.type === 'flow-list' ||
-                  items.contents.type === 'flowList'
-                "
-                :appId="taskExamineAppId"
-                v-bind="
-                  handleExclAttribute({
-                    data: items.contents,
-                    attrs: ['events', 'visible', 'type']
-                  })
-                "
-                :class="{
-                  'es-flow-group-data-table':
+              <template v-else>
+                <es-form
+                  v-if="items.contents.type === 'form'"
+                  :show-button="false"
+                  ref="esFlowForm"
+                  :showMsg="showMsg"
+                  v-bind="
+                    handleExclAttribute({
+                      data: items.contents,
+                      attrs: ['events', 'visible', 'type', 'model', 'ref']
+                    })
+                  "
+                  full
+                  :autoId="true"
+                  :businessId.sync="businessId"
+                  :closeDialog="false"
+                  :display="activeName === String(indexs)"
+                  :model="items.contents.model"
+                  v-on="{ ...items.contents.events }"
+                ></es-form>
+                <es-data-table
+                  v-if="
                     items.contents.type === 'data-table' ||
-                    items.contents.type === 'dataTable',
-                  'es-flow-list':
+                    items.contents.type === 'dataTable' ||
                     items.contents.type === 'flow-list' ||
                     items.contents.type === 'flowList'
-                }"
-                :display="activeName === String(indexs)"
-                v-on="items.contents.events"
-              >
-                <template v-if="items.contents.dialog" slot="dialog">
-                  <template v-if="Array.isArray(items.contents.dialog)">
+                  "
+                  :appId="taskExamineAppId"
+                  v-bind="
+                    handleExclAttribute({
+                      data: items.contents,
+                      attrs: ['events', 'visible', 'type']
+                    })
+                  "
+                  :class="{
+                    'es-flow-group-data-table':
+                      items.contents.type === 'data-table' ||
+                      items.contents.type === 'dataTable',
+                    'es-flow-list':
+                      items.contents.type === 'flow-list' ||
+                      items.contents.type === 'flowList'
+                  }"
+                  :display="activeName === String(indexs)"
+                  v-on="items.contents.events"
+                >
+                  <template v-if="items.contents.dialog" slot="dialog">
+                    <template v-if="Array.isArray(items.contents.dialog)">
+                      <es-dialog
+                        v-for="(ele, ids) in items.contents.dialog"
+                        :isReload="true"
+                        v-bind="ele"
+                        :key="ids"
+                        :visible.sync="ele.visible"
+                        v-on="{ ...ele.events }"
+                      >
+                      </es-dialog>
+                    </template>
                     <es-dialog
-                      v-for="(ele, ids) in items.contents.dialog"
+                      v-else
                       :isReload="true"
-                      v-bind="ele"
-                      :key="ids"
-                      :visible.sync="ele.visible"
-                      v-on="{ ...ele.events }"
+                      v-bind="items.contents.dialog"
+                      :visible.sync="items.contents.dialog.visible"
+                      v-on="{ ...items.contents.dialog.events }"
                     >
                     </es-dialog>
                   </template>
-                  <es-dialog
-                    v-else
-                    :isReload="true"
-                    v-bind="items.contents.dialog"
-                    :visible.sync="items.contents.dialog.visible"
-                    v-on="{ ...items.contents.dialog.events }"
-                  >
-                  </es-dialog>
-                </template>
-              </es-data-table>
-              <es-tree-group
-                v-if="
-                  items.contents.type === 'tree-group' ||
-                  items.contents.type === 'treeGroup'
-                "
-                :appId="taskExamineAppId"
-                v-bind="
-                  handleExclAttribute({
-                    data: items.contents,
-                    attrs: ['events', 'visible', 'type']
-                  })
-                "
-                :display="activeName === String(indexs)"
-                v-on="{ ...items.contents.events }"
-              ></es-tree-group>
-              <iframe
-                v-if="items.contents.type === 'iframe' && !items.contents.blank"
-                :id="items.contents.id || items.contents.name"
-                :name="items.contents.name"
-                frameborder="0"
-                width="100%"
-                height="100%"
-                :src="handleUrlJoinParams(items.contents)"
-              ></iframe>
-              <es-upload
-                v-if="items.contents.type === 'attachment'"
-                :ownId="businessId"
-                v-bind="
-                  handleExclAttribute({
-                    data: items.contents,
-                    attrs: ['events', 'type']
-                  })
-                "
-                :file-count.sync="items.title.count"
-                :display="activeName === String(indexs)"
-                height="auto"
-                class="es-attachment"
-                v-on="{ ...items.contents.events }"
-              ></es-upload>
+                </es-data-table>
+                <es-tree-group
+                  v-if="
+                    items.contents.type === 'tree-group' ||
+                    items.contents.type === 'treeGroup'
+                  "
+                  :appId="taskExamineAppId"
+                  v-bind="
+                    handleExclAttribute({
+                      data: items.contents,
+                      attrs: ['events', 'visible', 'type']
+                    })
+                  "
+                  :display="activeName === String(indexs)"
+                  v-on="{ ...items.contents.events }"
+                ></es-tree-group>
+                <iframe
+                  v-if="
+                    items.contents.type === 'iframe' && !items.contents.blank
+                  "
+                  :id="items.contents.id || items.contents.name"
+                  :name="items.contents.name"
+                  frameborder="0"
+                  width="100%"
+                  height="100%"
+                  :src="handleUrlJoinParams(items.contents)"
+                ></iframe>
+                <es-upload
+                  v-if="items.contents.type === 'attachment'"
+                  :ownId="businessId"
+                  v-bind="
+                    handleExclAttribute({
+                      data: items.contents,
+                      attrs: ['events', 'type']
+                    })
+                  "
+                  :file-count.sync="items.title.count"
+                  :display="activeName === String(indexs)"
+                  height="auto"
+                  class="es-attachment"
+                  v-on="{ ...items.contents.events }"
+                ></es-upload>
+              </template>
             </template>
-          </template>
-        </el-tab-pane>
-      </template>
-    </el-tabs>
+          </el-tab-pane>
+        </template>
+      </el-tabs>
+    </div>
     <es-flow
       v-if="isShow"
       class="es-group-flow"
       v-bind="flow"
+      :style="{ width: _width }"
       :before-submit="handleSubmit"
       :businessId="businessId"
       @startTaskRead="handleTaskRead"
@@ -410,7 +422,11 @@ export default {
       default: true
     },
     appId: String,
-    zoom: false
+    zoom: false,
+    width: {
+      type: String,
+      default: '360px'
+    }
   },
   data() {
     return {
@@ -436,6 +452,9 @@ export default {
         return false;
       }
       return this.show;
+    },
+    _width() {
+      return parseInt(this.width, 10) + 'px';
     }
   },
   watch: {

package/packages/form/src/table.vue

@@ -129,7 +129,9 @@
                 :class="
                   item.type === 'label' || item.type === 'empty'
                     ? 'es-table-form-label'
-                    : item.disabled?'es-table-form-item td-disabled':'es-table-form-item'
+                    : item.disabled
+                    ? 'es-table-form-item td-disabled'
+                    : 'es-table-form-item'
                 "
                 :key="index"
                 :colspan="
@@ -986,7 +988,6 @@ export default {
         render: [Function, String]
       },
       render: (h, ctx) => {
-        console.log('ctx', ctx);
         if (typeof ctx.props.render == 'string') {
           try {
             return util.toFunction(ctx.props.render)(h, params);