eoss-ui 0.6.86 → 0.6.88

package/lib/main.js

@@ -7248,8 +7248,8 @@ var apps_component = Object(componentNormalizer["a" /* default */])(
 )
 
 /* harmony default export */ var simplicity_apps = (apps_component.exports);
-// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/main/src/simplicity/user.vue?vue&type=template&id=d789fc64&scoped=true&
-var uservue_type_template_id_d789fc64_scoped_true_render = function () {
+// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/main/src/simplicity/user.vue?vue&type=template&id=cf46141e&scoped=true&
+var uservue_type_template_id_cf46141e_scoped_true_render = function () {
   var _vm = this
   var _h = _vm.$createElement
   var _c = _vm._self._c || _h
@@ -7353,28 +7353,6 @@ var uservue_type_template_id_d789fc64_scoped_true_render = function () {
             1
           )
         : _vm._e(),
-      _c(
-        "div",
-        { staticClass: "es-simplicity-notice-type" },
-        [
-          _c("div", { staticClass: "es-simplicity-notice-title" }, [
-            _vm._v("接收消息类型："),
-          ]),
-          _c("es-checkbox-group", {
-            staticClass: "es-simplicity-notice-list",
-            attrs: { min: 1, data: _vm.notifyList },
-            on: { change: _vm.handleCheckboxChange },
-            model: {
-              value: _vm.checked,
-              callback: function ($$v) {
-                _vm.checked = $$v
-              },
-              expression: "checked",
-            },
-          }),
-        ],
-        1
-      ),
       _c(
         "div",
         {
@@ -7410,14 +7388,14 @@ var uservue_type_template_id_d789fc64_scoped_true_render = function () {
     1
   )
 }
-var uservue_type_template_id_d789fc64_scoped_true_staticRenderFns = []
-uservue_type_template_id_d789fc64_scoped_true_render._withStripped = true
+var uservue_type_template_id_cf46141e_scoped_true_staticRenderFns = []
+uservue_type_template_id_cf46141e_scoped_true_render._withStripped = true
 
 
-// CONCATENATED MODULE: ./packages/main/src/simplicity/user.vue?vue&type=template&id=d789fc64&scoped=true&
+// CONCATENATED MODULE: ./packages/main/src/simplicity/user.vue?vue&type=template&id=cf46141e&scoped=true&
 
-// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/main/src/simplicity/userinfo.vue?vue&type=template&id=1c52f6d2&
-var userinfovue_type_template_id_1c52f6d2_render = function () {
+// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/main/src/simplicity/userinfo.vue?vue&type=template&id=8643d5d2&
+var userinfovue_type_template_id_8643d5d2_render = function () {
   var _vm = this
   var _h = _vm.$createElement
   var _c = _vm._self._c || _h
@@ -7433,11 +7411,11 @@ var userinfovue_type_template_id_1c52f6d2_render = function () {
     2
   )
 }
-var userinfovue_type_template_id_1c52f6d2_staticRenderFns = []
-userinfovue_type_template_id_1c52f6d2_render._withStripped = true
+var userinfovue_type_template_id_8643d5d2_staticRenderFns = []
+userinfovue_type_template_id_8643d5d2_render._withStripped = true
 
 
-// CONCATENATED MODULE: ./packages/main/src/simplicity/userinfo.vue?vue&type=template&id=1c52f6d2&
+// CONCATENATED MODULE: ./packages/main/src/simplicity/userinfo.vue?vue&type=template&id=8643d5d2&
 
 // CONCATENATED MODULE: ./node_modules/babel-loader/lib!./node_modules/vue-loader/lib??vue-loader-options!./packages/main/src/simplicity/userinfo.vue?vue&type=script&lang=js&
 //
@@ -7461,10 +7439,6 @@ userinfovue_type_template_id_1c52f6d2_render._withStripped = true
 /* harmony default export */ var userinfovue_type_script_lang_js_ = ({
   name: 'UserInfo',
   props: {
-    showNotify: {
-      type: Boolean,
-      default: true
-    },
     secret: {
       type: Boolean,
       default: true
@@ -7704,8 +7678,8 @@ userinfovue_type_template_id_1c52f6d2_render._withStripped = true
 
 var userinfo_component = Object(componentNormalizer["a" /* default */])(
   simplicity_userinfovue_type_script_lang_js_,
-  userinfovue_type_template_id_1c52f6d2_render,
-  userinfovue_type_template_id_1c52f6d2_staticRenderFns,
+  userinfovue_type_template_id_8643d5d2_render,
+  userinfovue_type_template_id_8643d5d2_staticRenderFns,
   false,
   null,
   null,
@@ -7981,11 +7955,11 @@ var userinfo_component = Object(componentNormalizer["a" /* default */])(
 
 var user_component = Object(componentNormalizer["a" /* default */])(
   simplicity_uservue_type_script_lang_js_,
-  uservue_type_template_id_d789fc64_scoped_true_render,
-  uservue_type_template_id_d789fc64_scoped_true_staticRenderFns,
+  uservue_type_template_id_cf46141e_scoped_true_render,
+  uservue_type_template_id_cf46141e_scoped_true_staticRenderFns,
   false,
   null,
-  "d789fc64",
+  "cf46141e",
   null
   
 )
@@ -13113,8 +13087,8 @@ defaultvue_type_template_id_377c361a_render._withStripped = true
 
 // CONCATENATED MODULE: ./packages/main/src/default/index.vue?vue&type=template&id=377c361a&
 
-// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/main/src/default/userinfo.vue?vue&type=template&id=516cb128&
-var userinfovue_type_template_id_516cb128_render = function () {
+// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/main/src/default/userinfo.vue?vue&type=template&id=14b0e976&
+var userinfovue_type_template_id_14b0e976_render = function () {
   var _vm = this
   var _h = _vm.$createElement
   var _c = _vm._self._c || _h
@@ -13130,11 +13104,11 @@ var userinfovue_type_template_id_516cb128_render = function () {
     2
   )
 }
-var userinfovue_type_template_id_516cb128_staticRenderFns = []
-userinfovue_type_template_id_516cb128_render._withStripped = true
+var userinfovue_type_template_id_14b0e976_staticRenderFns = []
+userinfovue_type_template_id_14b0e976_render._withStripped = true
 
 
-// CONCATENATED MODULE: ./packages/main/src/default/userinfo.vue?vue&type=template&id=516cb128&
+// CONCATENATED MODULE: ./packages/main/src/default/userinfo.vue?vue&type=template&id=14b0e976&
 
 // CONCATENATED MODULE: ./node_modules/babel-loader/lib!./node_modules/vue-loader/lib??vue-loader-options!./packages/main/src/default/userinfo.vue?vue&type=script&lang=js&
 var userinfovue_type_script_lang_js_extends = Object.assign || function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; };
@@ -13161,10 +13135,10 @@ var userinfovue_type_script_lang_js_extends = Object.assign || function (target)
 
 /* harmony default export */ var default_userinfovue_type_script_lang_js_ = ({
   props: {
-    showNotify: {
-      type: Boolean,
-      default: true
-    },
+    // showNotify: {
+    //   type: Boolean,
+    //   default: true
+    // },
     secret: {
       type: Boolean,
       default: true
@@ -13338,18 +13312,20 @@ var userinfovue_type_script_lang_js_extends = Object.assign || function (target)
           }
         }
       }
-      if (this.showNotify) {
-        page.push({
-          title: '接收消息类型',
-          contents: [{
-            type: 'checkbox',
-            labelHide: true,
-            name: 'notify',
-            col: 12,
-            data: store["a" /* default */].get('notifyList')
-          }]
-        });
-      }
+      // if (this.showNotify) {
+      //   page.push({
+      //     title: '接收消息类型',
+      //     contents: [
+      //       {
+      //         type: 'checkbox',
+      //         labelHide: true,
+      //         name: 'notify',
+      //         col: 12,
+      //         data: store.get('notifyList')
+      //       }
+      //     ]
+      //   });
+      // }
       page.push({
         type: 'submit',
         contents: [{
@@ -13592,8 +13568,8 @@ var userinfovue_type_script_lang_js_extends = Object.assign || function (target)
 
 var default_userinfo_component = Object(componentNormalizer["a" /* default */])(
   src_default_userinfovue_type_script_lang_js_,
-  userinfovue_type_template_id_516cb128_render,
-  userinfovue_type_template_id_516cb128_staticRenderFns,
+  userinfovue_type_template_id_14b0e976_render,
+  userinfovue_type_template_id_14b0e976_staticRenderFns,
   false,
   null,
   null,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "eoss-ui",
-  "version": "0.6.86",
+  "version": "0.6.88",
   "description": "eoss内部业务组件",
   "main": "lib/eoss-ui.common.js",
   "files": [

package/packages/data-table/src/column.vue

@@ -445,9 +445,8 @@
         v-html="format(scope.row, true)"
         :style="styles ? styles[scope.row[prop]] : {}"
       ></span>
-      <span v-else :style="styles ? styles[scope.row[prop]] : {}">{{
-        format(scope.row)
-      }}</span>
+      <span v-else :style="styles ? styles[scope.row[prop]] : {}" v-html="format(scope.row)"></span>
+      <!-- {{ format(scope.row) }} -->
       <es-button-group
         v-if="type === 'handle' && !scope.row.hideHandle"
         v-bind="
@@ -811,6 +810,8 @@ export default {
     },
     format(rows, flag) {
       const field = this.field || this.prop;
+      console.log('field', field);
+      console.log('rows', rows);
       let data = this.option;
       let str = '';
       if (util.isObject(rows[field])) {

package/packages/flow/src/component/Circulate.vue

@@ -70,6 +70,7 @@
           "
           type="textarea"
           v-model="infoList.noticeInfo"
+          @change="handleChange"
           :readonly="notificationMessageReadOnly"
         />
         <!-- <span>{{ infoList.noticeInfo }}</span> -->
@@ -115,7 +116,11 @@ export default {
       type: String,
       default: 'left'
     },
-    startFlowPageEmbeddedIntoStartFlowIndex:{type:Boolean,default:false}
+    startFlowPageEmbeddedIntoStartFlowIndex:{type:Boolean,default:false},
+    formTitle: {
+      type: String,
+      default: ''
+    },
   },
   inheritAttrs: false,
   data() {
@@ -125,6 +130,7 @@ export default {
       notificationMessageReadOnly: false,
       otherMix: false,
       currentMix: false,
+      oldMessage:'',
       infoList: {
         nextOtherOrgObj: [],
         nextCurrentOrgObj: [],
@@ -136,6 +142,7 @@ export default {
       currentOrgTabs: [],
       foreignOrgTabs: [],
       currentOrgProcessKey: '',
+      isChangeMessage: false,
       isSubFlow: true,
       choiceDeptId: '',
       choiceOrgId: '',
@@ -168,6 +175,15 @@ export default {
       },
       deep: true,
       immediate: true
+    },
+    formTitle: {
+      handler(val) {
+        if (!this.showBtn && !this.isChangeMessage) {
+          this.infoList.noticeInfo = this.oldMessage.replace('{title}', val);
+        }
+      },
+      deep: true,
+      immediate: true
     }
   },
   mounted() {
@@ -184,6 +200,9 @@ export default {
     this.getMessage();
   },
   methods: {
+    handleChange() {
+      this.isChangeMessage = true
+    },
     isMultiple(val) {
       if (val == 7 || val == 9 || val == 11) {
         this.newMultiple = false;
@@ -296,7 +315,8 @@ export default {
           url: findCodeValues,
           params: {
             ccCode: 'notification_type',
-            userId: util.getStorage('userId')
+            userId: util.getStorage('userId'),
+            pendingId:this.pendingId
           }
         })
         .then((res) => {
@@ -317,13 +337,23 @@ export default {
     //获取通知信息
     getMessage() {
       let params = {
-        pendingId: this.pendingId
+        pendingId: this.pendingId,
+        processDefinitionId: this.processDefinitionId,
+        businessId: this.businessId
       };
+      if (!this.showBtn) {
+        params.openMode = 'samepage';
+      }
       util
         .ajax({ url: getNotificationMsg, params, methods: 'post' })
         .then((res) => {
           if (res.status === 'success') {
-            this.infoList.noticeInfo = res.message;
+            if (!this.showBtn) {
+              this.oldMessage = res.message;
+              this.infoList.noticeInfo = res.message.replace('{title}', this.formTitle);
+            } else {
+              this.infoList.noticeInfo = res.message;
+            }
           }
           this.loading = false;
         })

package/packages/flow/src/component/taskUnionExamine.vue

@@ -566,7 +566,8 @@ export default {
           url: findCodeValues,
           params: {
             ccCode: 'notification_type',
-            userId: util.getStorage('userId')
+            userId: util.getStorage('userId'),
+            pendingId:this.pendingId
           }
         })
         .then((res) => {

package/packages/flow/src/freeStartFlow.vue

@@ -1347,7 +1347,8 @@ export default {
           url: findCodeValues,
           params: {
             ccCode: 'notification_type',
-            userId: util.getStorage('userId')
+            userId: util.getStorage('userId'),
+            pendingId:this.pendingId
           }
         })
         .then((res) => {

package/packages/flow/src/main.vue

@@ -87,6 +87,7 @@
           :selectorParams="params"
           :pending-id="pendingId"
           :showBtn="false"
+          :formTitle="formTitle"
           :processDefinitionId="nodeInfo.nextNode"
           :simpleTips="simpleTips"
           :oldOption="value"
@@ -693,6 +694,7 @@
           :startFlowPageEmbeddedIntoStartFlowIndex="
             startFlowPageEmbeddedIntoStartFlowIndex
           "
+          :formTitle="formTitle"
           :processDefinitionId="nodeInfo.nextNode"
           :simpleTips="simpleTips"
           :showBtn="false"
@@ -1909,7 +1911,8 @@ export default {
           url: findCodeValues,
           params: {
             ccCode: 'notification_type',
-            userId: util.getStorage('userId')
+            userId: util.getStorage('userId'),
+            pendingId:this.pendingId
           }
         })
         .then((res) => {
@@ -3107,7 +3110,7 @@ export default {
      * @date 2022年5月25日
      **/
     closeProcess(val, type, closeParent) {
-      if (closeParent && !this.startFlowPageEmbeddedIntoStartFlowIndex) {
+      if (this.closeParent && !this.startFlowPageEmbeddedIntoStartFlowIndex) {
         this.$refs[type].handleClosed();
       } else if (!this.startFlowPageEmbeddedIntoStartFlowIndex) {
         this[type] = false;

package/packages/flow/src/processForm.vue

@@ -745,7 +745,7 @@ export default {
           if (res.status === 'success') {
             if (!this.showBtn) {
               this.oldMessage = res.message;
-              this.nextNode.noticeInfo = res.message.replace('{title}', '');
+              this.nextNode.noticeInfo = res.message.replace('{title}', this.formTitle);
             } else {
               this.nextNode.noticeInfo = res.message;
             }

package/packages/flow/src/processReject.vue

@@ -144,7 +144,8 @@ export default {
           url: findCodeValues,
           params: {
             ccCode: 'notification_type',
-            userId: util.getStorage('userId')
+            userId: util.getStorage('userId'),
+            pendingId:this.pendingId
           }
         })
         .then((res) => {

package/packages/flow/src/startTaskRead.vue

@@ -478,7 +478,8 @@ export default {
           url: findCodeValues,
           params: {
             ccCode: 'notification_type',
-            userId: util.getStorage('userId')
+            userId: util.getStorage('userId'),
+            pendingId:this.pendingId
           }
         })
         .then((res) => {

package/packages/main/src/default/userinfo.vue

@@ -26,10 +26,10 @@ import util from 'eoss-ui/src/utils/util';
 
 export default {
   props: {
-    showNotify: {
-      type: Boolean,
-      default: true
-    },
+    // showNotify: {
+    //   type: Boolean,
+    //   default: true
+    // },
     secret: {
       type: Boolean,
       default: true
@@ -223,20 +223,20 @@ export default {
           }
         }
       }
-      if (this.showNotify) {
-        page.push({
-          title: '接收消息类型',
-          contents: [
-            {
-              type: 'checkbox',
-              labelHide: true,
-              name: 'notify',
-              col: 12,
-              data: store.get('notifyList')
-            }
-          ]
-        });
-      }
+      // if (this.showNotify) {
+      //   page.push({
+      //     title: '接收消息类型',
+      //     contents: [
+      //       {
+      //         type: 'checkbox',
+      //         labelHide: true,
+      //         name: 'notify',
+      //         col: 12,
+      //         data: store.get('notifyList')
+      //       }
+      //     ]
+      //   });
+      // }
       page.push({
         type: 'submit',
         contents: [

package/packages/main/src/simplicity/user.vue

@@ -51,7 +51,7 @@
         :src="qrcode"
       ></el-image>
     </div>
-    <div class="es-simplicity-notice-type">
+    <!-- <div class="es-simplicity-notice-type">
       <div class="es-simplicity-notice-title">接收消息类型：</div>
       <es-checkbox-group
         class="es-simplicity-notice-list"
@@ -60,7 +60,7 @@
         :data="notifyList"
         @change="handleCheckboxChange"
       ></es-checkbox-group>
-    </div>
+    </div> -->
     <div class="es-simplicity-password" @click="handleOpen">
       修改密码 <i class="es-icon-arrow-right"></i>
     </div>

package/packages/main/src/simplicity/userinfo.vue

@@ -19,10 +19,6 @@ import util from 'eoss-ui/src/utils/util';
 export default {
   name: 'UserInfo',
   props: {
-    showNotify: {
-      type: Boolean,
-      default: true
-    },
     secret: {
       type: Boolean,
       default: true

package/src/index.js

@@ -125,7 +125,7 @@ if (typeof window !== 'undefined' && window.Vue) {
 }
 
 export default {
-  version: '0.6.86',
+  version: '0.6.88',
   install,
   Button,
   ButtonGroup,