cloud-web-corejs 1.0.54-dev.16 → 1.0.54-dev.160

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

@@ -6,7 +6,7 @@
     <el-form-item :label="i18nt('有流程隐藏')">
       <el-switch v-model="optionModel.hiddenByWf" @change="changeHiddenByWf"></el-switch>
     </el-form-item>
-    <el-form-item :label="i18nt('特定流程节点可编辑')">
+    <el-form-item :label="i18nt('特定流程节点设置')">
       <el-switch v-model="optionModel.wfEdit" @change="changeWfEdit"></el-switch>
     </el-form-item>
     <el-form-item :label="i18nt('流程节点信息')">
@@ -15,13 +15,32 @@
         <i class="el-icon-edit"></i>
       </a>
     </el-form-item>
+    <el-form-item :label="i18nt('过程更改业务数据')">
+      <el-switch v-model="optionModel.wfModifyDataEnabled"></el-switch>
+    </el-form-item>
+    <el-form-item :label="i18nt('更改业务数据信息')">
+      <a href="javascript:void(0);" class="a-link link-oneLind" @click="openDialog2">
+        <span>{{ optionModel.wfModifyDataConfig && optionModel.wfModifyDataConfig.length ? "已维护" : "" }}</span>
+        <i class="el-icon-edit"></i>
+      </a>
+    </el-form-item>
+
+    <!--    <el-form-item :label="i18nt('特定流程节点显隐')">
+          <el-switch v-model="optionModel.wfEdit" @change="changeWfEdit"></el-switch>
+        </el-form-item>
+        <el-form-item :label="i18nt('流程节点信息')">
+          <a href="javascript:void(0);" class="a-link link-oneLind" @click="openDialog">
+            <span>{{ optionModel.wfConfigData && optionModel.wfConfigData.length ? "已维护" : "" }}</span>
+            <i class="el-icon-edit"></i>
+          </a>
+        </el-form-item>-->
     <el-dialog
       v-if="dialogVisible"
       custom-class="dialog-style list-dialog"
       :title="i18nt('流程节点信息')"
       :visible.sync="dialogVisible"
       :show-close="!0"
-      :append-to-body="false"
+      :append-to-body="true"
       :modal="false"
       :close-on-click-modal="!1"
       :close-on-press-escape="!1"
@@ -29,36 +48,77 @@
       width="1220px"
       top="5vh"
       v-dialog-drag
+      :fullscreen="true"
     >
-      <div class="cont">
+      <div class="cont" style="padding-bottom: 8px;">
         <el-table
           ref="singleTable"
           width="100%"
           :data="tableData"
-          height="500"
+          height="100%"
           border=""
           row-key="columnId"
           stripe=""
+          style="margin-bottom: 0px;"
         >
           <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 v-model="row.companyCodes" clearable></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="150">
+            <template slot-scope="{row}">
+              <el-select v-model="row.type" clearable>
+                <el-option :value="1" label="可编辑"></el-option>
+                <el-option :value="2" label="仅显示"></el-option>
+                <el-option :value="3" label="隐藏"></el-option>
+              </el-select>
             </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 +148,105 @@
         </el-button>
       </div>
     </el-dialog>
