cloud-web-corejs 1.0.54-dev.65 → 1.0.54-dev.651

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

@@ -10,13 +10,17 @@
 
 <template>
   <container-item-wrapper :widget="widget">
-    <div class="detail-wrap grid-container" :class="[customClass]" :ref="widget.id">
+    <div
+      class="detail-wrap grid-container"
+      :class="[customClass]"
+      :ref="widget.id"
+    >
       <div class="d-header clearfix">
         <div class="fl">
-          <i class="el-icon-info"/>
+          <i class="el-icon-info" />
           {{ getI18nLabel(widget.options.label) }}
         </div>
-<!--        <div class="fr">
+        <!--        <div class="fr">
           <el-button type="primary" plain class="button-sty" icon="el-icon-refresh-right" @click="reload">重置
           </el-button>
           <el-button type="primary" class="button-sty" icon="el-icon-check" @click="saveData" v-if="!wfInfo.id">保存
@@ -25,54 +29,76 @@
         <div class="fr">
           <template v-for="(subWidget, swIdx) in widget.widgetList">
             <template v-if="'container' === subWidget.category">
-              <component :is="subWidget.type + '-item'" :widget="subWidget" :key="swIdx"
-                         :parent-list="widget.widgetList"
-                         :index-of-parent-list="swIdx" :parent-widget="widget">
+              <component
+                :is="subWidget.type + '-item'"
+                :widget="subWidget"
+                :key="swIdx"
+                :parent-list="widget.widgetList"
+                :index-of-parent-list="swIdx"
+                :parent-widget="widget"
+              >
                 <!-- 递归传递插槽！！！ -->
-                <template v-for="slot in Object.keys($scopedSlots)" v-slot:[slot]="scope">
-                  <slot :name="slot" v-bind="scope"/>
+                <template
+                  v-for="slot in Object.keys($scopedSlots)"
+                  v-slot:[slot]="scope"
+                >
+                  <slot :name="slot" v-bind="scope" />
                 </template>
               </component>
             </template>
             <template v-else>
-              <component :is="subWidget.type + '-widget'" :field="subWidget" :designer="null" :key="swIdx"
-                         :parent-list="widget.widgetList"
-                         :index-of-parent-list="swIdx" :parent-widget="widget">
+              <component
+                :is="subWidget.type + '-widget'"
+                :field="subWidget"
+                :designer="null"
+                :key="swIdx"
+                :parent-list="widget.widgetList"
+                :index-of-parent-list="swIdx"
+                :parent-widget="widget"
+              >
                 <!-- 递归传递插槽！！！ -->
-                <template v-for="slot in Object.keys($scopedSlots)" v-slot:[slot]="scope">
-                  <slot :name="slot" v-bind="scope"/>
+                <template
+                  v-for="slot in Object.keys($scopedSlots)"
+                  v-slot:[slot]="scope"
+                >
+                  <slot :name="slot" v-bind="scope" />
                 </template>
               </component>
             </template>
           </template>
         </div>
       </div>
-      <baseTabs style="height: auto;">
-        <detail-pane-widget v-for="(paneWidget, index) in widget.panes" :key="index" :widget="paneWidget"
-                            :parent-list="widget.panes"
-                            :index-of-parent-list="index" :parent-widget="widget"
-                            :col-height="widget.options.colHeight" tabRef="baseTabRef" :tabPaneGrade="2"></detail-pane-widget>
+      <baseTabs :showNav="!widget.options.hideNav">
+        <detail-pane-widget
+          v-for="(paneWidget, index) in widget.panes"
+          :key="index"
+          :widget="paneWidget"
+          :parent-list="widget.panes"
+          :index-of-parent-list="index"
+          :parent-widget="widget"
+          :col-height="widget.options.colHeight"
+          tabRef="baseTabRef"
+          :tabPaneGrade="2"
+        ></detail-pane-widget>
       </baseTabs>
     </div>
   </container-item-wrapper>
 </template>
 
 <script>
+import emitter from "../../../../components/xform/utils/emitter";
+import i18n from "../../../../components/xform/utils/i18n";
+import refMixin from "../../../../components/xform/form-render/refMixin";
+import ContainerItemWrapper from "./container-item-wrapper";
+import containerItemMixin from "./containerItemMixin";
+import detailPaneWidget from "../../../../components/xform/form-render/container-item/detail-pane-item";
+import FieldComponents from "../../../../components/xform/form-designer/form-widget/field-widget/index";
 
