cloud-web-corejs 1.0.97 → 1.0.98

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "cloud-web-corejs",
   "private": false,
-  "version": "1.0.97",
+  "version": "1.0.98",
   "scripts": {
     "dev": "vue-cli-service serve",
     "lint": "eslint --ext .js,.vue src",

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

@@ -211,6 +211,14 @@ export const containers = [
         pageSize: 20,
         total: 366
       },
+      gridPageSize: 100,
+      gridPageSizeList: [
+        {value: 50},
+        {value: 100},
+        {value: 200},
+        {value: 500}
+      ],
+
       dsEnabled: !1,
       dsName: "",
       tableData: [
@@ -262,11 +270,10 @@ export const containers = [
       scriptEnabled: false,
       accessParam: null,
 
-      formScriptEnabled: true,
-      formScriptCode: null,
-      formScriptParam: null,
-      formScriptSuccess: null,
-      formScriptCallback: null,
+      accessFormCode: null,
+
+      ...httpConfig,
+
       /*isLoadDataByAccess: false,
       scriptEnabled: false,
       scriptName: null,
@@ -866,10 +873,10 @@ const projectTagConfig = {
   onMounted: "",
   onClick: "",
   // vabUpload: 1,
-  formScriptEnabled: true,
+
+  ...httpConfig,
   formScriptCode: "getList",
-  formScriptParam: null,
-  formScriptSuccess: null,
+
   ...defaultWfConfig,
 
   showRuleFlag: 1,
@@ -889,8 +896,17 @@ const projectTagConfig = {
 
 }
 
-export const hiddenWidgetTypesOfWf = ["button"];
-export const freeWidgetTypesOfWf = ["reset_button","a-link","a-text"];
+const httpConfig = {
+  httpFormCode: null,
+  formScriptEnabled: true,
+  formScriptCode: null,
+  formScriptParam: null,
+  formScriptSuccess: null,
+  formScriptCallback: null,
+}
+
+export const hiddenWidgetTypesOfWf = ["button", "search_button", "table-export-button", "add_button", "import-button", "import2-button", "print-button"];
+export const freeWidgetTypesOfWf = ["reset_button", "a-link", "a-text"];
 
 export const basicFields = [
   {
@@ -1182,10 +1198,10 @@ export const basicFields = [
       onValidate: "",
       accessType: "1",
 
+      ...httpConfig,
       formScriptEnabled: false,
       formScriptCode: "getList",
-      formScriptParam: null,
-      formScriptSuccess: null,
+
       ...defaultWfConfig,
 
       commonAttributeEnabled: false,
@@ -1252,10 +1268,10 @@ export const basicFields = [
       onValidate: "",
       accessType: "1",
 
+      ...httpConfig,
       formScriptEnabled: false,
       formScriptCode: "getList",
-      formScriptParam: null,
-      formScriptSuccess: null,
+
       ...defaultWfConfig,
 
       commonAttributeEnabled: false,
@@ -1333,16 +1349,17 @@ export const basicFields = [
       onValidate: "",
       widgetWidth: "",
       accessType: "1",
+
+      ...httpConfig,
       formScriptEnabled: false,
       formScriptCode: "getList",
-      formScriptParam: null,
-      formScriptSuccess: null,
+
       ...defaultWfConfig,
 
       commonAttributeEnabled: false,
       commonAttributeCode: "",
 
-      showCollapseTags:false,
+      showCollapseTags: false,
 
       showRuleFlag: 1,
       showRuleEnabled: 1,
@@ -1762,7 +1779,7 @@ export const basicFields = [
     options: {
       name: "",
       label: "",
-      wfHideFlag:1,
+      wfHideFlag: 1,
       columnWidth: "200px",
       size: "",
       displayStyle: "block",
@@ -1973,7 +1990,7 @@ export const basicFields = [
       prefixIcon: "",
       suffixIcon: "",
       customClass: "",
-      wfHideFlag:1,
+      wfHideFlag: 1,
       aLinkFlag: 1,
       underline: false,
       href: "",
@@ -2112,10 +2129,9 @@ export const advancedFields = [
         }]
       },
       echartConfig: '',
-      formScriptEnabled: true,
-      formScriptCode: "",
-      formScriptParam: null,
-      formScriptSuccess: null,
+
+      ...httpConfig,
+
       onClick: "",
       onCreated: "",
       onMounted: "this.loadDataDefaultHandle()",
@@ -2286,10 +2302,9 @@ export const advancedFields = [
         }]
       },
       echartConfig: '',
-      formScriptEnabled: true,
-      formScriptCode: "",
-      formScriptParam: null,
-      formScriptSuccess: null,
+
+      ...httpConfig,
+
       onClick: "",
       onCreated: "",
       onMounted: "this.loadDataDefaultHandle()",
@@ -2501,10 +2516,9 @@ export const advancedFields = [
 
       },
       echartConfig: '',
-      formScriptEnabled: true,
-      formScriptCode: "",
-      formScriptParam: null,
-      formScriptSuccess: null,
+
+      ...httpConfig,
+
       onClick: "",
       onCreated: "",
       onMounted: "this.loadDataDefaultHandle()",
@@ -2645,10 +2659,10 @@ export const advancedFields = [
       onMounted: "",
       onAfterConfirmFile: "",
       vabUpload: 1,
-      formScriptEnabled: true,
+
+      ...httpConfig,
       formScriptCode: "getList",
-      formScriptParam: null,
-      formScriptSuccess: null,
+
       ...defaultWfConfig,
 
       showRuleFlag: 1,
@@ -3106,10 +3120,9 @@ export const advancedFields = [
           detailItems: []
         }
       ],
-      formScriptEnabled: true,
-      formScriptCode: "",
-      formScriptParam: null,
-      formScriptSuccess: null,
+
+      ...httpConfig,
+
       onCreated: "",
       onMounted: "",
       ...defaultWfConfig,
@@ -3146,10 +3159,9 @@ export const advancedFields = [
       styleTableClass: '',
       // fullWidth: false,
       submitFlag: true,
-      formScriptEnabled: true,
-      formScriptCode: "",
-      formScriptParam: null,
-      formScriptSuccess: null,
+
+      ...httpConfig,
+
       onCreated: "this.loadDataDefaultHandle()",
       onMounted: "",
       ...defaultWfConfig,

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

@@ -206,6 +206,7 @@
     </template>-->
     <template #widget="obj">
       <component
+        v-if="!!fieldSchemaMap[obj.row._X_ROW_KEY]"
         :is="getColumnWidgetName(obj.column.params.widget)"
         :field="fieldSchemaMap[obj.row._X_ROW_KEY][obj.column.params.widget.id]"
         :form-model="globalModel.formModel"
@@ -225,28 +226,32 @@
     </template>
     <template #widgetList="obj">
       <div>
-        <component
-          v-for="(fieldWidget,index) in obj.column.params.widgetList"
-          :is="getColumnWidgetName(fieldWidget)"
-          v-bind="getRowWidgetOption(obj,fieldWidget)"
-          :form-model="globalModel.formModel"
-          :designer="null"
-          :key="getRowWidgetKey(obj,fieldWidget)"
-          :parent-widget="widget"
-          :columnConfig="obj.column.params.columnConfig"
-          :subFormRowIndex="obj.rowIndex"
-          :subFormRowId="obj.row._X_ROW_KEY"
-          formItemProp="false"
-          :tableParam="obj"
-        >
-          <template v-for="slot in Object.keys($scopedSlots)" v-slot:[slot]="scope">
-            <slot :name="slot" v-bind="scope" :tableParam="obj"/>
-          </template>
-        </component>
+        <template v-for="(fieldWidget,index) in obj.column.params.widgetList">
+          <component
+            v-if="!!fieldSchemaMap[obj.row._X_ROW_KEY]"
+            :is="getColumnWidgetName(fieldWidget)"
+            v-bind="getRowWidgetOption(obj,fieldWidget)"
+            :form-model="globalModel.formModel"
+            :designer="null"
+            :key="getRowWidgetKey(obj,fieldWidget)"
+            :parent-widget="widget"
+            :columnConfig="obj.column.params.columnConfig"
+            :subFormRowIndex="obj.rowIndex"
+            :subFormRowId="obj.row._X_ROW_KEY"
+            formItemProp="false"
+            :tableParam="obj"
+          >
+            <template v-for="slot in Object.keys($scopedSlots)" v-slot:[slot]="scope">
+              <slot :name="slot" v-bind="scope" :tableParam="obj"/>
+            </template>
+          </component>
+        </template>
+
       </div>
     </template>
     <template #editWidget="obj">
       <component
+        v-if="!!fieldSchemaMap[obj.row._X_ROW_KEY]"
         :is="getColumnWidgetName(obj.column.params.editWidget)"
         :field="fieldSchemaMap[obj.row._X_ROW_KEY][obj.column.params.editWidget.id]"
         :form-model="globalModel.formModel"