cloud-web-corejs 1.0.54-dev.1 → 1.0.54-dev.100

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/setting-panel/wfObjConfigDialog.vue

@@ -0,0 +1,189 @@
+<template>
+  <el-dialog
+    custom-class="dialog-style list-dialog"
+    title="流程单据定义"
+    :visible.sync="dialogVisible"
+    :show-close="!0"
+    :append-to-body="false"
+    :modal="false"
+    :close-on-click-modal="!1"
+    :close-on-press-escape="!1"
+    :destroy-on-close="!0"
+    width="1220px"
+    top="5vh"
+    v-dialog-drag
+    @close="closeDialog"
+  >
+    <div class="cont">
+      <el-form ref="editForm" :model="formData">
+        <el-table
+          ref="singleTable"
+          width="100%"
+          :data="formData.wfObjConfigDTOs"
+          height="500"
+          border=""
+          row-key="columnId"
+          stripe=""
+        >
+          <el-table-column type="index" width="35" fixed="left"></el-table-column>
+          <el-table-column :label="i18nt('表单类型名称')" width="150" prop="objTypeName">
+            <template slot-scope="scope">
+              <el-form-item :prop="'wfObjConfigDTOs.'+scope.$index+'.objTypeName'"
+                            :rules="[{ required: true, trigger: 'blur' }]">
+                <el-input v-model="scope.row.objTypeName"></el-input>
+              </el-form-item>
+            </template>
+          </el-table-column>
+          <el-table-column :label="i18nt('组织名称')" width="150" prop="companyCode">
+            <template slot-scope="scope">
+              {{ scope.row.companyName }}
+            </template>
+          </el-table-column>
+          <el-table-column :label="i18nt('表单类型编码')" width="200" prop="objTypeCode"></el-table-column>
+          <el-table-column :label="i18nt('服务名')" width="150" prop="serviceId"></el-table-column>
+          <el-table-column :label="i18nt('designer.setting.actionColumn')" width="100" align="center">
+            <template #header>
+              <span>{{ i18nt('designer.setting.actionColumn') }}</span>
+              <el-button :title="i18nt('designer.setting.addTableColumn')" size="mini" type="" circle=""
+                         icon="el-icon-plus" @click="openCompanyDialog"></el-button>
+            </template>
+            <template slot-scope="scope">
+              <el-button
+                :title="i18nt('designer.setting.deleteTableColumn')"
+                size="mini"
+                type=""
+                circle=""
+                icon="el-icon-minus"
+                @click="formData.wfObjConfigDTOs.splice(scope.$index,1)"
+              ></el-button>
+            </template>
+          </el-table-column>
+
+        </el-table>
+      </el-form>
+    </div>
+    <div class="dialog-footer" slot="footer">
+      <el-button @click="closeDialog" class="button-sty" icon="el-icon-close">
+        {{ i18nt('designer.hint.cancel') }}
+      </el-button>
+      <el-button type="primary" @click="saveData" class="button-sty" icon="el-icon-check">
+        {{ i18nt('designer.hint.confirm') }}
+      </el-button>
+    </div>
+    <companyInfoDialog v-if="showCompanyInfoDialog" :visiable.sync="showCompanyInfoDialog"
+                       @confirm="confirmCompanyDialog" multi="false"/>
+  </el-dialog>
+</template>
+<script>
+import i18n from '../../../../components/xform/utils/i18n';
+import companyInfoDialog from "@base/views/user/company_info/dialog.vue";
+
+export default {
+  components: {companyInfoDialog},
+  props: ['formTemplate'],
+  mixins: [i18n],
+  data() {
+    return {
+      dialogVisible: true,
+      formData: {
+        objTypeCode: null,
+        wfObjConfigDTOs: []
+      },
+      operateIndex: 0,
+      showCompanyInfoDialog: false
+    }
+  },
+  created() {
+
+  },
+  mounted() {
+    this.formData.objTypeCode = this.formTemplate.objTypeCode;
+    this.getListByObjTypeCode();
+  },
+  methods: {
+    getListByObjTypeCode(callback) {
+      let formTemplate = this.formTemplate
+      this.$http({
+        url: `/${formTemplate.serviceName}/wf_obj_config/listByObjTypeCode`,
+        method: `post`,
+        data: {
+          stringOne: formTemplate.objTypeCode
+        },
+        isLoading: true,
+        success: res => {
+          let rows = res.objx || [];
+          this.formData.wfObjConfigDTOs = rows;
+          callback && callback(rows)
+        }
+      });
+    },
+    saveData() {
+      this.$refs.editForm.$baseValidate(valid => {
+        if (valid) {
+          this.$baseConfirm(this.$t1('您确定要保存吗？')).then(() => {
+            var url = `/${this.formTemplate.serviceName}/wf_obj_config/saveUpdates`;
+            this.$http({
+              url: url,
+              method: `post`,
+              data: this.formData,
+              isLoading: true,
+              success: res => {
+                this.$message({
+                  message: res.content,
+                  type: 'success',
+                  duration: 1000
+                });
+                this.getListByObjTypeCode(rows => {
+                  this.$emit('confirm', rows)
+                  this.closeDialog();
+                })
+              }
+            });
+          });
+        }
+      });
+    },
+    addItem() {
+      let formTemplate = this.formTemplate;
+      let row = {
+        objTypeCode: formTemplate.objTypeCode,
+        objTypeName: formTemplate.objTypeName,
+        serviceId: formTemplate.serviceName,
+        url: "form",
+        companyCode: null,
+        companyName: null
+      }
+      this.formData.wfObjConfigDTOs.push(row);
+    },
+    closeDialog() {
+      this.dialogVisible = false;
+      this.$emit("update:visiable", false);
+    },
+    openCompanyDialog() {
+      this.showCompanyInfoDialog = true;
+    },
+    confirmCompanyDialog(rows) {
+      if (rows.length) {
+        let row = rows[0];
+        let formTemplate = this.formTemplate;
+        if (!this.formData.wfObjConfigDTOs.find(item => item.companyCode == row.companyCode)) {
+          let newrow = {
+            objTypeCode: formTemplate.objTypeCode,
+            objTypeName: formTemplate.formName,
+            serviceId: formTemplate.serviceName,
+            url: "form",
+            companyCode: row.companyCode,
+            companyName: row.companyName
+          }
+          this.formData.wfObjConfigDTOs.push(newrow);
+        }
+      }
+    }
+  }
+}
+</script>
+
+
+<style scoped>
+
+</style>

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

