cloud-web-corejs 1.0.68 → 1.0.70

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

@@ -41,24 +41,66 @@
           stripe=""
         >
           <el-table-column type="index" width="35" fixed="left"></el-table-column>
-          <el-table-column :label="i18nt('流程模板')" width="250" prop="label">
-            <template slot-scope="scope">
-              <el-select v-model="scope.row.modelId" @change="changeModelId">
-                <el-option v-for="(wfDefItem,index) in wfDefItems" :key="index" :value="wfDefItem.modelId"
-                           :label="wfDefItem.modelName"></el-option>
+          <el-table-column :label="i18nt('服务')" width="150">
+            <template slot-scope="{row}">
+              <el-select v-model="row.serveType" @change="changeServeType(row)">
+                <el-option :value="1" label="正式"></el-option>
+                <el-option :value="2" label="UAT"></el-option>
+                <el-option :value="3" label="测试"></el-option>
+                <el-option :value="4" label="自定义"></el-option>
               </el-select>
-
             </template>
           </el-table-column>
-          <el-table-column :label="i18nt('流程节点')" width="550" prop="prop">
-            <template slot-scope="scope">
-              <el-checkbox-group v-model="scope.row.nodeIds" v-if="!!wfNodeMap[scope.row.modelId]">
-                <el-checkbox v-for="(node,index) in wfNodeMap[scope.row.modelId]" :key="index"
-                             :label="node.nodeId">{{ node.nodeName }}
-                </el-checkbox>
-              </el-checkbox-group>
+          <el-table-column :label="i18nt('自定义服务')" width="150">
+            <template slot-scope="{row}">
+              <el-input v-model="row.serveName" clearable :disabled="row.serveType!==4"></el-input>
+            </template>
+          </el-table-column>
+          <el-table-column :label="i18nt('组织')" width="250">
+            <template slot-scope="{row,$index}">
+              <el-input
+                class="search-input"
+                :value="getCompanyNames(row)"
+                clearable
+                @clear="
+                  row.companyInfos = [];
+                "
+                v-el-readonly
+              >
+                <i slot="suffix" class="el-input__icon el-icon-search"
+                   @click="openCompanyDialog(row, $index)"></i>
+              </el-input>
+            </template>
+          </el-table-column>
+          <el-table-column :label="i18nt('流程模板')" width="150">
+            <template slot-scope="{row}">
+              <el-input v-model="row.modelKey" clearable></el-input>
+            </template>
+          </el-table-column>
+          <el-table-column :label="i18nt('节点')" width="250">
+            <template slot-scope="{row}">
+              <el-input v-model="row.taskSteps" clearable></el-input>
             </template>
           </el-table-column>
+
+          <!--          <el-table-column :label="i18nt('流程模板')" width="250" prop="label">
+                      <template slot-scope="scope">
+                        <el-select v-model="scope.row.modelId" @change="changeModelId">
+                          <el-option v-for="(wfDefItem,index) in wfDefItems" :key="index" :value="wfDefItem.modelId"
+                                     :label="wfDefItem.modelName"></el-option>
+                        </el-select>
+
+                      </template>
+                    </el-table-column>
+                    <el-table-column :label="i18nt('流程节点')" width="550" prop="prop">
+                      <template slot-scope="scope">
+                        <el-checkbox-group v-model="scope.row.nodeIds" v-if="!!wfNodeMap[scope.row.modelId]">
+                          <el-checkbox v-for="(node,index) in wfNodeMap[scope.row.modelId]" :key="index"
+                                       :label="node.nodeId">{{ node.nodeName }}
+                          </el-checkbox>
+                        </el-checkbox-group>
+                      </template>
+                    </el-table-column>-->
           <el-table-column :label="i18nt('designer.setting.actionColumn')" width="100" align="center">
             <template #header>
               <span>{{ i18nt('designer.setting.actionColumn') }}</span>
@@ -88,14 +130,19 @@
         </el-button>
       </div>
     </el-dialog>
+    <companyInfoDialog v-if="showCompanyInfoDialog" :visiable.sync="showCompanyInfoDialog"
+                       @confirm="confirmCompanyDialog" :multi="true" :allCompany="true" :rows="currentCompanyInfos"
+                       fieldKey="companyCode"/>
   </div>
 </template>
 
 <script>
 import i18n from "../../../../../components/xform/utils/i18n"
+import companyInfoDialog from "@base/views/user/company_info/dialog.vue";
 
 export default {
   name: "wfFlag-editor",
+  components: {companyInfoDialog},
   mixins: [i18n],
   props: {
     designer: Object,
@@ -108,7 +155,12 @@ export default {
       dialogVisible: false,
       tableData: [],
       wfDefItems: [],
-      wfNodeMap: {}
+      wfNodeMap: {},
+
+      currentCompanyInfos: [],
+      operateIndex: 0,
+      showCompanyInfoDialog: false
+
     }
   },
   computed: {
@@ -160,10 +212,14 @@ export default {
       });
     },
     addItem() {
-      this.tableData.push({
-        modelId: null,
-        nodeIds: []
-      });
+      let newItem = {
+        serveType: null,
+        serveName: null,
+        modelKey: null,
+        taskSteps: null,
+        companyInfos: []
+      }
+      this.tableData.push(newItem);
     },
     colSubmit() {
       this.dialogVisible = !1;
@@ -189,6 +245,35 @@ export default {
       if (val) {
         this.optionModel.enabledByWf = false;
       }
+    },
+    changeServeType(row) {
+      // modelKey
+      let map = {
+        1: "prod",
+        2: "at",
+        3: "dev"
+      }
+      let serveName = null;
+      let serveType = row.serveType;
+      if (serveType && map[serveType]) {
+        serveName = map[row.serveType];
+      }
+      row.serveName = serveName;
+    },
+    openCompanyDialog(row, rowIndex) {
+      this.operateIndex = rowIndex;
+      this.currentCompanyInfos = row.companyInfos || [];
+      this.showCompanyInfoDialog = true;
+
+    },
+    confirmCompanyDialog(rows) {
+      if (rows.length) {
+        let item = this.tableData[this.operateIndex];
+        item.companyInfos = rows;
+      }
+    },
+    getCompanyNames(item) {
+      return item.companyInfos.map(item => item.companyName).join(',');
     }
   }
 }

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

@@ -1999,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'
@@ -2047,6 +2048,7 @@ export const advancedFields = [
       echarBarOption: {
         backgroundColor: "#fff",
         color: ["#5BC1D7", "#FF8A3D", "#56C271", "#694ED6", "#C033A1", "#FFCC10"],
+        colors: [],
         title: {
           show: true,
           top: '5px',
@@ -2219,6 +2221,7 @@ export const advancedFields = [
       echarCategoryOption: {
         backgroundColor: "#fff",
         color: ["#5BC1D7", "#FF8A3D", "#56C271", "#694ED6", "#C033A1", "#FFCC10"],
+        colors: [],
         title: {
           show: true,
           top: '5px',
@@ -2329,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'
@@ -2363,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'
@@ -2728,6 +2765,8 @@ export const advancedFields = [
       exportFileName: '导出',
       tableRef: '',
       tableExportParam: "",
+      showImageAtTable: false,
+
       onCreated: "",
       onMounted: "",
       wfFlag: 1,
@@ -2832,6 +2871,7 @@ export const advancedFields = [
       label: "导入",
       columnWidth: "200px",
       size: "",
+      importFileLimitSize: 200,
       // displayStyle: "block",
       disabled: !1,
       hidden: !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"