cloud-web-corejs 1.0.54-dev.351 → 1.0.54-dev.353

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

@@ -1,42 +1,51 @@
 <template>
   <container-item-wrapper :widget="widget">
-
-    <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">
+    <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"
+      >
         <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" :parent-target="_self"
-                             :row.sync="rowData">
-              <!-- 递归传递插槽！！！ -->
-              <template v-for="slot in Object.keys($scopedSlots)" v-slot:[slot]="scope">
-                <slot :name="slot" v-bind="scope"/>
-              </template>
-            </table-cell-item>
-          </template>
-        </tr>
+          <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"
+                :parent-target="_self"
+                :row.sync="rowData"
+              >
+                <!-- 递归传递插槽！！！ -->
+                <template v-for="slot in Object.keys($scopedSlots)" v-slot:[slot]="scope">
+                  <slot :name="slot" v-bind="scope" />
+                </template>
+              </table-cell-item>
+            </template>
+          </tr>
         </tbody>
       </table>
     </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 TableCellItem from './table2-cell-item'
+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 TableCellItem from "./table2-cell-item";
 import containerItemMixin from "./containerItemMixin";
-import {generateId} from "../../../../components/xform/utils/util"
+import { generateId } from "../../../../components/xform/utils/util";
 
 export default {
   name: "table2-item",
-  componentName: 'ContainerItem',
+  componentName: "ContainerItem",
   mixins: [emitter, i18n, refMixin, containerItemMixin],
   components: {
     ContainerItemWrapper,
@@ -45,46 +54,46 @@ export default {
   props: {
     widget: Object,
   },
-  inject: ['refList', 'sfRefList', 'globalModel'],
+  inject: ["refList", "sfRefList", "globalModel"],
   provide: {
-    getRows: () => this.rows
+    getRows: () => this.rows,
   },
   computed: {
     tableStyle() {
-      return this.widget.options.fullWidth ? 'width:100%;' : '';
+      return this.widget.options.fullWidth ? "width:100%;" : "";
     },
     formModel: {
       cache: !1,
       get: function () {
         return this.globalModel.formModel;
-      }
+      },
     },
     formDataId() {
       let formRef = this.getFormRef();
       return formRef.dataId;
-    }
+    },
   },
   created() {
-    this.initRefList()
-    this.handleOnCreated()
+    this.initRefList();
+    this.handleOnCreated();
   },
   mounted() {
-    this.handleOnMounted()
+    this.handleOnMounted();
   },
   beforeDestroy() {
-    this.unregisterFromRefList()
+    this.unregisterFromRefList();
   },
   data() {
     return {
       rows: [],
       rowData: {},
       typeMap: {
-        0: 'input',
-        1: 'textarea',
-        2: 'date',
-        3: 'number',
-      }
-    }
+        0: "input",
+        1: "textarea",
+        2: "date",
+        3: "number",
+      },
+    };
   },
   watch: {},
   methods: {
@@ -95,13 +104,11 @@ export default {
       return this.rows;
     },
     getType(f_field_type) {
-      return this.typeMap[f_field_type]
+      return this.typeMap[f_field_type];
     },
     setValue(items = []) {
-
-
       let dataMap = {};
-      let widgetRows = []
+      let widgetRows = [];
       let currentSpan = 0;
       let index = -1;
 
@@ -111,65 +118,71 @@ export default {
           item.f_field_value = null;
         }
         let type = this.getType(item.f_field_type);
-        let tableCell = this.$baseLodash.cloneDeep(formRef.getContainerByType("table-cell"));
+        let tableCell = this.$baseLodash.cloneDeep(
+          formRef.getContainerByType("table-cell")
+        );
         tableCell.options.rowIndex = rowIndex;
         let colspan = 1;
         let tc = 0;
         if (type == "textarea") {
           if (currentSpan && currentSpan < 4) {
-            tc = 4 - currentSpan
+            tc = 4 - currentSpan;
           }
-          colspan = 4
-          tableCell.options.colspan = 4
+          colspan = 4;
+          tableCell.options.colspan = 4;
         }
 
-        let widget = this.$baseLodash.cloneDeep(formRef.getFieldWidgetByType(type));
-        let options = widget.options;
-        options.keyNameEnabled = true;
-        options.keyName = item.f_key;
-        options.label = item.f_field_name;
-        options.required = item.f_is_required;
-
-        tableCell.widgetList.push(widget)
+        let widget = type
+          ? this.$baseLodash.cloneDeep(formRef.getFieldWidgetByType(type))
+          : null;
+        if (widget) {
+          let options = widget.options;
+          options.keyNameEnabled = true;
+          options.keyName = item.f_key;
+          options.label = item.f_field_name;
+          options.required = item.f_is_required;
+          tableCell.widgetList.push(widget);
+        }
 
         if (index === -1) {
-          index++
+          index++;
           widgetRows.push({
-            id: 'table-row-' + generateId(),
+            id: "table-row-" + generateId(),
             merged: false,
-            cols: []
-          })
+            cols: [],
+          });
           currentSpan = colspan;
         } else if (currentSpan + colspan > 4) {
-          index++
+          index++;
           widgetRows.push({
-            id: 'table-row-' + generateId(),
+            id: "table-row-" + generateId(),
             merged: false,
-            cols: []
-          })
+            cols: [],
+          });
           currentSpan = colspan;
         } else {
           currentSpan = colspan + currentSpan;
         }
 
         for (let i = 0; i < tc; i++) {
-          widgetRows[index - 1].cols.push(this.$baseLodash.cloneDeep(formRef.getContainerByType("table-cell")));
+          widgetRows[index - 1].cols.push(
+            this.$baseLodash.cloneDeep(formRef.getContainerByType("table-cell"))
+          );
         }
 
         let cols = widgetRows[index].cols;
 
