cloud-web-corejs 1.0.54-dev.146 → 1.0.54-dev.149

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

@@ -1,22 +1,27 @@
 <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">
+      <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">
           <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" />
+                  <slot :name="slot" v-bind="scope"/>
                 </template>
               </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" />
+                  <slot :name="slot" v-bind="scope"/>
                 </template>
               </component>
             </template>

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

package/src/components/xform/form-render/indexMixin.js

@@ -116,6 +116,7 @@ modules = {
     let e = this;
     return {
       refList: this.widgetRefList,
+      widgetKeyNameMap: this.widgetKeyNameMap,
       sfRefList: this.subFormRefList,
       getFormConfig: function () {
         return e.formJsonObj.formConfig;
@@ -156,6 +157,7 @@ modules = {
       formDataModel: {},
       widgetRefList: {},
       subFormRefList: {},
+      widgetKeyNameMap: {},
       formId: null,
       externalComponents: {},
       readModeFlag: !1,
@@ -406,7 +408,7 @@ modules = {
           })
         }*/
         let flag = this.hanldeWfWidgetItem(target)
-        if(!hasModifyItem && flag){
+        if (!hasModifyItem && flag) {
           hasModifyItem = true
         }
         if (!saveButton && widget?.options?.saveButton) {
@@ -418,7 +420,7 @@ modules = {
         saveButton.setHidden(false);
       }
     },
-    hanldeWfWidgetItem(target){
+    hanldeWfWidgetItem(target) {
       let hasModifyItem = false;
       let widget = target.field || target.widget;
       let wfEdit = widget?.options.wfEdit;
@@ -430,8 +432,8 @@ modules = {
         let companyCode = this.$store.getters.companyCode;
         let taskStep = (wfInfo.taskStep ?? "") + "";
 
-        let handleWfConfigData = (options)=>{
-          if(!options || !options.wfEdit)return
+        let handleWfConfigData = (options) => {
+          if (!options || !options.wfEdit) return
           let wfConfigData = options.wfConfigData || [];
           wfConfigData.forEach(item => {
 
@@ -447,14 +449,14 @@ modules = {
                 if (type === 1) {
                   //可编辑
                   hasModifyItem = true;
-                  if(options.disabled!==undefined)options.disabled = false;
+                  if (options.disabled !== undefined) options.disabled = false;
                   // target.setDisabled && target.setDisabled(false);
                   // target.setHidden(false);
                   options.hidden = false;
                 } else if (type === 2) {
                   //仅显示
                   // target.setDisabled && target.setDisabled(true);
-                  if(options.disabled!==undefined)options.disabled = true;
+                  if (options.disabled !== undefined) options.disabled = true;
                   // target.setHidden(false);
                   options.hidden = false;
                 } else if (type === 3) {
@@ -462,7 +464,7 @@ modules = {
                   options.hidden = true;
                 }
               }
-            }else if(type == "data-table"){
+            } else if (type == "data-table") {
               target.options.tableColumns.forEach(item => {
                 handleWfConfigData(item.columnOption)
               })
@@ -541,8 +543,8 @@ modules = {
                 });*/
               }
             };
-            if(formConfig.wfStartBindSave){
-              option.onStart = (done)=>{
+            if (formConfig.wfStartBindSave) {
+              option.onStart = (done) => {
                 let formRef = this.getFormRef ? this.getFormRef() : this;
                 formRef.validate(valid => {
                   if (valid) {
@@ -550,9 +552,9 @@ modules = {
                   }
                 });
               }
-              option.onBeforeStartSubmit = (done)=>{
+              option.onBeforeStartSubmit = (done) => {
                 this.saveDefaultHandle({
-                  config:{
+                  config: {
                     successMsg: false,
                     isConfirm: false,
                     success: res => {

package/src/components/xform/mixins/scriptHttp.js

@@ -10,71 +10,116 @@ modules = {
       });
     },*/
     formHttp(opts) {
-      let toDo = () => {
-        let data = opts.data;
-        let scriptCode = opts.scriptCode;
-        let success = opts.success;
-        delete opts.data
-        delete opts.scriptCode
-        delete opts.formCode
-        delete opts.success
+      let data = opts.data;
+      let scriptCode = opts.scriptCode;
+      let formCode = opts.formCode;
+      let isLoading =  opts.isLoading ?? false;
+      let success = opts.success;
+      let fail = opts.fail;
+      let error = opts.fail;
+      delete opts.data
+      delete opts.scriptCode
+      delete opts.formCode
+      delete opts.isLoading
+      delete opts.success
+      delete opts.fail
+      delete opts.error
 
-        let reqData;
-        reqData = data;
-        /*if (opts.url) {
-          reqData = data;
-        } else {
-          reqData = {
-            scriptCode: scriptCode,
-            conditions: data
-          };
-        }*/
+      let that = this;
+      let getFormTemplate = (callback)=>{
+        let reportTemplate = that.getFormRef ? that.getFormRef().reportTemplate : that.reportTemplate;
+        if(formCode && formCode !== reportTemplate.formCode){
+          that.$http({
+            aes: true,
+            url: USER_PREFIX + `/formTemplate/getByFormCode`,
+            method: `post`,
+            data: {
+              stringOne: formCode
+            },
+            isLoading,
+            loadingTarget: document.body,
+            // modalStrictly: true,
+            success: res => {
+              let formTemplate = res.objx || {};
+              callback(formTemplate)
+            }
+          });
+        }else{
+          callback(reportTemplate)
+        }
 
-        let reportGlobalMap = getReportGlobalMap() || {};
+      }
+      let toDo = () => {
+        return new Promise((resolve, reject) => {
+          getFormTemplate(reportTemplate=>{
+            let reqData;
+            reqData = data;
+            /*if (opts.url) {
+              reqData = data;
+            } else {
+              reqData = {
+                scriptCode: scriptCode,
+                conditions: data
+              };
+            }*/
 
-        let reportTemplate = this.getFormRef ? this.getFormRef().reportTemplate : this.reportTemplate;
-        let formCode = reportTemplate.formCode;
-        let url = "/" + reportTemplate.serviceName + `/bd_api/${formCode}/${scriptCode}`;
-        // let url = BD_PREFIX + `/formScript/exeScript`;
-        return this.$http({
-          aes: true,
-          url: url,
-          method: `post`,
-          loadingTarget: document.body,
-          loading: true,
-          ...opts,
-          data: {
-            // scriptCode: scriptCode,
-            fixeData: reportGlobalMap,
-            ...reqData
-          },
-          success: res => {
-            if (opts.successMsg) {
-              this.$message({
-                message: res.content,
-                type: 'success',
-                duration: 1000
-              });
-            }
-            success && success(res);
-            if (opts.wfConfig) {
-              let formTarget = this.getFormRef ? this.getFormRef() : this;
-              let wfConfig = opts.wfConfig(res);
-              if (wfConfig) {
-                let reportTemplate = this.getFormRef ? this.getFormRef().reportTemplate : this.reportTemplate;
-                let serviceId = wfConfig.serviceId || reportTemplate?.serviceName;
-                let opt2 = Object.assign({}, wfConfig, {
-                  serviceId: serviceId
-                });
-                //初始化流程
-                let target1 = formTarget.$attrs['parent-target'];
-                let target2 = target1?.$attrs['parent-target'];
-                let target = !target2 ? this : target1;
-                initWf.call(target, opt2);
+            let reportGlobalMap = getReportGlobalMap() || {};
+
+            // let reportTemplate = this.getFormRef ? this.getFormRef().reportTemplate : this.reportTemplate;
+            let url = `/${reportTemplate.serviceName}/bd_api/${reportTemplate.formCode}/${scriptCode}`;
+            // let url = BD_PREFIX + `/formScript/exeScript`;
+            return this.$http({
+              aes: true,
+              url: url,
+              method: `post`,
+              loadingTarget: document.body,
+              isLoading,
+              ...opts,
+              data: {
+                // scriptCode: scriptCode,
+                fixeData: reportGlobalMap,
+                ...reqData
+              },
+              success: res => {
+                if (opts.successMsg) {
+                  this.$message({
+                    message: res.content,
+                    type: 'success',
+                    duration: 1000
+                  });
+                }
+                success && success(res);
+                if (opts.wfConfig) {
+                  let formTarget = this.getFormRef ? this.getFormRef() : this;
+                  let wfConfig = opts.wfConfig(res);
+                  if (wfConfig) {
+                    // let reportTemplate = this.getFormRef ? this.getFormRef().reportTemplate : this.reportTemplate;
+                    let serviceId = wfConfig.serviceId || reportTemplate?.serviceName;
+                    let opt2 = Object.assign({}, wfConfig, {
+                      serviceId: serviceId
+                    });
+                    //初始化流程
+                    let target1 = formTarget.$attrs['parent-target'];
+                    let target2 = target1?.$attrs['parent-target'];
+                    let target = !target2 ? this : target1;
+                    initWf.call(target, opt2);
+                  }
+                }
+                resolve(res);
+              },
+              fail: res=>{
+                fail && fail(res);
+                resolve(res);
+              },
+              error: e=>{
+                error && error(e);
+                reject(e);
               }
-            }
-          }
-        });
+            });
+          })
+
+
+        })
       }
       if (opts.isConfirm) {
         this.$baseConfirm(opts.confirmText).then(() => {

package/src/views/user/form/vform/designer.vue

@@ -14,6 +14,7 @@
         v-if="showDesinger"
         :readonly="readonly"
         :columnFlag="columnFlag"
+        @customConfirm="customConfirm"
       />
     </div><!--
     <el-tabs v-model="activeName" class="tab-boxCard tabCard-sty1" v-if="showDesinger">
@@ -37,7 +38,7 @@ export default {
   props: {
     formCode: String,
     readonly: Boolean,
-    formTemplate:Object,
+    formTemplate: Object,
     widgetList: Array,
     columnFlag: Boolean,
   },
@@ -95,15 +96,16 @@ export default {
     getTemplate() {
       /* this.showDesinger = true;
       return */
-      if(this.columnFlag){
+      if (this.columnFlag) {
         this.reportTemplate = this.formTemplate;
         this.showDesinger = true;
         this.$nextTick(() => {
           let formJson = this.$baseLodash.cloneDeep({
-            widgetList:this.widgetList
+            widgetList: this.widgetList
           });
           this.$refs.designer.setFormJson(formJson);
         })
+        return
       }
       this.$http({
         aes: true,
@@ -751,6 +753,9 @@ export default {
     },
     reflushTemplateList() {
       this.$emit("reflushTemplateList");
+    },
+    customConfirm(json) {
+      this.$emit("customConfirm", json);
     }
   }
 };

package/src/views/user/form/view/list.vue

@@ -1,7 +1,7 @@
 <template>
   <div id="containt">
     <template v-if="layoutType=='PC'">
-      <el-tabs v-model="activeName" class="tab-box">
+      <x-tabs ref="xTabs" v-model="activeName" class="tab-box">
         <el-tab-pane :label="$t2('常规')" name="first">
           <vFormRender :formCode="formCode2" :dataId.sync="dataId" :param="param"
                        v-if="showEdit" visible-key="showEdit" :parent-target="_self"
@@ -14,7 +14,15 @@
                          @reload="$reloadHandle" :openEditDialog="openEditDialog"></vFormRender>
           </div>
         </el-tab-pane>
-      </el-tabs>
+        <template #editTab="{tab,index,reloadTabContent}">
+          <el-tab-pane :key="tab.data.id" :label="tab.data[multiTabLabelField]" :name="tab.data.id+''"
+                       :closable="true">
+            <vFormRender :formCode="formCode2" :dataId.sync="tab.dataId" :param="tab.param"
+                         v-if="tab.showContent" :parent-target="_self"
+                         @reload="reloadTabContent"></vFormRender>
+          </el-tab-pane>
+        </template>
+      </x-tabs>
     </template>
     <template v-else-if="layoutType=='H5'">
       <el-dialog
@@ -69,7 +77,8 @@ export default {
       formCode2: null,
       dataId: null,
       showEditDialog: false,
-      param: {}
+      param: {},
+      multiTabLabelField:null
     };
   },
   created() {
@@ -100,6 +109,7 @@ export default {
           this.formJson = formJson;
           this.layoutType = formJson.formConfig?.layoutType
           this.formCode2 = formJson.formConfig?.editFormCode ?? null;
+          this.multiTabLabelField = formJson.formConfig?.multiTabLabelField
         }
       });
     },
@@ -108,12 +118,20 @@ export default {
         this.openEditH5Dialog(row);
         return;
       }
-      this.dataId = row && row.id ? row.id : null;
-      this.activeName = 'first';
-      this.showEdit = false;
-      this.showEditDialog = true;
-      this.param = param
-      this.$openEditView('showEdit');
+      let formConfig = this.formJson.formConfig
+      let multiTabEnabled = formConfig.multiTabEnabled && formConfig.multiTabLabelField
+      let dataId = row && row.id ? row.id : null;
+      if(multiTabEnabled && dataId){
+        this.$refs.xTabs.openEditTab(row,param);
+      }else{
+        this.dataId = dataId
+        this.activeName = 'first';
+        this.showEdit = false;
+        this.showEditDialog = true;
+        this.param = param
+        this.$openEditView('showEdit');
+      }
+
     },
     openEditH5Dialog(row) {
       this.dataId = row && row.id ? row.id : null;