cloud-web-corejs 1.0.54-dev.63 → 1.0.54-dev.630

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"/>

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

@@ -811,14 +811,6 @@ export default {
       let columnEditFields = null;
 
       let type = this.columnFormatMap[row.formatS];
-      /*if (type == 'date') {
-        columnEditFields = ['type', 'format', 'valueFormat']
-      } else if (type == 'select') {
-
-      }
-      if (type == 'vabsearch') {
-        columnEditFields = ['vabSearchField', 'formCode', 'formVersion', 'required', 'showFormField', 'onSearchConfirm', 'onSearchClear']
-      }*/
 
       if (type) {
         columnSelectedWidget = this.$baseLodash.cloneDeep(formRef.getFieldWidgetByType(type));
@@ -845,7 +837,7 @@ export default {
         return "false";
       } else {
         let propName = this.getFieldKeyName(widget) + '.' + obj.rowIndex + '.' + obj.column.field
-        if (obj.column.params.widget == 'vabsearch') {
+        if (this.isVabsearchFlagWidget(widget)) {
           let vabSearchName = obj.column.params.widget.options.vabSearchName;
           propName = this.getFieldKeyName(widget) + '.' + obj.rowIndex + '.' + vabSearchName;
         }

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

@@ -1247,14 +1247,7 @@ export default {
       let columnEditFields = null;
 
       let type = this.columnFormatMap[row.formatS];
-      /*if (type == 'date') {
-        columnEditFields = ['type', 'format', 'valueFormat']
-      } else if (type == 'select') {
 
-      }
-      if (type == 'vabsearch') {
-        columnEditFields = ['vabSearchField', 'formCode', 'formVersion', 'required', 'showFormField', 'onSearchConfirm', 'onSearchClear']
-      }*/
 
       if (type) {
         columnSelectedWidget = this.$baseLodash.cloneDeep(formRef.getFieldWidgetByType(type));
@@ -1281,7 +1274,7 @@ export default {
         return "false";
       } else {
         let propName = this.getFieldKeyName(widget) + '.' + obj.rowIndex + '.' + obj.column.field
-        if (obj.column.params.widget == 'vabsearch') {
+        if (this.isVabsearchFlagWidget(widget)) {
           let vabSearchName = obj.column.params.widget.options.vabSearchName;
           propName = this.getFieldKeyName(widget) + '.' + obj.rowIndex + '.' + vabSearchName;
         }

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

@@ -1,11 +1,37 @@
 <template>
-  <container-item-wrapper :widget="widget" :class="widget.options.isFullscreen ? 'full-height':''">
-    <div :key="widget.id" class="tab-container" v-show="!widget.options.hidden">
-      <el-tabs v-model="activeTabName" :type="widget.displayType" :ref="widget.id" :class="[customClass,widget.options.tabClass]"  :style="{'height': widget.options.isFullscreen ? '' : widget.options.height}">
-        <el-tab-pane v-for="(tab, index) in visibleTabs" :key="index" :label="getI18nLabel(tab.options.label)" :disabled="tab.options.disabled" :name="tab.options.name">
+  <container-item-wrapper
+    :widget="widget"
+    :class="widget.options.isFullscreen ? 'full-height' : ''"
+  >
+    <div :key="widget.id" class="tab-container mHeight" v-show="!widget.options.hidden">
+      <el-tabs
+        v-model="activeTabName"
+        :type="widget.displayType"
+        :ref="widget.id"
+        :class="[customClass, widget.options.tabClass]"
+        :style="{
+          height: widget.options.isFullscreen ? '' : widget.options.height || '300px',
+        }"
+      >
+        <el-tab-pane
+          v-for="(tab, index) in visibleTabs"
+          :key="index"
+          :label="getI18nLabel(tab.options.label)"
+          :disabled="tab.options.disabled"
+          :name="tab.options.name"
+        >
           <template v-for="(subWidget, swIdx) in tab.widgetList">
             <template v-if="'container' === subWidget.category">
-              <component :is="subWidget.type + '-item'" :widget="subWidget" :key="swIdx" :parent-list="tab.widgetList" :index-of-parent-list="swIdx" :parent-widget="widget">
+              <component
+                :is="subWidget.type + '-item'"
+                :widget="subWidget"
+                :key="swIdx"
+                :parent-list="tab.widgetList"
+                :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" />
@@ -13,7 +39,16 @@
               </component>
             </template>
             <template v-else>
-              <component :is="subWidget.type + '-widget'" :field="subWidget" :key="swIdx" :parent-list="tab.widgetList" :index-of-parent-list="swIdx" :parent-widget="widget">
+              <component
+                :is="subWidget.type + '-widget'"
+                :field="subWidget"
+                :key="swIdx"
+                :parent-list="tab.widgetList"
+                :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" />
@@ -28,36 +63,36 @@
 </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 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 FieldComponents from "../../../../components/xform/form-designer/form-widget/field-widget/index";
 
 export default {
-  name: 'tab-item',
-  componentName: 'ContainerItem',
+  name: "tab-item",
+  componentName: "ContainerItem",
   mixins: [emitter, i18n, refMixin, containerItemMixin],
   components: {
     ContainerItemWrapper,
-    ...FieldComponents
+    ...FieldComponents,
   },
   props: {
-    widget: Object
+    widget: Object,
   },
-  inject: ['refList', 'sfRefList', 'globalModel'],
+  inject: ["refList", "sfRefList", "globalModel"],
   data() {
     return {
-      activeTabName: ''
+      activeTabName: "",
     };
   },
   computed: {
     visibleTabs() {
-      return this.widget.tabs.filter(tp => {
+      return this.widget.tabs.filter((tp) => {
         return !tp.options.hidden;
       });
-    }
+    },
   },
   created() {
     this.initRefList();
@@ -70,8 +105,8 @@ export default {
   },
   methods: {
     initActiveTab() {
-      if (this.widget.type === 'tab' && this.widget.tabs.length > 0) {
-        let activePanes = this.widget.tabs.filter(tp => {
+      if (this.widget.type === "tab" && this.widget.tabs.length > 0) {
+        let activePanes = this.widget.tabs.filter((tp) => {
           return tp.options.active === true;
         });
         if (activePanes.length > 0) {
@@ -80,9 +115,11 @@ export default {
           this.activeTabName = this.widget.tabs[0].options.name;
         }
       }
-    }
-  }
+    },
+  },
 };
 </script>
 
-<style lang="scss" scoped></style>
+<style lang="scss" scoped>
+  ::v-deep .mHeight .el-tabs .el-tabs__content{min-height:312px}
+</style>

package/src/components/xform/form-render/container-item/table-cell-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" :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"/>
@@ -26,42 +26,48 @@
 </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 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 FieldComponents from '../../../../components/xform/form-designer/form-widget/field-widget/index'
 
-  export default {
-    name: "TableCellItem",
-    componentName: "ContainerItem",
-    mixins: [emitter, i18n, refMixin],
-    components: {
-      ...FieldComponents,
-    },
-    props: {
-      widget: Object,
+export default {
+  name: "TableCellItem",
+  componentName: "ContainerItem",
+  mixins: [emitter, i18n, refMixin],
+  components: {
+    ...FieldComponents,
+  },
+  props: {
+    widget: Object,
 
-      rowIndex: Number,
-      colIndex: Number,
+    rowIndex: Number,
+    colIndex: Number,
+    tableParam: {
+      type: Object,
+      default: null,
     },
-    inject: ['refList', 'globalModel'],
-    computed: {
-      customClass() {
-        return this.widget.options.customClass || ''
-      },
-      tdClass(){
-        return (this.colIndex+1)%2 ==0 ? "":"odd"
-      },
-
+    formItemProp: {
+      type: String,
+      default: null,
+    },
+  },
+  inject: ['refList', 'globalModel'],
+  computed: {
+    customClass() {
+      return this.widget.options.customClass || ''
     },
-    created() {
-      /* tableCell不生成组件引用，故无须调用initRefList！！ */
-      //this.initRefList()
+    tdClass() {
+      return (this.colIndex + 1) % 2 == 0 ? "" : "odd"
     },
-    methods: {
 
-    }
-  }
+  },
+  created() {
+    /* tableCell不生成组件引用，故无须调用initRefList！！ */
+    //this.initRefList()
+  },
+  methods: {}
+}
 </script>
 
 <style lang="scss" scoped>

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

@@ -3,12 +3,14 @@
 
     <div :key="widget.id" class="table-container"
          v-show="!widget.options.hidden">
-      <table :ref="widget.id" class="table-layout table-d-box" :class="[customClass,widget.options.styleTableClass]" :style="tableStyle">
+      <table :ref="widget.id" class="table-layout table-d-box" :class="[customClass,widget.options.styleTableClass]"
+             :style="tableStyle">
         <tbody>
         <tr v-for="(row, rowIdx) in widget.rows" :key="row.id">
           <template v-for="(colWidget, colIdx) in row.cols">
             <table-cell-item v-if="!colWidget.merged" :widget="colWidget" :key="colIdx" :parent-list="widget.cols"
-                             :row-index="rowIdx" :col-index="colIdx" :parent-widget="widget">
+                             :row-index="rowIdx" :col-index="colIdx" :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"/>