+    <el-dialog
+      v-if="dialogVisible2"
+      custom-class="dialog-style list-dialog"
+      :title="i18nt('过程更改业务数据')"
+      :visible.sync="dialogVisible2"
+      :show-close="!0"
+      :append-to-body="true"
+      :modal="false"
+      :close-on-click-modal="!1"
+      :close-on-press-escape="!1"
+      :destroy-on-close="!0"
+      width="1220px"
+      top="5vh"
+      v-dialog-drag
+    >
+      <div class="cont" style="padding-bottom: 8px;">
+        <el-table
+          ref="singleTable"
+          width="100%"
+          :data="tableData2"
+          height="500px"
+          border=""
+          row-key="columnId"
+          stripe=""
+          style="margin-bottom: 0px;"
+        >
+          <el-table-column type="index" width="35" fixed="left"></el-table-column>
+          <el-table-column :label="i18nt('流程动作')" width="150">
+            <template slot-scope="{row}">
+              <el-select v-model="row.action">
+                <el-option value="start" label="流程启动"></el-option>
+                <el-option value="interrupt" label="流程中断"></el-option>
+                <el-option value="end" label="流程完成"></el-option>
+              </el-select>
+            </template>
+          </el-table-column>
+          <!--          <el-table-column :label="i18nt('值类型')" width="250">
+                      <template slot-scope="{row}">
+                        <el-select v-model="row.valueType" @change="changeValueType">
+                          <el-option :value="1" label="文本"></el-option>
+                          <el-option :value="2" label="数值"></el-option>
+                          <el-option :value="3" label="布尔值"></el-option>
+                        </el-select>
+                      </template>
+                    </el-table-column>-->
+          <el-table-column :label="i18nt('设置的值')" width="650">
+            <template slot-scope="{row}">
+              <el-input v-model="row.toValue" clearable></el-input>
+              <!--              <el-input v-model="row.toValue" clearable v-if="row.valueType==1"></el-input>
+                            <base-input-number v-model="row.toValue" clearable v-else-if="row.valueType==2"></base-input-number>
+                            <el-radio-group v-model="row.toValue" v-else-if="row.valueType==3">
+                              <el-radio :label="true">true</el-radio>
+                              <el-radio :label="false">false</el-radio>
+                            </el-radio-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>
+              <el-button :title="i18nt('designer.setting.addTableColumn')" size="mini" type="" circle=""
+                         icon="el-icon-plus" @click="addItem2"></el-button>
+            </template>
+            <template slot-scope="scope">
+              <el-button
+                :title="i18nt('designer.setting.deleteTableColumn')"
+                size="mini"
+                type=""
+                circle=""
+                icon="el-icon-minus"
+                @click="tableData2.splice(scope.$index,1)"
+              ></el-button>
+            </template>
+          </el-table-column>
+
+        </el-table>
+      </div>
+      <div class="dialog-footer" slot="footer">
+        <el-button @click="dialogVisible2 = false" class="button-sty" icon="el-icon-close">
+          {{ i18nt('designer.hint.cancel') }}
+        </el-button>
+        <el-button type="primary" @click="colSubmit2" class="button-sty" icon="el-icon-check">
+          {{ i18nt('designer.hint.confirm') }}
+        </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 +259,14 @@ export default {
       dialogVisible: false,
       tableData: [],
       wfDefItems: [],
-      wfNodeMap: {}
+      wfNodeMap: {},
+
+      currentCompanyInfos: [],
+      operateIndex: 0,
+      showCompanyInfoDialog: false,
+
+      dialogVisible2: false,
+      tableData2: [],
     }
   },
   computed: {
@@ -122,11 +280,13 @@ export default {
       let reportTemplate = this.getReportTemplate();
       let objTypeCode = reportTemplate.objTypeCode;
       let wfConfigData = this.optionModel.wfConfigData || [];
-      wfConfigData.forEach(item => {
+      this.dialogVisible = true;
+      this.tableData = this.$baseLodash.cloneDeep(wfConfigData)
+      /*wfConfigData.forEach(item => {
         this.getWfObjConfigItem(item.modelId)
-      })
+      })*/
 
-      this.$http({
+      /*this.$http({
         url: this.current_prefix + "/wf_obj_config_item/list",
         data: {
           objTypeCode: objTypeCode,
@@ -139,7 +299,7 @@ export default {
           this.dialogVisible = true;
           this.tableData = this.$baseLodash.cloneDeep(wfConfigData)
         },
-      });
+      });*/
     },
     getWfObjConfigItem(modelId) {
       let reportTemplate = this.getReportTemplate();
@@ -160,10 +320,15 @@ export default {
       });
     },
     addItem() {
-      this.tableData.push({
-        modelId: null,
-        nodeIds: []
-      });
+      let newItem = {
+        type: null,
+        serveType: null,
+        serveName: null,
+        modelKey: null,
+        taskSteps: null,
+        companyCodes: null
+      }
+      this.tableData.push(newItem);
     },
     colSubmit() {
       this.dialogVisible = !1;
@@ -177,7 +342,7 @@ export default {
     changeEnabledByWf(val) {
       if (val) {
         this.optionModel.hiddenByWf = false;
-        this.optionModel.wfEdit = false;
+        // this.optionModel.wfEdit = false;
       }
     },
     changeHiddenByWf(val) {
@@ -189,6 +354,56 @@ export default {
       if (val) {
         this.optionModel.enabledByWf = false;
       }
+    },
+    changeServeType(row) {
+      // modelKey
+      let map = {
+        1: "prod",
+        2: "uat",
+        3: "dev"
+      }
+      let serveName = null;
+      let serveType = row.serveType;
+      if (serveType && map[serveType]) {
+        serveName = map[row.serveType];
+      }
+      row.serveName = serveName;
+    },
+    openDialog2() {
+      this.tableData2 = this.$baseLodash.cloneDeep(this.optionModel.wfModifyDataConfig || []);
+      this.dialogVisible2 = true;
+    },
+    addItem2() {
+      let newItem = {
+        action: 'start',
+        // valueType: 1,
+        toValue: null
+      }
+      this.tableData2.push(newItem);
+    },
+    colSubmit2() {
+      let isError = false;
+      let map = {}
+      this.tableData2.forEach(item => {
+        let count = map[item.action] || 0;
+        map[item.action] = count + 1;
+        if (map[item.action] > 1) {
+          isError = true;
+        }
+      })
+      if (isError) {
+        this.$message({
+          message: "流程动作不能重复",
+          type: 'error',
+          duration: 2000,
+        })
+        return
+      }
+      this.dialogVisible2 = !1;
+      this.$set(this.optionModel, 'wfModifyDataConfig', this.tableData2)
+    },
+    changeValueType(row) {
+      row.toValue = null;
     }
   }
 }

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',
@@ -147,6 +148,9 @@ const COMMON_PROPERTIES = {
   "submitFlag": "submitFlag-editor",
   "aLinkFlag": "a-link-editor",
   "aTextFlag": "a-text-editor",
+  "tagFormCode": "project-tag-editor",
+  "autoValueEnabled": "autoValueEnabled-editor",
+  // "commonAttributeEnabled": "commonAttributeEnabled-editor"
 }
 
 const ADVANCED_PROPERTIES = {
@@ -212,6 +216,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/toolbar-panel/index.vue

@@ -43,12 +43,12 @@
                   表单/列表设置
                 </el-button>-->
         <el-button type="primary" @click="saveReportTemplate()" plain
-                   v-if="designer.vueInstance.isDev && designer.vueInstance.menuKindAuth.editAuth===1">
+                   v-if="designer.vueInstance.isDev && designer.vueInstance.menuKindAuth.editAuth===1 && !readonly">
           <i class="el-icon-check"/>
           保存
         </el-button>
         <el-divider direction="vertical"></el-divider>
-        <el-button v-if="showToolButton('clearDesignerButton')" type="text" @click="clearFormWidget">
+        <el-button v-if="showToolButton('clearDesignerButton') && !readonly" type="text" @click="clearFormWidget">
           <i class="el-icon-delete"/>
           {{ i18nt('designer.toolbar.clear') }}
         </el-button>
@@ -57,7 +57,7 @@
           {{ i18nt('designer.toolbar.preview') }}
         </el-button>
         <el-divider direction="vertical"></el-divider>
-        <el-button v-if="showToolButton('importJsonButton')" type="text" @click="importJson">
+        <el-button v-if="showToolButton('importJsonButton') && !readonly" type="text" @click="importJson">
           {{ i18nt('designer.toolbar.importJson') }}
         </el-button>
         <el-button v-if="showToolButton('exportJsonButton')" type="text" @click="exportJson">
@@ -424,19 +424,16 @@
 
 <script>
 import VFormRender from '../../../../components/xform/form-render/index';
-import Clipboard from 'clipboard';
 import indexMixin from './indexMixin.js';
 import FormSetting from '../../../../components/xform/form-designer/setting-panel/form-setting';
-import tableForm from "../../../../components/table/tableForm.vue";
 
 export default {
   name: 'ToolbarPanel',
   components: {
-    tableForm,
     VFormRender,
-    Clipboard,
     FormSetting
   },
+  inject:["readonly"],
   mixins: [indexMixin],
   data() {
     return {