-import emitter from '../../../../components/xform/utils/emitter'
-import i18n from "../../../../components/xform/utils/i18n"
-import refMixin from "../../../../components/xform/form-render/refMixin"
-import ContainerItemWrapper from './container-item-wrapper'
-import containerItemMixin from "./containerItemMixin"
-import detailPaneWidget from "../../../../components/xform/form-render/container-item/detail-pane-item"
-import FieldComponents from '../../../../components/xform/form-designer/form-widget/field-widget/index'
-
-
-import {initWf} from '../../../../components/wf/wfUtil'
+import { initWf } from "../../../../components/wf/wfUtil";
 
 export default {
   name: "detail-item",
-  componentName: 'ContainerItem',
+  componentName: "ContainerItem",
   mixins: [emitter, i18n, refMixin, containerItemMixin],
   components: {
     ContainerItemWrapper,
@@ -82,35 +108,35 @@ export default {
   props: {
     widget: Object,
   },
-  inject: ['refList', 'sfRefList', 'globalModel', 'previewState'],
+  inject: ["refList", "sfRefList", "globalModel", "previewState"],
   created() {
-    this.initRefList()
+    this.initRefList();
     this.handleOnCreated();
   },
   mounted() {
     this.handleOnMounted();
     this.$nextTick(() => {
       this.createWf();
-    })
+    });
   },
   beforeDestroy() {
-    this.unregisterFromRefList()
+    this.unregisterFromRefList();
   },
   data() {
     return {
-      wfInfo: {}
-    }
+      wfInfo: {},
+    };
   },
   methods: {
     reload() {
-      this.getFormRef().$parent.$baseReload()
+      this.getFormRef().$parent.$baseReload();
     },
     saveData() {
-      if (!!this.previewState) return
+      if (!!this.previewState) return;
       this.getFormRef().saveForm();
     },
     createWf() {
-      if (!!this.previewState || !this.widget.options.wfEnabled) return
+      if (!!this.previewState || !this.widget.options.wfEnabled) return;
       let formTarget = this.getFormRef();
       let formData = formTarget.formData;
       if (formData && formData.object_foreign_id) {
@@ -120,17 +146,16 @@ export default {
           objId: formData.object_foreign_id, //单据ID
           wfCode: formCode, //流程编码
           showStartBtn: true, //是否放出启动按钮,流程已启动时此参数失效
-          serviceId: 'user',
-          callback: ({wfInfo}) => {
+          serviceId: "user",
+          callback: ({ wfInfo }) => {
             this.wfInfo = wfInfo;
-          }
-        }
+          },
+        };
         initWf.call(formTarget.$parent, option);
       }
-
-    }
+    },
   },
-}
+};
 </script>
 
 <style lang="scss" scoped>
@@ -148,11 +173,10 @@ export default {
     // min-height: 28px;
     height: 100%;
   }
-
 }
 
-.grid-container.selected, .grid-cell.selected {
+.grid-container.selected,
+.grid-cell.selected {
   outline: 2px solid $--color-primary !important;
 }
-
 </style>

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

@@ -1,6 +1,12 @@
 <template>
-  <baseTabPane :label="getI18nLabel(widget.options.label)" ref="baseTabRef" :visible="!widget.options.hidden" v-show="!widget.options.hidden">
+  <baseTabPane :label="getI18nLabel(widget.options.label)" ref="baseTabRef" :visible="!widget.options.hidden" v-show="!widget.options.hidden" :showFold="true"
+               :defaultShowContent="!widget.options.defaultCollapse">
+
     <template #button>
+<!--      <div class='btn-close-open' @click="opeaShowCont()">
+        <span v-if="showStatus==true"><i class="el-icon-arrow-up"></i>收起</span>
+        <span v-else><i class="el-icon-arrow-down"></i>展开</span>
+      </div>-->
       <template v-for="(subWidget, swIdx) in widget.buttonWidgetList">
         <template v-if="'container' === subWidget.category">
           <component :is="subWidget.type + '-item'" :widget="subWidget" :key="swIdx"
@@ -25,7 +31,7 @@
       </template>
     </template>
     <template #default>
-      <div>
+      <div :class="{'hidden':!showStatus}">
         <template>
           <template v-for="(subWidget, swIdx) in widget.widgetList">
             <template v-if="'container' === subWidget.category">
@@ -91,8 +97,16 @@ export default {
   mounted() {
     this.handleOnMounted();
   },
+  data() {
+    return {
+      showStatus:true,
+    }
+  },
   methods: {
-
+    opeaShowCont(){
+      this.showStatus = !this.showStatus
+      console.log(this.showStatus)
+    }
   }
 }
 </script>

package/src/components/xform/form-render/container-item/grid-col-item.vue

@@ -5,7 +5,7 @@
       <template v-for="(subWidget, swIdx) in widget.widgetList">
         <template v-if="'container' === subWidget.category">
           <component :is="subWidget.type + '-item'" :widget="subWidget" :key="swIdx" :parent-list="widget.widgetList"
-                          :index-of-parent-list="swIdx" :parent-widget="widget">
+                          :index-of-parent-list="swIdx" :parent-widget="widget" :tableParam="tableParam" :formItemProp="formItemProp">
             <!-- 递归传递插槽！！！ -->
             <template v-for="slot in Object.keys($scopedSlots)" v-slot:[slot]="scope">
               <slot :name="slot" v-bind="scope"/>
@@ -14,7 +14,7 @@
         </template>
         <template v-else>
           <component :is="subWidget.type + '-widget'" :field="subWidget" :designer="null" :key="swIdx" :parent-list="widget.widgetList"
-                        :index-of-parent-list="swIdx" :parent-widget="widget">
+                        :index-of-parent-list="swIdx" :parent-widget="widget" :tableParam="tableParam" :formItemProp="formItemProp">
             <!-- 递归传递插槽！！！ -->
             <template v-for="slot in Object.keys($scopedSlots)" v-slot:[slot]="scope">
               <slot :name="slot" v-bind="scope"/>
@@ -54,7 +54,14 @@
         type: String,
         default: null
       },
-
+      tableParam: {
+        type: Object,
+        default: null,
+      },
+      formItemProp: {
+        type: String,
+        default: null,
+      },
     },
     inject: ['refList', 'globalModel', 'previewState'],
     data() {

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

@@ -7,7 +7,7 @@
       <template v-for="(colWidget, colIdx) in widget.cols">
         <grid-col-item :widget="colWidget" :key="colIdx" :parent-list="widget.cols"
                        :index-of-parent-list="colIdx" :parent-widget="widget"
-                       :col-height="widget.options.colHeight">
+                       :col-height="widget.options.colHeight" :tableParam="tableParam" :formItemProp="formItemProp">
           <!-- 递归传递插槽！！！ -->
           <template v-for="slot in Object.keys($scopedSlots)" v-slot:[slot]="scope">
             <slot :name="slot" v-bind="scope"/>