cloud-web-corejs 1.0.54-dev.7 → 1.0.54-dev.70

package/src/components/xform/form-designer/setting-panel/property-editor/field-table-export-button/table-export-button-editor.vue

@@ -9,18 +9,27 @@
     <el-form-item label="表格唯一名称">
       <el-input v-model="optionModel.tableRef"></el-input>
     </el-form-item>
-  <el-form-item label="导出参数" label-width="150px">
-    <a href="javascript:void(0);" class="a-link link-oneLind" @click="editEventHandler('tableExportParam', eventParams)">
-      <span>{{ optionModel.tableExportParam }}</span>
-      <i class="el-icon-edit"></i>
-    </a>
-  </el-form-item>
+    <el-form-item label="导出列表显示图片">
+      <el-switch v-model="optionModel.showImageAtTable" @change="changeShowImageAtTable"></el-switch>
+    </el-form-item>
+    <el-form-item label="导出每页查询数量">
+      <base-input-number v-model="optionModel.exportPageSize"
+                         :max="optionModel.showImageAtTable?150:1000"></base-input-number>
+    </el-form-item>
+    <el-form-item label="导出参数" label-width="150px">
+      <a href="javascript:void(0);" class="a-link link-oneLind"
+         @click="editEventHandler('tableExportParam', eventParams)">
+        <span>{{ optionModel.tableExportParam }}</span>
+        <i class="el-icon-edit"></i>
+      </a>
+    </el-form-item>
   </div>
 </template>
 
 <script>
 import i18n from "../../../../../../components/xform/utils/i18n";
-import eventMixin from "../../../../../../components/xform/form-designer/setting-panel/property-editor/event-handler/eventMixin";
+import eventMixin
+  from "../../../../../../components/xform/form-designer/setting-panel/property-editor/event-handler/eventMixin";
 
 export default {
   name: "table-export-button-editor",
@@ -35,6 +44,16 @@ export default {
       eventParams: [],
     };
   },
+  methods: {
+    changeShowImageAtTable(val) {
+      if (val) {
+        let exportPageSize = this.optionModel.exportPageSize || 0;
+        if (exportPageSize > 150) {
+          this.optionModel.exportPageSize = 150
+        }
+      }
+    }
+  }
 };
 </script>
 

package/src/components/xform/form-designer/setting-panel/property-editor/placeholder-editor.vue

@@ -1,6 +1,6 @@
 <template>
   <el-form-item :label="i18nt('designer.setting.placeholder')">
-    <el-input type="text" v-model="optionModel.placeholder"></el-input>
+    <el-input type="textarea" :rows="3" v-model="optionModel.placeholder"></el-input>
   </el-form-item>
 </template>
 

package/src/components/xform/form-designer/setting-panel/property-editor/showRuleFlag-editor.vue

@@ -1,5 +1,5 @@
 <template>
-  <div>
+  <div v-show="false">
     <el-form-item label-width="0">
       <el-divider class="custom-divider-margin-top">显隐规则设置</el-divider>
     </el-form-item>

package/src/components/xform/form-designer/setting-panel/propertyRegister.js

@@ -42,6 +42,7 @@ const COMMON_PROPERTIES = {
   'htmlContent': 'htmlContent-editor',
   'format': 'format-editor',
   'valueFormat': 'valueFormat-editor',
+  'defaultTime': 'defaultTime-editor',
   'filterable': 'filterable-editor',
   'allowCreate': 'allowCreate-editor',
   'remote': 'remote-editor',
@@ -212,6 +213,7 @@ const EVENT_PROPERTIES = {
   'onAppendButtonClick': 'onAppendButtonClick-editor',
   'onSearchConfirm': 'onSearchConfirm-editor',
   'onSearchClear': 'onSearchClear-editor',
+  'onAfterConfirmFile': 'onAfterConfirmFile-editor',
 
   //容器
   'onSubFormRowAdd': 'onSubFormRowAdd-editor',

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

@@ -1457,6 +1457,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: "",
@@ -1998,10 +1999,11 @@ export const advancedFields = [
             color: "",
             fontWeight: "normal"
           },
-          data: [{
-            value: 1048,
-            name: 'Search Engine'
-          },
+          data: [
+            {
+              value: 1048,
+              name: 'Search Engine'
+            },
             {
               value: 735,
               name: 'Direct'
@@ -2021,9 +2023,11 @@ export const advancedFields = [
           ],
         }]
       },
+      echartConfig: '',
       formScriptEnabled: true,
       formScriptCode: "",
       formScriptParam: null,
+      onClick: "",
       onCreated: "",
       onMounted: "this.loadDataDefaultHandle()",
 
@@ -2044,6 +2048,7 @@ export const advancedFields = [
       echarBarOption: {
         backgroundColor: "#fff",
         color: ["#5BC1D7", "#FF8A3D", "#56C271", "#694ED6", "#C033A1", "#FFCC10"],
+        colors: [],
         title: {
           show: true,
           top: '5px',
@@ -2190,9 +2195,11 @@ export const advancedFields = [
 
         }]
       },
+      echartConfig: '',
       formScriptEnabled: true,
       formScriptCode: "",
       formScriptParam: null,
+      onClick: "",
       onCreated: "",
       onMounted: "this.loadDataDefaultHandle()",
 
@@ -2214,6 +2221,7 @@ export const advancedFields = [
       echarCategoryOption: {
         backgroundColor: "#fff",
         color: ["#5BC1D7", "#FF8A3D", "#56C271", "#694ED6", "#C033A1", "#FFCC10"],
+        colors: [],
         title: {
           show: true,
           top: '5px',
@@ -2324,6 +2332,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 +2383,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,9 +2409,11 @@ export const advancedFields = [
         }]
 
       },
+      echartConfig: '',
       formScriptEnabled: true,
       formScriptCode: "",
       formScriptParam: null,
+      onClick: "",
       onCreated: "",
       onMounted: "this.loadDataDefaultHandle()",
 
@@ -2507,6 +2551,7 @@ export const advancedFields = [
       entityTableDesc: null,
       onCreated: "this.loadDataDefaultHandle();",
       onMounted: "",
+      onAfterConfirmFile: "",
       vabUpload: 1,
       formScriptEnabled: true,
       formScriptCode: "getList",
@@ -2720,6 +2765,8 @@ export const advancedFields = [
       exportFileName: '导出',
       tableRef: '',
       tableExportParam: "",
+      showImageAtTable: false,
+
       onCreated: "",
       onMounted: "",
       wfFlag: 1,
@@ -2916,6 +2963,7 @@ export const advancedFields = [
       entityTableDesc: null,
       onCreated: "",
       onMounted: "",
+      onAfterConfirmFile: "",
       wfFlag: 1,
       wfEdit: false,
       enabledByWf: false,