-
         cols.push(tableCell);
 
         dataMap[item.f_key] = item.f_field_value ?? null;
-      })
+      });
 
       this.rows = items;
       this.$set(this.formModel, this.fieldKeyName, items);
 
       this.rowData = dataMap;
-      this.widget.rows.length = 0
-      this.widget.rows.push(...widgetRows)
+      this.widget.rows.length = 0;
+      this.widget.rows.push(...widgetRows);
     },
     loadDataDefaultHandle() {
       /*this.init();
@@ -179,9 +192,9 @@ export default {
       let reportTemplate = this.getFormRef().reportTemplate;
       let formCode = reportTemplate.formCode;
       let formScriptEnabled = this.widget.options.formScriptEnabled || false;
-      let scriptCode = this.widget.options.formScriptCode
+      let scriptCode = this.widget.options.formScriptCode;
       if (!scriptCode) return;
-      let accessParam = this.handleCustomEvent(this.widget.options.formScriptParam)
+      let accessParam = this.handleCustomEvent(this.widget.options.formScriptParam);
       return this.formHttp({
         scriptCode: scriptCode,
         data: {
@@ -190,31 +203,72 @@ export default {
           taBm: this.fieldKeyName,
           data: {
             id: dataId,
-            ...accessParam
-          }
+            ...accessParam,
+          },
         },
-        success: res => {
+        success: (res) => {
           let rows = res.objx || [];
-          this.setValue(rows)
-        }
+          this.setValue(rows);
+        },
       });
     },
     init() {
       let items = [
-        {f_field_name: "a", f_key: "a", f_field_type: 0, f_is_required: true, f_field_value: '1'},
-        {f_field_name: "b", f_key: "b", f_field_type: 3, f_is_required: true, f_field_value: 2},
-        {f_field_name: "c", f_key: "c", f_field_type: 1, f_is_required: true, f_field_value: "11111"},
-        {f_field_name: "d", f_key: "d", f_field_type: 0, f_is_required: true, f_field_value: '3'},
-        {f_field_name: "e", f_key: "e", f_field_type: 0, f_is_required: true, f_field_value: '4'},
-        {f_field_name: "f", f_key: "f", f_field_type: 0, f_is_required: true, f_field_value: '5'},
-        {f_field_name: "g", f_key: "g", f_field_type: 0, f_is_required: true, f_field_value: '6'},
+        {
+          f_field_name: "a",
+          f_key: "a",
+          f_field_type: 0,
+          f_is_required: true,
+          f_field_value: "1",
+        },
+        {
+          f_field_name: "b",
+          f_key: "b",
+          f_field_type: 3,
+          f_is_required: true,
+          f_field_value: 2,
+        },
+        {
+          f_field_name: "c",
+          f_key: "c",
+          f_field_type: 1,
+          f_is_required: true,
+          f_field_value: "11111",
+        },
+        {
+          f_field_name: "d",
+          f_key: "d",
+          f_field_type: 0,
+          f_is_required: true,
+          f_field_value: "3",
+        },
+        {
+          f_field_name: "e",
+          f_key: "e",
+          f_field_type: 0,
+          f_is_required: true,
+          f_field_value: "4",
+        },
+        {
+          f_field_name: "f",
+          f_key: "f",
+          f_field_type: 0,
+          f_is_required: true,
+          f_field_value: "5",
+        },
+        {
+          f_field_name: "g",
+          f_key: "g",
+          f_field_type: 0,
+          f_is_required: true,
+          f_field_value: "6",
+        },
       ];
-      let a = 1
+      let a = 1;
       this.setValue(items);
-
-    }
+    },
   },
-}
+};
 </script>
 
 <style lang="scss" scoped>
@@ -225,5 +279,4 @@ div.table-container {
     border-collapse: collapse;
   }
 }
-
 </style>

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

@@ -45,66 +45,66 @@ modules = {
       return this.getFormRef ? this.getFormRef() : this;
     },
     formHttp(opts) {
-      return new Promise((resolve, reject) => {
-        let data = opts.data;
-        let scriptCode = opts.scriptCode ? opts.scriptCode.trim() : null;
-        let formCode = opts.formCode ? opts.formCode.trim() : null;
-        let isLoading = opts.isLoading ?? true;
-        let success = opts.success;
-        let fail = opts.fail;
-        let error = opts.error;
+      let data = opts.data;
+      let scriptCode = opts.scriptCode ? opts.scriptCode.trim() : null;
+      let formCode = opts.formCode ? opts.formCode.trim() : null;
+      let isLoading = opts.isLoading ?? true;
+      let success = opts.success;
+      let fail = opts.fail;
+      let error = opts.error;
 
-        let that = this;
-        let reportTemplate = that.getFormRef ? that.getFormRef().reportTemplate : that.reportTemplate;
-        if (scriptCode && !formCode) {
-          let arr = scriptCode.split("/").filter(item => item)
-          if (arr.length > 1) {
-            formCode = arr[0];
-            scriptCode = arr[1];
-          }
-        }
-        if (!formCode) {
-          formCode = reportTemplate.formCode
+      let that = this;
+      let reportTemplate = that.getFormRef ? that.getFormRef().reportTemplate : that.reportTemplate;
+      if (scriptCode && !formCode) {
+        let arr = scriptCode.split("/").filter(item => item)
+        if (arr.length > 1) {
+          formCode = arr[0];
+          scriptCode = arr[1];
         }
+      }
+      if (!formCode) {
+        formCode = reportTemplate.formCode
+      }
 
-        delete opts.data
-        delete opts.scriptCode
-        delete opts.formCode
-        delete opts.isLoading
-        delete opts.success
-        delete opts.fail
-        delete opts.error
+      delete opts.data
+      delete opts.scriptCode
+      delete opts.formCode
+      delete opts.isLoading
+      delete opts.success
+      delete opts.fail
+      delete opts.error
 
 
-        let getServiceName = (callback) => {
+      let getServiceName = (callback) => {
 
-          if (formCode && formCode !== reportTemplate.formCode) {
-            this.getHttpTarget().$http({
-              // aes: true,
-              url: USER_PREFIX + `/formScript/getServiceName`,
-              method: `post`,
-              data: {
-                formCode,
-                scriptCode
-              },
-              isLoading,
-              // loadingTarget: this.getLoadingTarget(),
-              // modalStrictly: true,
-              success: res => {
-                let serviceName = res.objx;
-                if (serviceName) {
-                  callback(serviceName)
-                } else {
-                  this.$baseAlert("服务名不存在")
-                }
+        if (formCode && formCode !== reportTemplate.formCode) {
+          this.getHttpTarget().$http({
+            aes: true,
+            url: USER_PREFIX + `/formScript/getServiceName`,
+            method: `post`,
+            data: {
+              formCode,
+              scriptCode
+            },
+            isLoading,
+            // loadingTarget: this.getLoadingTarget(),
+            // modalStrictly: true,
+            success: res => {
+              let serviceName = res.objx;
+              if (serviceName) {
+                callback(serviceName)
+              } else {
+                this.$baseAlert("服务名不存在")
               }
-            });
-          } else {
-            callback(reportTemplate.serviceName)
-          }
-
+            }
+          });
+        } else {
+          callback(reportTemplate.serviceName)
         }
-        let toDo = () => {
+
+      }
+      let toDo = () => {
+        return new Promise((resolve, reject) => {
           getServiceName(searviceName => {
             let reqData;
             reqData = data;
@@ -112,7 +112,7 @@ modules = {
             let reportGlobalMap = getReportGlobalMap() || {};
             let url = `/${searviceName}/bd_api/${formCode}/${scriptCode}`;
             return this.getHttpTarget().$http({
-              // aes: true,
+              // aes: true
               url: url,
               method: `post`,
               // loadingTarget: this.getLoadingTarget(),
@@ -164,16 +164,15 @@ modules = {
               }
             });
           })
-        }
-        if (opts.isConfirm) {
-          this.$baseConfirm(opts.confirmText).then(() => {
-             toDo();
-          });
-        } else {
-           toDo();
-        }
-      });
-      
+        })
+      }
+      if (opts.isConfirm) {
+        this.$baseConfirm(opts.confirmText).then(() => {
+          return toDo();
+        });
+      } else {
+        return toDo();
+      }
     }
   }
 }