cloud-web-corejs 1.0.255 → 1.0.257

package/package.json

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

package/src/components/wf/wf.js

@@ -1746,13 +1746,31 @@ wfStartMixin = {
         if (settingConfig.withoutConfrimByOneWf === true) {
           this.startSubmit();
         } else {
+          let customStartTip = this.option && this.option.startConfirmText;
+          if (typeof customStartTip === "function") {
+            customStartTip = await customStartTip.call(
+              this.parentVue || this,
+              {
+                objId: this.dataId,
+                wfCode: this.code,
+                formCode: this.formCode,
+                startParam: this.startParam,
+              }
+            );
+          }
           let wfStartOperateName =
             settingConfig.wfStartOperateName ||
             settingConfig.wfStartButtonName ||
             "启动流程";
-          let startTip = "您确定要" + wfStartOperateName + "吗？";
+          let defaultStartTip = "您确定要" + wfStartOperateName + "吗？";
+          let startTip;
+          if (typeof customStartTip === "string" && customStartTip.trim()) {
+            startTip = customStartTip;
+          } else {
+            startTip = this.$t2(defaultStartTip, 'components.wf.startTip');
+          }
           that
-            .$baseConfirm(this.$t2(startTip, 'components.wf.startTip'))
+            .$baseConfirm(startTip)
             .then(() => {
               this.startSubmit();
             });

package/src/components/xform/form-designer/designer.js

@@ -85,6 +85,7 @@ let chartContainers = [],
         saveScriptCode: "saveUpdate",
         wfConfig: null,
         wfStartBindSave: false,
+        wfStartConfirmText: null,
         wfAgreenBindSave: false,
         wfAgreeConfigData: [],
         wfConfigDataEnabled: false,

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

@@ -158,6 +158,16 @@
           <el-form-item :label="i18nt('流程启动时自动保存表单数据')">
             <el-switch v-model="formConfig.wfStartBindSave"></el-switch>
           </el-form-item>
+          <el-form-item :label="i18nt('流程启动确认提示脚本')">
+            <a
+              href="javascript:void(0);"
+              class="a-link link-oneLind"
+              @click="editFormEventHandler('wfStartConfirmText')"
+            >
+              <span>{{ formConfig.wfStartConfirmText }}</span>
+              <i class="el-icon-edit"></i>
+            </a>
+          </el-form-item>
 
           <el-form-item :label="i18nt('流程通过时自动保存表单数据')">
             <el-switch v-model="formConfig.wfAgreenBindSave"></el-switch>
@@ -360,7 +370,7 @@
     </el-form>
 
     <el-dialog
-      :title="i18nt('designer.setting.editFormEventHandler')"
+      :title="formEventDialogTitle"
       :visible.sync="showFormEventDialogFlag"
       v-if="showFormEventDialogFlag"
       :show-close="true"
@@ -927,6 +937,18 @@ export default {
       showFormEventDialogFlag: false,
       formEventHandlerCode: "",
       curEventName: "",
+      formEventDialogTitle: "",
+      eventDialogTitleMap: {
+        globalConfig: "全局参数配置",
+        wfStartConfirmText: "流程启动确认提示语配置",
+        wfConfig: "流程自定义配置",
+        onBeforeCreated: "表单创建前事件配置",
+        onFormCreated: "表单创建事件配置",
+        onFormBeforeMounted: "表单挂载前事件配置",
+        onFormMounted: "表单挂载事件配置",
+        onFormDataChange: "表单数据变更事件配置",
+        onFormValidate: "表单校验事件配置",
+      },
 
       eventParamsMap: {
         onBeforeCreated: "onBeforeCreated(dataId,formCode,done) {",
@@ -935,6 +957,8 @@ export default {
         onFormMounted: "onFormMounted(dataId,formCode) {",
         onFormDataChange:
           "onFormDataChange(fieldName, newValue, oldValue, formModel, subFormName, subFormRowIndex) {",
+        wfStartConfirmText:
+          "wfStartConfirmText(dataId, formCode, formData) {",
         wfConfig: "wfConfig(dataId, formCode, formData) {",
         globalConfig: "globalConfig(dataId, formCode) {",
         //'onFormValidate':     'onFormValidate() {',
@@ -1123,9 +1147,16 @@ $\{wf.starterName\}提交的$\{pm_product_project.product_code\}$\{pm_product_pr
       this.showEditFunctionsDialogFlag = false;
     },
 
-    editFormEventHandler(eventName) {
+    editFormEventHandler(eventName, dialogTitle) {
       this.curEventName = eventName;
       this.formEventHandlerCode = this.formConfig[eventName];
+      let customTitle =
+        typeof dialogTitle === "string" && dialogTitle ? dialogTitle : null;
+      let eventTitle =
+        customTitle ||
+        this.eventDialogTitleMap[eventName] ||
+        (eventName ? eventName + " 配置" : "配置");
+      this.formEventDialogTitle = this.i18nt(eventTitle);
       this.showFormEventDialogFlag = true;
     },
 

package/src/components/xform/form-render/container-item/detail-h5-item.vue

@@ -135,6 +135,7 @@ export default {
           wfCode: formCode, //流程编码
           showStartBtn: true, //是否放出启动按钮,流程已启动时此参数失效
           serviceId: 'user',
+          startConfirmText: () => formTarget.getWfStartConfirmText(),
           callback: ({wfInfo}) => {
             this.wfInfo = wfInfo;
           }

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

@@ -147,6 +147,7 @@ export default {
           wfCode: formCode, //流程编码
           showStartBtn: true, //是否放出启动按钮,流程已启动时此参数失效
           serviceId: "user",
+          startConfirmText: () => formTarget.getWfStartConfirmText(),
           callback: ({ wfInfo }) => {
             this.wfInfo = wfInfo;
           },

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

@@ -14,8 +14,8 @@
         }"
       >
         <el-tab-pane
-          v-for="(tab, index) in visibleTabs"
-          :key="index"
+          v-for="tab in visibleTabs"
+          :key="tab.options.name"
           :label="getI18nLabel(tab.options.label)"
           :disabled="tab.options.disabled"
           :name="tab.options.name"
@@ -25,7 +25,7 @@
               <component
                 :is="subWidget.type + '-item'"
                 :widget="subWidget"
-                :key="swIdx"
+                :key="subWidget.id || swIdx"
                 :parent-list="tab.widgetList"
                 :index-of-parent-list="swIdx"
                 :parent-widget="widget"
@@ -42,7 +42,7 @@
               <component
                 :is="subWidget.type + '-widget'"
                 :field="subWidget"
-                :key="swIdx"
+                :key="subWidget.id || swIdx"
                 :parent-list="tab.widgetList"
                 :index-of-parent-list="swIdx"
                 :parent-widget="widget"

package/src/components/xform/form-render/indexMixin.js

@@ -1243,6 +1243,7 @@ modules = {
               showStartBtn: true, //是否放出启动按钮,流程已启动时此参数失效
               showWfFold: true,
               formCode: formCode,
+              startConfirmText: () => this.getWfStartConfirmText(),
               callback: (wfParam) => {
                 this.setFormData(formData);
 
@@ -1651,6 +1652,14 @@ modules = {
         );
       }
     },
+    getWfStartConfirmText() {
+      let currentFormData = this.getSysFormData(this.getRealFormData());
+      return this.handleCustomEvent(
+        this.formConfig?.wfStartConfirmText,
+        ["formData"],
+        [currentFormData]
+      );
+    },
 
     handleOnCreated: function () {
       this.handleCustomEvent(this.formConfig?.onFormCreated);

package/src/components/xform/utils/util.js

@@ -993,6 +993,7 @@ export function getDefaultFormConfig() {
     saveScriptCode: "saveUpdate",
     wfConfig: null,
     wfStartBindSave: false,
+    wfStartConfirmText: null,
     wfAgreenBindSave: false,
     wfAgreeConfigData: [],
     wfConfigDataEnabled: false,

package/src/views/user/wf/wf_manage/list.vue

@@ -172,6 +172,12 @@
                     :option="{ title: $t1('流程待办导出'), targetRef: 'table-m2' }"
                     :parent-target="_self"
                   />
+                  <el-button
+                    type="primary"
+                    class="button-sty"
+                    @click="openCurrentTaskUserDialog"
+                    >{{ $t1("处理当前任务用户") }}
+                  </el-button>
                 </div>
                 <div class="fr">
                   <vxe-button
@@ -242,6 +248,14 @@
                     <el-input v-model="formData2.candidateNames" size="small" clearable />
                   </template>
                 </vxe-form-item>
+                <vxe-form-item :title="$t1('禁用用户流程') + ':'">
+                  <template v-slot>
+                    <el-select v-model="formData2.filterDisabledUser" clearable>
+                      <el-option :value="1" :label="$t1('是')"></el-option>
+                      <el-option :value="0" :label="$t1('否')"></el-option>
+                    </el-select>
+                  </template>
+                </vxe-form-item>
               </vxe-form>
             </template>
           </vxe-grid>
@@ -262,15 +276,102 @@
       @confirm="confirmInsertWfObjConfig2"
       :multi="false"
     ></wfObjConfigDialog>
+    <el-dialog
+      :title="$t1('处理当前任务用户')"
+      :append-to-body="true"
+      :modal-append-to-body="true"
+      :close-on-click-modal="false"
+      :visible.sync="showCurrentTaskUserDialog"
+      :modal="false"
+      custom-class="dialog-style list-dialog pd_0"
+      width="300px"
+      @close="closeCurrentTaskUserDialog"
+      v-el-drag-dialog
+      v-el-dialog-center
+    >
+      <div class="cont" style="padding: 16px 20px">
+        <el-form
+          ref="currentTaskUserForm"
+          :model="currentTaskUserForm"
+          label-width="100px"
+        >
+          <el-form-item :label="$t1('删除用户')">
+            <el-input
+              class="search-input"
+              v-model="currentTaskUserForm.delUserNames"
+              clearable
+              @clear="clearDelUsers"
+              v-el-readonly
+            >
+              <i
+                slot="suffix"
+                class="el-input__icon el-icon-search"
+                @click="openDelUserDialog"
+              ></i>
+            </el-input>
+          </el-form-item>
+          <el-form-item :label="$t1('新增用户')">
+            <el-input
+              class="search-input"
+              v-model="currentTaskUserForm.addUserNames"
+              clearable
+              @clear="clearAddUsers"
+              v-el-readonly
+            >
+              <i
+                slot="suffix"
+                class="el-input__icon el-icon-search"
+                @click="openAddUserDialog"
+              ></i>
+            </el-input>
+          </el-form-item>
+        </el-form>
+      </div>
+      <span slot="footer" class="dialog-footer">
+        <el-button
+          type="primary"
+          plain
+          class="button-sty"
+          @click="closeCurrentTaskUserDialog"
+        >
+          <i class="el-icon-close el-icon"></i>
+          {{ $t1("取 消") }}
+        </el-button>
+        <el-button
+          type="primary"
+          class="button-sty"
+          @click="confirmCurrentTaskUser"
+        >
+          <i class="el-icon-check el-icon"></i>
+          {{ $t1("确 定") }}
+        </el-button>
+      </span>
+    </el-dialog>
+    <userDialog
+      v-if="showDelUserDialog"
+      :visiable.sync="showDelUserDialog"
+      @confirm="confirmDelUsers"
+      :multi="true"
+      :param="{ enabled: null }"
+      :rows="currentTaskUserForm.delUserRows"
+    />
+    <userDialog
+      v-if="showAddUserDialog"
+      :visiable.sync="showAddUserDialog"
+      @confirm="confirmAddUsers"
+      :multi="true"
+      :rows="currentTaskUserForm.addUserRows"
+    />
   </div>
 </template>
 <script>
 import { treeScollx } from "@base/utils/global.js";
 import wfObjConfigDialog from "../../../../views/user/wf/wf_obj_config/dialog.vue";
+import userDialog from "@base/views/user/user/dialog";
 
 export default {
   name: "wf_manage:list",
-  components: { wfObjConfigDialog },
+  components: { wfObjConfigDialog, userDialog },
   created() {},
   async mounted() {
     treeScollx({ target: this, type: "default" });
@@ -301,6 +402,19 @@ export default {
       param: {},
       wfContent: null,
       showWfContent: false,
+
+      showCurrentTaskUserDialog: false,
+      showDelUserDialog: false,
+      showAddUserDialog: false,
+      currentTaskUserUuids: [],
+      currentTaskUserForm: {
+        delUserIds: [],
+        delUserNames: "",
+        delUserRows: [],
+        addUserIds: [],
+        addUserNames: "",
+        addUserRows: [],
+      },
     };
   },
   computed: {
@@ -797,6 +911,112 @@ export default {
         this.$set(this.formData2, "objTypeCode", row.objTypeCode);
       }
     },
+    openCurrentTaskUserDialog() {
+      let checkRows = this.$refs["table-m2"].getCheckboxRecords(true) || [];
+      if (!checkRows.length) {
+        this.$baseAlert(this.$t1("请勾选需要处理的数据"));
+        return;
+      }
+      this.currentTaskUserUuids = checkRows.map((row) => row.uuid);
+      this.currentTaskUserForm = {
+        delUserIds: [],
+        delUserNames: "",
+        delUserRows: [],
+        addUserIds: [],
+        addUserNames: "",
+        addUserRows: [],
+      };
+      this.showCurrentTaskUserDialog = true;
+      this.initDelUsers();
+    },
+    initDelUsers() {
+      this.$http({
+        url: USER_PREFIX + "/wf_info/getDelUsers",
+        method: "post",
+        data: {
+          uuid: this.currentTaskUserUuids,
+          flag: 1,
+        },
+        success: (res) => {
+          let rows = (res.objx || []).map((row) => {
+            return { ...row, nickName: row.nickName || row.nick_name };
+          });
+          this.confirmDelUsers(rows);
+        },
+      });
+    },
+    closeCurrentTaskUserDialog() {
+      this.showCurrentTaskUserDialog = false;
+    },
+    openDelUserDialog() {
+      this.showDelUserDialog = true;
+    },
+    openAddUserDialog() {
+      this.showAddUserDialog = true;
+    },
+    clearDelUsers() {
+      this.currentTaskUserForm.delUserIds = [];
+      this.currentTaskUserForm.delUserNames = "";
+      this.currentTaskUserForm.delUserRows = [];
+    },
+    clearAddUsers() {
+      this.currentTaskUserForm.addUserIds = [];
+      this.currentTaskUserForm.addUserNames = "";
+      this.currentTaskUserForm.addUserRows = [];
+    },
+    confirmDelUsers(rows) {
+      if (!rows || !rows.length) {
+        this.clearDelUsers();
+        return;
+      }
+      this.currentTaskUserForm.delUserIds = rows.map((row) => row.id);
+      this.currentTaskUserForm.delUserRows = rows;
+      this.currentTaskUserForm.delUserNames = rows
+        .map((row) => row.nickName)
+        .join(",");
+    },
+    confirmAddUsers(rows) {
+      if (!rows || !rows.length) {
+        this.clearAddUsers();
+        return;
+      }
+      this.currentTaskUserForm.addUserIds = rows.map((row) => row.id);
+      this.currentTaskUserForm.addUserRows = rows;
+      this.currentTaskUserForm.addUserNames = rows
+        .map((row) => row.nickName)
+        .join(",");
+    },
+    confirmCurrentTaskUser() {
+      let delUserIds = this.currentTaskUserForm.delUserIds || [];
+      let addUserIds = this.currentTaskUserForm.addUserIds || [];
+      if (!delUserIds.length) {
+        this.$message.error(this.$t1("请选择删除用户"));
+        return;
+      }
+      this.$baseConfirm(this.$t1("您确定要处理当前任务用户吗？")).then(() => {
+        this.$http({
+          url: USER_PREFIX + "/wf_info/updateCurrentTaskUsers",
+          method: "post",
+          data: {
+            uuid: this.currentTaskUserUuids,
+            delUserIds: delUserIds,
+            addUserIds: addUserIds,
+          },
+          isLoading: true,
+          success: (res) => {
+            this.$message({
+              message: res.content || this.$t1("操作成功"),
+              type: "success",
+              duration: 500,
+              onClose: () => {
+                this.closeCurrentTaskUserDialog();
+                this.searchEvent2();
+              },
+            });
+          },
+        });
+      });
+    },
   },
 };
 </script>