@@ -757,7 +757,8 @@ export const defaultSearchDialogConfig = {
   tableRef: null,
   tableUniqueKey: null,
   tableData: [],
-  multipleChoices: true
+  multipleChoices: true,
+  confirmCallback:null
 }
 
 export const basicFields = [
@@ -1457,6 +1458,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 +2000,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 +2024,11 @@ export const advancedFields = [
           ],
         }]
       },
+      echartConfig: '',
       formScriptEnabled: true,
       formScriptCode: "",
       formScriptParam: null,
+      onClick: "",
       onCreated: "",
       onMounted: "this.loadDataDefaultHandle()",
 
@@ -2044,6 +2049,7 @@ export const advancedFields = [
       echarBarOption: {
         backgroundColor: "#fff",
         color: ["#5BC1D7", "#FF8A3D", "#56C271", "#694ED6", "#C033A1", "#FFCC10"],
+        colors: [],
         title: {
           show: true,
           top: '5px',
@@ -2190,9 +2196,11 @@ export const advancedFields = [
 
         }]
       },
+      echartConfig: '',
       formScriptEnabled: true,
       formScriptCode: "",
       formScriptParam: null,
+      onClick: "",
       onCreated: "",
       onMounted: "this.loadDataDefaultHandle()",
 
@@ -2214,6 +2222,7 @@ export const advancedFields = [
       echarCategoryOption: {
         backgroundColor: "#fff",
         color: ["#5BC1D7", "#FF8A3D", "#56C271", "#694ED6", "#C033A1", "#FFCC10"],
+        colors: [],
         title: {
           show: true,
           top: '5px',
@@ -2324,6 +2333,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 +2384,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 +2410,11 @@ export const advancedFields = [
         }]
 
       },
+      echartConfig: '',
       formScriptEnabled: true,
       formScriptCode: "",
       formScriptParam: null,
+      onClick: "",
       onCreated: "",
       onMounted: "this.loadDataDefaultHandle()",
 
@@ -2507,6 +2552,7 @@ export const advancedFields = [
       entityTableDesc: null,
       onCreated: "this.loadDataDefaultHandle();",
       onMounted: "",
+      onAfterConfirmFile: "",
       vabUpload: 1,
       formScriptEnabled: true,
       formScriptCode: "getList",
@@ -2720,6 +2766,8 @@ export const advancedFields = [
       exportFileName: '导出',
       tableRef: '',
       tableExportParam: "",
+      showImageAtTable: false,
+
       onCreated: "",
       onMounted: "",
       wfFlag: 1,
@@ -2824,6 +2872,7 @@ export const advancedFields = [
       label: "导入",
       columnWidth: "200px",
       size: "",
+      importFileLimitSize: 200,
       // displayStyle: "block",
       disabled: !1,
       hidden: !1,
@@ -2916,6 +2965,7 @@ export const advancedFields = [
       entityTableDesc: null,
       onCreated: "",
       onMounted: "",
+      onAfterConfirmFile: "",
       wfFlag: 1,
       wfEdit: false,
       enabledByWf: false,
@@ -3006,14 +3056,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,

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"