cloud-web-corejs 1.0.54-dev.11 → 1.0.54-dev.110

package/src/components/xform/form-designer/widget-panel/widgetsConfig.js

@@ -13,7 +13,8 @@ export const containers = [
       // colHeight: null,
       width: '',
       containerClass: '',
-      customClass: ""
+      customClass: "",
+      ...defaultWfConfig,
     }
   },
   {
@@ -27,7 +28,8 @@ export const containers = [
       hidden: !1,
       customClass: "",
       styleTableClass: '',
-      fullWidth: false
+      fullWidth: false,
+      ...defaultWfConfig,
     }
   },
   {
@@ -42,7 +44,8 @@ export const containers = [
       height: '',
       // isFullscreen: false,
       tabClass: 'tab-boxCard tabCard-sty1',
-      customClass: ""
+      customClass: "",
+      ...defaultWfConfig,
     }
   },
   /* {
@@ -277,6 +280,7 @@ export const containers = [
       sortScriptCode: null,
       importTemplateFile: null,
 
+      ...defaultWfConfig,
       showRuleFlag: 1,
       showRuleEnabled: 1,
       showRules: [],
@@ -748,7 +752,6 @@ export const containers = [
   }
 ]
 
-
 export const defaultSearchDialogConfig = {
   formCode: null,
   tableEnabled: false,
@@ -757,7 +760,18 @@ export const defaultSearchDialogConfig = {
   tableRef: null,
   tableUniqueKey: null,
   tableData: [],
-  multipleChoices: true
+  multipleChoices: true,
+  confirmCallback: null
+}
+
+export const defaultWfConfig = {
+  wfFlag: 1,
+  wfEdit: false,
+  enabledByWf: false,
+  hiddenByWf: false,
+  wfConfigData: [],
+  wfModifyDataEnabled: false,
+  wfModifyDataConfig: [],
 }
 
 export const basicFields = [
@@ -813,11 +827,7 @@ export const basicFields = [
       onAppendButtonClick: "",
       widgetWidth: "",
       accessType: "1",
-      wfFlag: 1,
-      wfEdit: false,
-      enabledByWf: false,
-      hiddenByWf: false,
-      wfConfigData: [],
+      ...defaultWfConfig,
 
       showRuleFlag: 1,
       showRuleEnabled: 1,
@@ -881,11 +891,7 @@ export const basicFields = [
       onAppendButtonClick: "",
       widgetWidth: "",
       accessType: "1",
-      wfFlag: 1,
-      wfEdit: false,
-      enabledByWf: false,
-      hiddenByWf: false,
-      wfConfigData: [],
+      ...defaultWfConfig,
 
       showRuleFlag: 1,
       showRuleEnabled: 1,
@@ -941,11 +947,7 @@ export const basicFields = [
       onBlur: "",
       onValidate: "",
       accessType: "1",
-      wfFlag: 1,
-      wfEdit: false,
-      enabledByWf: false,
-      hiddenByWf: false,
-      wfConfigData: [],
+      ...defaultWfConfig,
 
       showRuleFlag: 1,
       showRuleEnabled: 1,
@@ -1002,11 +1004,7 @@ export const basicFields = [
       onBlur: "",
       onValidate: "",
       accessType: "1",
-      wfFlag: 1,
-      wfEdit: false,
-      enabledByWf: false,
-      hiddenByWf: false,
-      wfConfigData: [],
+      ...defaultWfConfig,
 
       showRuleFlag: 1,
       showRuleEnabled: 1,
@@ -1076,11 +1074,7 @@ export const basicFields = [
       formScriptEnabled: false,
       formScriptCode: "getList",
       formScriptParam: null,
-      wfFlag: 1,
-      wfEdit: false,
-      enabledByWf: false,
-      hiddenByWf: false,
-      wfConfigData: [],
+      ...defaultWfConfig,
 
       showRuleFlag: 1,
       showRuleEnabled: 1,
@@ -1149,11 +1143,7 @@ export const basicFields = [
       formScriptEnabled: false,
       formScriptCode: "getList",
       formScriptParam: null,
-      wfFlag: 1,
-      wfEdit: false,
-      enabledByWf: false,
-      hiddenByWf: false,
-      wfConfigData: [],
+      ...defaultWfConfig,
 
       showRuleFlag: 1,
       showRuleEnabled: 1,
@@ -1233,11 +1223,7 @@ export const basicFields = [
       formScriptEnabled: false,
       formScriptCode: "getList",
       formScriptParam: null,
-      wfFlag: 1,
-      wfEdit: false,
-      enabledByWf: false,
-      hiddenByWf: false,
-      wfConfigData: [],
+      ...defaultWfConfig,
 
       showRuleFlag: 1,
       showRuleEnabled: 1,
@@ -1291,11 +1277,7 @@ export const basicFields = [
       onBlur: "",
       onValidate: "",
       accessType: "1",
-      wfFlag: 1,
-      wfEdit: false,
-      enabledByWf: false,
-      hiddenByWf: false,
-      wfConfigData: [],
+      ...defaultWfConfig,
 
       showRuleFlag: 1,
       showRuleEnabled: 1,
@@ -1350,11 +1332,7 @@ export const basicFields = [
       onBlur: "",
       onValidate: "",
       accessType: "1",
-      wfFlag: 1,
-      wfEdit: false,
-      enabledByWf: false,
-      hiddenByWf: false,
-      wfConfigData: [],
+      ...defaultWfConfig,
 
       showRuleFlag: 1,
       showRuleEnabled: 1,
@@ -1411,11 +1389,7 @@ export const basicFields = [
       onBlur: "",
       onValidate: "",
       accessType: "1",
-      wfFlag: 1,
-      wfEdit: false,
-      enabledByWf: false,
-      hiddenByWf: false,
-      wfConfigData: [],
+      ...defaultWfConfig,
 
       showRuleFlag: 1,
       showRuleEnabled: 1,
@@ -1457,6 +1431,7 @@ export const basicFields = [
       editable: !1,
       format: "yyyy-MM-dd",
       valueFormat: "yyyy-MM-dd",
+      defaultTime: ['00:00:00', '23:59:59'],
       required: !1,
       requiredHint: "",
       validation: "",
@@ -1472,11 +1447,7 @@ export const basicFields = [
       onBlur: "",
       onValidate: "",
       accessType: "1",
-      wfFlag: 1,
-      wfEdit: false,
-      enabledByWf: false,
-      hiddenByWf: false,
-      wfConfigData: [],
+      ...defaultWfConfig,
 
       showRuleFlag: 1,
       showRuleEnabled: 1,
@@ -1628,6 +1599,7 @@ export const basicFields = [
       onCreated: "",
       onMounted: "",
       accessType: "1",
+      ...defaultWfConfig,
 
       showRuleFlag: 1,
       showRuleEnabled: 1,
@@ -1654,6 +1626,7 @@ export const basicFields = [
       onCreated: "",
       onMounted: "",
       accessType: "1",
+      ...defaultWfConfig,
 
       showRuleFlag: 1,
       showRuleEnabled: 1,
@@ -1714,11 +1687,7 @@ export const basicFields = [
         tableRef: null,
         tableData: {}
       },
-      wfFlag: 1,
-      wfEdit: false,
-      enabledByWf: false,
-      hiddenByWf: false,
-      wfConfigData: [],
+      ...defaultWfConfig,
 
       showRuleFlag: 1,
       showRuleEnabled: 1,
@@ -1743,6 +1712,7 @@ export const basicFields = [
       contentPosition: "center",
       hidden: !1,
       customClass: "",
+      ...defaultWfConfig,
       onCreated: "",
       onMounted: ""
     }
@@ -1824,6 +1794,7 @@ export const basicFields = [
       onMounted: "",
       accessType: "1",
       labelColor: '#555555',
+      ...defaultWfConfig,
 
       showRuleFlag: 1,
       showRuleEnabled: 1,
@@ -1872,11 +1843,7 @@ export const basicFields = [
       onChange: "",
       onClick: "",
       accessType: "1",
-      wfFlag: 1,
-      wfEdit: false,
-      enabledByWf: false,
-      hiddenByWf: false,
-      wfConfigData: [],
+      ...defaultWfConfig,
 
       showRuleFlag: 1,
       showRuleEnabled: 1,
@@ -1920,11 +1887,7 @@ export const basicFields = [
         tableRef: null,
         tableData: {}
       },
-      wfFlag: 1,
-      wfEdit: false,
-      enabledByWf: false,
-      hiddenByWf: false,
-      wfConfigData: [],
+      ...defaultWfConfig,
 
       showRuleFlag: 1,
       showRuleEnabled: 1,
@@ -1998,10 +1961,11 @@ export const advancedFields = [
             color: "",
             fontWeight: "normal"
           },
-          data: [{
-            value: 1048,
-            name: 'Search Engine'
-          },
+          data: [
+            {
+              value: 1048,
+              name: 'Search Engine'
+            },
             {
               value: 735,
               name: 'Direct'
@@ -2021,12 +1985,15 @@ export const advancedFields = [
           ],
         }]
       },
+      echartConfig: '',
       formScriptEnabled: true,
       formScriptCode: "",
       formScriptParam: null,
+      onClick: "",
       onCreated: "",
       onMounted: "this.loadDataDefaultHandle()",
 
+      ...defaultWfConfig,
       showRuleFlag: 1,
       showRuleEnabled: 1,
       showRules: []
@@ -2044,6 +2011,7 @@ export const advancedFields = [
       echarBarOption: {
         backgroundColor: "#fff",
         color: ["#5BC1D7", "#FF8A3D", "#56C271", "#694ED6", "#C033A1", "#FFCC10"],
+        colors: [],
         title: {
           show: true,
           top: '5px',
@@ -2190,12 +2158,14 @@ export const advancedFields = [
 
         }]
       },
+      echartConfig: '',
       formScriptEnabled: true,
       formScriptCode: "",
       formScriptParam: null,
+      onClick: "",
       onCreated: "",
       onMounted: "this.loadDataDefaultHandle()",
-
+      ...defaultWfConfig,
       showRuleFlag: 1,
       showRuleEnabled: 1,
       showRules: []
@@ -2214,6 +2184,7 @@ export const advancedFields = [
       echarCategoryOption: {
         backgroundColor: "#fff",
         color: ["#5BC1D7", "#FF8A3D", "#56C271", "#694ED6", "#C033A1", "#FFCC10"],
+        colors: [],
         title: {
           show: true,
           top: '5px',
@@ -2324,6 +2295,23 @@ export const advancedFields = [
             shadowBlur: 4,
             shadowOffsetY: 6
           },
+          itemStyle: {
+            color: {
+              type: 'linear',
+              x: 0.5,
+              y: 0.5,
+              r: 0.5,
+              colorStops: [{
+                offset: 0, color: '#08C084' // 0% 处的颜色
+              }, {
+                offset: 1, color: '#97EACE' // 100% 处的颜色
+              }],
+            },
+            cap: 'round',
+            shadowColor: '#08C08450',
+            shadowBlur: 4,
+            shadowOffsetY: 6
+          },
           emphasis: {
             scale: 1,
             focus: 'series'
@@ -2358,6 +2346,23 @@ export const advancedFields = [
             shadowBlur: 4,
             shadowOffsetY: 6
           },
+          itemStyle: {
+            color: {
+              type: 'linear',
+              x: 0.5,
+              y: 0.5,
+              r: 0.5,
+              colorStops: [{
+                offset: 0, color: '#FF6116' // 0% 处的颜色
+              }, {
+                offset: 1, color: '#F9A980' // 100% 处的颜色
+              }],
+            },
+            cap: 'round',
+            shadowColor: '#FF611650',
+            shadowBlur: 4,
+            shadowOffsetY: 6
+          },
           emphasis: {
             scale: 1,
             focus: 'series'
@@ -2367,12 +2372,14 @@ export const advancedFields = [
         }]
 
       },
+      echartConfig: '',
       formScriptEnabled: true,
       formScriptCode: "",
       formScriptParam: null,
+      onClick: "",
       onCreated: "",
       onMounted: "this.loadDataDefaultHandle()",
-
+      ...defaultWfConfig,
       showRuleFlag: 1,
       showRuleEnabled: 1,
       showRules: []
@@ -2507,15 +2514,12 @@ export const advancedFields = [
       entityTableDesc: null,
       onCreated: "this.loadDataDefaultHandle();",
       onMounted: "",
+      onAfterConfirmFile: "",
       vabUpload: 1,
       formScriptEnabled: true,
       formScriptCode: "getList",
       formScriptParam: null,
-      wfFlag: 1,
-      wfEdit: false,
-      enabledByWf: false,
-      hiddenByWf: false,
-      wfConfigData: [],
+      ...defaultWfConfig,
 
       showRuleFlag: 1,
       showRuleEnabled: 1,
@@ -2564,11 +2568,7 @@ export const advancedFields = [
         ...defaultSearchDialogConfig,
         multipleChoices: false
       },
-      wfFlag: 1,
-      wfEdit: false,
-      enabledByWf: false,
-      hiddenByWf: false,
-      wfConfigData: [],
+      ...defaultWfConfig,
       valueField: null,
       multipleChoices: false,
 
@@ -2613,11 +2613,7 @@ export const advancedFields = [
         ...defaultSearchDialogConfig,
         tableEnabled: true
       },
-      wfFlag: 1,
-      wfEdit: false,
-      enabledByWf: false,
-      hiddenByWf: false,
-      wfConfigData: [],
+      ...defaultWfConfig,
 
       showRuleFlag: 1,
       showRuleEnabled: 1,
@@ -2654,11 +2650,7 @@ export const advancedFields = [
       searchDialogConfig: {
         ...defaultSearchDialogConfig
       },
-      wfFlag: 1,
-      wfEdit: false,
-      enabledByWf: false,
-      hiddenByWf: true,
-      wfConfigData: [],
+      ...defaultWfConfig,
 
       showRuleFlag: 1,
       showRuleEnabled: 1,
@@ -2694,11 +2686,7 @@ export const advancedFields = [
       searchDialogConfig: {
         ...defaultSearchDialogConfig
       },
-      wfFlag: 1,
-      wfEdit: false,
-      enabledByWf: true,
-      hiddenByWf: false,
-      wfConfigData: [],
+      ...defaultWfConfig,
 
       showRuleFlag: 1,
       showRuleEnabled: 1,
@@ -2720,13 +2708,11 @@ export const advancedFields = [
       exportFileName: '导出',
       tableRef: '',
       tableExportParam: "",
+      showImageAtTable: false,
+
       onCreated: "",
       onMounted: "",
-      wfFlag: 1,
-      wfEdit: false,
-      enabledByWf: false,
-      hiddenByWf: false,
-      wfConfigData: [],
+      ...defaultWfConfig,
 
       showRuleFlag: 1,
       showRuleEnabled: 1,
@@ -2761,11 +2747,7 @@ export const advancedFields = [
       searchDialogConfig: {
         ...defaultSearchDialogConfig
       },
-      wfFlag: 1,
-      wfEdit: false,
-      enabledByWf: false,
-      hiddenByWf: false,
-      wfConfigData: [],
+      ...defaultWfConfig,
 
       showRuleFlag: 1,
       showRuleEnabled: 1,
@@ -2802,11 +2784,7 @@ export const advancedFields = [
       searchDialogConfig: {
         ...defaultSearchDialogConfig
       },
-      wfFlag: 1,
-      wfEdit: false,
-      enabledByWf: false,
-      hiddenByWf: true,
-      wfConfigData: [],
+      ...defaultWfConfig,
 
       showRuleFlag: 1,
       showRuleEnabled: 1,
@@ -2824,6 +2802,7 @@ export const advancedFields = [
       label: "导入",
       columnWidth: "200px",
       size: "",
+      importFileLimitSize: 200,
       // displayStyle: "block",
       disabled: !1,
       hidden: !1,
@@ -2839,11 +2818,7 @@ export const advancedFields = [
       searchDialogConfig: {
         ...defaultSearchDialogConfig
       },
-      wfFlag: 1,
-      wfEdit: false,
-      enabledByWf: false,
-      hiddenByWf: false,
-      wfConfigData: [],
+      ...defaultWfConfig,
       importEntity: '',
       importAttachCode: '',
       importScriptCode: '',
@@ -2880,11 +2855,7 @@ export const advancedFields = [
       searchDialogConfig: {
         ...defaultSearchDialogConfig
       },
-      wfFlag: 1,
-      wfEdit: false,
-      enabledByWf: false,
-      hiddenByWf: false,
-      wfConfigData: [],
+      ...defaultWfConfig,
       printTableRef: "",
       printItems: [],
 
@@ -2916,11 +2887,8 @@ export const advancedFields = [
       entityTableDesc: null,
       onCreated: "",
       onMounted: "",
-      wfFlag: 1,
-      wfEdit: false,
-      enabledByWf: false,
-      hiddenByWf: false,
-      wfConfigData: [],
+      onAfterConfirmFile: "",
+      ...defaultWfConfig,
 
       showRuleFlag: 1,
       showRuleEnabled: 1,
@@ -2949,6 +2917,7 @@ export const advancedFields = [
       statusParam: [],
       onCreated: "",
       onMounted: "",
+      ...defaultWfConfig,
 
       showRuleFlag: 1,
       showRuleEnabled: 1,
@@ -2997,7 +2966,7 @@ export const advancedFields = [
       formScriptParam: null,
       onCreated: "",
       onMounted: "",
-
+      ...defaultWfConfig,
       showRuleFlag: 1,
       showRuleEnabled: 1,
       showRules: []
@@ -3006,14 +2975,14 @@ export const advancedFields = [
   {
     type: "project-tag",
     icon: "uploadbox",
-    // commonFlag: !0,
+    commonFlag: !0,
     formItemFlag: !0,
     tableField: null,
     options: {
       name: "",
       keyNameEnabled: !1,
       keyName: "",
-      keyNameSuffix: "",
+      // keyNameSuffix: "",
       label: "",
       submitFlag: true,
       disabled: !1,
@@ -3028,11 +2997,7 @@ export const advancedFields = [
       formScriptEnabled: true,
       formScriptCode: "getList",
       formScriptParam: null,
-      wfFlag: 1,
-      wfEdit: false,
-      enabledByWf: false,
-      hiddenByWf: false,
-      wfConfigData: [],
+      ...defaultWfConfig,
 
       showRuleFlag: 1,
       showRuleEnabled: 1,
@@ -3060,7 +3025,7 @@ export const advancedFields = [
       formScriptParam: null,
       onCreated: "this.loadDataDefaultHandle()",
       onMounted: "",
-
+      ...defaultWfConfig,
       showRuleFlag: 1,
       showRuleEnabled: 1,
       showRules: []

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

@@ -2,7 +2,8 @@
   <vxe-grid :ref="widget.id" v-bind="vxeOption" :auto-resize="true" v-show="!widget.options.hidden"
             @resizable-change="$vxeTableUtil.onColumnWitchChange" @custom="$vxeTableUtil.customHandle"
             @checkbox-change="handleCheckboxChange" @checkbox-all="handleCheckboxAll"
-            @cell-dblclick="handleCellDblclick" :class="dataTableConfig.class" :data="fieldModel">
+            @cell-dblclick="handleCellDblclick" :class="dataTableConfig.class" :data="fieldModel"
+            :span-method="mergeRowMethod">
     <template #form>
       <!--            <div v-if="widget.options.showSearchArea" class="clearfix screen-btns">
                     <div class="fl">
@@ -191,7 +192,7 @@
         :field="fieldWidget"
         :form-model="globalModel.formModel"
         :designer="null"
-        :key="fieldWidget.id"
+        :key="fieldWidget.id+'-'+obj.rowIndex"
         :parent-widget="widget"
         :columnConfig="obj.column.params.columnConfig"
         :subFormRowIndex="obj.rowIndex"
@@ -209,7 +210,7 @@
         :field="obj.column.params.widget"
         :form-model="globalModel.formModel"
         :designer="null"
-        :key="obj.column.params.widget.id"
+        :key="obj.column.params.widget.id+'-'+obj.rowIndex"
         :parent-widget="widget"
         :columnConfig="obj.column.params.columnConfig"
         :subFormRowIndex="obj.rowIndex"
@@ -227,7 +228,7 @@
         :field="obj.column.params.editWidget"
         :form-model="globalModel.formModel"
         :designer="null"
-        :key="obj.column.params.editWidget.id"
+        :key="obj.column.params.editWidget.id+'-'+obj.rowIndex"
         :parent-widget="widget"
         :columnConfig="obj.column.params.columnConfig"
         :subFormRowIndex="obj.rowIndex"