eoss-ui 0.5.35 → 0.5.38

package/lib/table-form.js

@@ -3524,8 +3524,8 @@ module.exports = require("json-bigint");
 // ESM COMPAT FLAG
 __webpack_require__.r(__webpack_exports__);
 
-// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/form/src/table.vue?vue&type=template&id=b5a1829e&
-var tablevue_type_template_id_b5a1829e_render = function () {
+// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/form/src/table.vue?vue&type=template&id=0cd27751&
+var tablevue_type_template_id_0cd27751_render = function () {
   var _vm = this
   var _h = _vm.$createElement
   var _c = _vm._self._c || _h
@@ -3693,7 +3693,8 @@ var tablevue_type_template_id_b5a1829e_render = function () {
                                         class: {
                                           "es-align-middle": item.labelRow,
                                           "is-required":
-                                            _vm.required &&
+                                            item.rules &&
+                                            item.rules.required &&
                                             !_vm.hideRequiredAsterisk,
                                           "required-after": _vm.after,
                                         },
@@ -6180,10 +6181,10 @@ var tablevue_type_template_id_b5a1829e_render = function () {
   )
 }
 var staticRenderFns = []
-tablevue_type_template_id_b5a1829e_render._withStripped = true
+tablevue_type_template_id_0cd27751_render._withStripped = true
 
 
-// CONCATENATED MODULE: ./packages/form/src/table.vue?vue&type=template&id=b5a1829e&
+// CONCATENATED MODULE: ./packages/form/src/table.vue?vue&type=template&id=0cd27751&
 
 // EXTERNAL MODULE: ./src/utils/rules.js
 var rules = __webpack_require__(13);
@@ -7254,6 +7255,7 @@ var _extends = Object.assign || function (target) { for (var i = 1; i < argument
 //
 //
 //
+//
 
 
 
@@ -7573,7 +7575,7 @@ var componentNormalizer = __webpack_require__(3);
 
 var component = Object(componentNormalizer["a" /* default */])(
   src_tablevue_type_script_lang_js_,
-  tablevue_type_template_id_b5a1829e_render,
+  tablevue_type_template_id_0cd27751_render,
   staticRenderFns,
   false,
   null,

package/lib/tree-group.js

@@ -3499,7 +3499,7 @@ module.exports = require("json-bigint");
 // ESM COMPAT FLAG
 __webpack_require__.r(__webpack_exports__);
 
-// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/tree-group/src/main.vue?vue&type=template&id=6b5d4d48&
+// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/tree-group/src/main.vue?vue&type=template&id=eb2ece46&
 var render = function () {
   var _vm = this
   var _h = _vm.$createElement
@@ -3833,7 +3833,7 @@ var staticRenderFns = []
 render._withStripped = true
 
 
-// CONCATENATED MODULE: ./packages/tree-group/src/main.vue?vue&type=template&id=6b5d4d48&
+// CONCATENATED MODULE: ./packages/tree-group/src/main.vue?vue&type=template&id=eb2ece46&
 
 // EXTERNAL MODULE: ./src/utils/util.js
 var util = __webpack_require__(0);
@@ -4074,25 +4074,28 @@ var _extends = Object.assign || function (target) { for (var i = 1; i < argument
       return this.name ? this.name : util["a" /* default */].uuid(16);
     },
     method: function method() {
+      var src = this.src;
       this.refresh = false;
-      if (src.indexOf('//:') === 0) {
-        return 'wujie';
-      } else if (src.indexOf('dhtml') > -1 || src.indexOf('html') > -1 && src.indexOf('html#') === -1) {
-        return 'iframe';
-      } else {
-        var routes = this.$router.options.routes;
-        if (routes) {
-          var path = this.hasRouter(routes, src);
-          if (path) {
-            this.refresh = true;
-            var index = decodeURI(src).indexOf('?');
-            path = path + (index > -1 ? src.slice(index) : '');
-            this.$router.push(path);
-            return 'router';
+      if (src) {
+        if (src.indexOf('//:') === 0) {
+          return 'wujie';
+        } else if (src.indexOf('dhtml') > -1 || src.indexOf('html') > -1 && src.indexOf('html#') === -1) {
+          return 'iframe';
+        } else {
+          var routes = this.$router.options.routes;
+          if (routes) {
+            var path = this.hasRouter(routes, src);
+            if (path) {
+              this.refresh = true;
+              var index = decodeURI(src).indexOf('?');
+              path = path + (index > -1 ? src.slice(index) : '');
+              this.$router.push(path);
+              return 'router';
+            }
           }
+          this.refresh = true;
+          return 'wujie';
         }
-        this.refresh = true;
-        return 'wujie';
       }
     },
     param: function param() {
@@ -4184,7 +4187,7 @@ var _extends = Object.assign || function (target) { for (var i = 1; i < argument
       if (this.syncKeys === false) {
         return null;
       }
-      if (this.enterprise || this.tabs && this.tabs.length && this.tabs[Number(this.active)].enterprise) {
+      if (this.enterprise && JSON.stringify(this.enterprise) != '{}' || this.tabs && this.tabs.length && this.tabs[Number(this.active)].enterprise) {
         if (this.checkeds) {
           if (Array.isArray(this.checkeds)) {
             var creditCodes = [];
@@ -4206,6 +4209,7 @@ var _extends = Object.assign || function (target) { for (var i = 1; i < argument
         return null;
       } else {
         if (this.checkeds) {
+          debugger;
           var params = {};
           if (Array.isArray(this.checkeds)) {
             if (this.syncKeys && util["a" /* default */].isObject(this.syncKeys)) {

package/package.json

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

package/packages/flow/src/main.vue

@@ -442,7 +442,7 @@
       >
         <el-button
           v-show="isSubmitButtonShowAgreeAndDisagree != 1"
-          v-for="item of hideBtn? btnList.slice(0,1) : btnList"
+          v-for="item of hideBtn ? btnList.slice(0, 1) : btnList"
           :key="item.name"
           :type="item.type"
           :style="btnStyle"
@@ -457,17 +457,17 @@
             (!isFlow && (rejectObj.fun || pointsReadingObj.fun || moreList))
           "
           placement="top"
-          :class="{'em-flow-more-btn':!hideBtn}"
+          :class="{ 'em-flow-more-btn': !hideBtn }"
           trigger="click"
         >
           <div v-if="!isFlow && !hideBtn" class="es-footer-btn">
             <el-button
               v-if="rejectObj.fun"
               @click="rejectBtn"
-              style="margin-right:10px"
+              style="margin-right: 10px"
               type="danger"
             >
-               {{ rejectObj.value }}
+              {{ rejectObj.value }}
             </el-button>
             <el-button
               v-if="pointsReadingObj.fun"
@@ -484,7 +484,11 @@
               {{ item.value }}
             </el-button>
           </div>
-          <el-button-group slot="reference" style="margin: 0px 10px" v-if="hideBtn">
+          <el-button-group
+            slot="reference"
+            style="margin: 0px 10px"
+            v-if="hideBtn"
+          >
             <el-button
               v-show="isSubmitButtonShowAgreeAndDisagree != 1"
               v-for="item of btnList.slice(1)"
@@ -500,7 +504,7 @@
             <el-dropdown
               v-if="
                 !isFlow &&
-                (rejectObj.fun || pointsReadingObj.fun || moreList.length > 0) 
+                (rejectObj.fun || pointsReadingObj.fun || moreList.length > 0)
               "
               trigger="click"
               placement="top"
@@ -1199,7 +1203,10 @@ export default {
       util
         .ajax({
           url: findCodeValues,
-          params: { ccCode: 'notification_type',userId:util.getStorage('userId') }
+          params: {
+            ccCode: 'notification_type',
+            userId: util.getStorage('userId')
+          }
         })
         .then((res) => {
           const { status, data } = res;
@@ -1305,10 +1312,21 @@ export default {
      **/
     rejectBtn() {
       if (this.value === '') this.value = this.nodeDefaultRejectOpinion;
-      if (!this.value) {
-        return this.$message.warning('请填写意见');
+      if (this.beforeSubmit != undefined) {
+        this.beforeSubmit()
+          .then((next) => {
+            if (!this.value) {
+              return this.$message.warning('请填写意见');
+            }
+            this.showReject = true;
+          })
+          .catch((e) => {});
+      } else {
+        if (!this.value) {
+          return this.$message.warning('请填写意见');
+        }
+        this.showReject = true;
       }
-      this.showReject = true;
     },
     /**
      * taskReadBtn
@@ -1318,9 +1336,19 @@ export default {
      **/
     taskReadBtn() {
       // return this.$message.warning('暂未开放！敬请期待');
-      if (this.value === '') this.value = this.nodeDefaultRejectOpinion;
-      this.taskReadType = 'create';
-      this.showTaskRead = true;
+      if (this.beforeSubmit != undefined) {
+        this.beforeSubmit()
+          .then((next) => {
+            if (this.value === '') this.value = this.nodeDefaultRejectOpinion;
+            this.taskReadType = 'create';
+            this.showTaskRead = true;
+          })
+          .catch((e) => {});
+      } else {
+        if (this.value === '') this.value = this.nodeDefaultRejectOpinion;
+        this.taskReadType = 'create';
+        this.showTaskRead = true;
+      }
     },
     /**
      * getFind
@@ -1353,6 +1381,17 @@ export default {
      * @date 2022年5月25日
      **/
     endFlows(res) {
+      if (this.beforeSubmit != undefined) {
+        this.beforeSubmit()
+          .then((next) => {
+            this.saveEndFlows(res);
+          })
+          .catch((e) => {});
+      } else {
+        this.saveEndFlows(res);
+      }
+    },
+    saveEndFlows(res) {
       this.$confirm('确认' + res.value + '?')
         .then(() => {
           let params = {
@@ -1485,6 +1524,18 @@ export default {
      * @date 2022年9月29日
      **/
     toTakeAdvice(res) {
+      if (this.beforeSubmit != undefined) {
+        this.beforeSubmit()
+          .then((next) => {
+            this.saveToTakeAdvice(res);
+          })
+          .catch((e) => {});
+      } else {
+        this.saveToTakeAdvice(res);
+      }
+      // return this.$message.warning('暂未开放！敬请期待');
+    },
+    saveToTakeAdvice(res) {
       let params = {
         url: isCanStartSubFlow,
         data: {
@@ -1512,7 +1563,6 @@ export default {
             this.$message.error(err.message);
           }
         });
-      // return this.$message.warning('暂未开放！敬请期待');
     },
     /**
      * toStartDraf
@@ -1521,7 +1571,15 @@ export default {
      * @date 2022年9月29日
      **/
     toStartDraf(res) {
-      this.showTaskUnionExamine = true;
+      if (this.beforeSubmit != undefined) {
+        this.beforeSubmit()
+          .then((next) => {
+            this.showTaskUnionExamine = true;
+          })
+          .catch((e) => {});
+      } else {
+        this.showTaskUnionExamine = true;
+      }
     },
     /**
      * toSendMsg
@@ -1530,7 +1588,15 @@ export default {
      * @date 2022年9月29日
      **/
     toSendMsg(res) {
-      this.showSendMsg = true;
+      if (this.beforeSubmit != undefined) {
+        this.beforeSubmit()
+          .then((next) => {
+            this.showSendMsg = true;
+          })
+          .catch((e) => {});
+      } else {
+        this.showSendMsg = true;
+      }
     },
     /**
      * toTaskReadAndEnd
@@ -1539,9 +1605,19 @@ export default {
      * @date 2022年9月29日
      **/
     toTaskReadAndEnd(res) {
-      if (this.value === '') this.value = this.nodeDefaultRejectOpinion;
-      this.taskReadType = 'taskReadAndEnd';
-      this.showTaskRead = true;
+      if (this.beforeSubmit != undefined) {
+        this.beforeSubmit()
+          .then((next) => {
+            if (this.value === '') this.value = this.nodeDefaultRejectOpinion;
+            this.taskReadType = 'taskReadAndEnd';
+            this.showTaskRead = true;
+          })
+          .catch((e) => {});
+      } else {
+        if (this.value === '') this.value = this.nodeDefaultRejectOpinion;
+        this.taskReadType = 'taskReadAndEnd';
+        this.showTaskRead = true;
+      }
     },
     /**
      * rejectAndEnd
@@ -1550,6 +1626,17 @@ export default {
      * @date 2022年9月29日
      **/
     rejectAndEnd(res) {
+      if (this.beforeSubmit != undefined) {
+        this.beforeSubmit()
+          .then((next) => {
+            this.saveRejectAndEnd(res);
+          })
+          .catch((e) => {});
+      } else {
+        this.saveRejectAndEnd(res);
+      }
+    },
+    saveRejectAndEnd(res) {
       this.$confirm('确认' + res.value + '?')
         .then(() => {
           if (this.isOpinionRequired == 1 && (this.value == '' || !this.value))
@@ -1588,7 +1675,6 @@ export default {
         .catch(() => {
           // on cancel
         });
-      // return this.$message.warning('暂未开放！敬请期待');
     },
     /**
      * toTransfer
@@ -1597,9 +1683,17 @@ export default {
      * @date 2022年9月29日
      **/
     toTransfer(res) {
-      this.taskReadType = 'transfer';
-      this.showTaskRead = true;
-      // return this.$message.warning('暂未开放！敬请期待');
+      if (this.beforeSubmit != undefined) {
+        this.beforeSubmit()
+          .then((next) => {
+            this.taskReadType = 'transfer';
+            this.showTaskRead = true;
+          })
+          .catch((e) => {});
+      } else {
+        this.taskReadType = 'transfer';
+        this.showTaskRead = true;
+      }
     },
     /**
      * getNodeInfo

package/packages/flow/src/processForm.vue

@@ -482,7 +482,10 @@ export default {
       util
         .ajax({
           url: findCodeValues,
-          params: { ccCode: 'notification_type',userId:util.getStorage('userId') }
+          params: {
+            ccCode: 'notification_type',
+            userId: util.getStorage('userId')
+          }
         })
         .then((res) => {
           const { status, data } = res;
@@ -520,6 +523,9 @@ export default {
     },
     // 提交表单
     subProcess(formName) {
+      this.saveProcess(formName);
+    },
+    saveProcess(formName) {
       this.$refs[formName].validate((valid) => {
         if (valid) {
           const {

package/packages/flow/src/processReject.vue

@@ -148,7 +148,10 @@ export default {
     },
     // 提交表单
     subProcess(formName) {
-      this.$refs[formName].validate(valid => {
+      this.saveProcess(formName);
+    },
+    saveProcess(formName){
+       this.$refs[formName].validate(valid => {
         if (valid) {
           if (!this.option && this.isOpinionRequired === 1) {
             this.$message.warning('请选择输入审批意见');

package/packages/form/src/table.vue

@@ -99,7 +99,8 @@
                 class="es-table-form-label"
                 :class="{
                   'es-align-middle': item.labelRow,
-                  'is-required': required && !hideRequiredAsterisk,
+                  'is-required':
+                    item.rules && item.rules.required && !hideRequiredAsterisk,
                   'required-after': after
                 }"
                 :key="'label' + index"

package/packages/tree-group/src/main.vue

@@ -231,28 +231,31 @@ export default {
       return this.name ? this.name : util.uuid(16);
     },
     method() {
+      let src = this.src;
       this.refresh = false;
-      if (src.indexOf('//:') === 0) {
-        return 'wujie';
-      } else if (
-        src.indexOf('dhtml') > -1 ||
-        (src.indexOf('html') > -1 && src.indexOf('html#') === -1)
-      ) {
-        return 'iframe';
-      } else {
-        const routes = this.$router.options.routes;
-        if (routes) {
-          let path = this.hasRouter(routes, src);
-          if (path) {
-            this.refresh = true;
-            let index = decodeURI(src).indexOf('?');
-            path = path + (index > -1 ? src.slice(index) : '');
-            this.$router.push(path);
-            return 'router';
+      if (src) {
+        if (src.indexOf('//:') === 0) {
+          return 'wujie';
+        } else if (
+          src.indexOf('dhtml') > -1 ||
+          (src.indexOf('html') > -1 && src.indexOf('html#') === -1)
+        ) {
+          return 'iframe';
+        } else {
+          const routes = this.$router.options.routes;
+          if (routes) {
+            let path = this.hasRouter(routes, src);
+            if (path) {
+              this.refresh = true;
+              let index = decodeURI(src).indexOf('?');
+              path = path + (index > -1 ? src.slice(index) : '');
+              this.$router.push(path);
+              return 'router';
+            }
           }
+          this.refresh = true;
+          return 'wujie';
         }
-        this.refresh = true;
-        return 'wujie';
       }
     },
     param() {
@@ -309,7 +312,6 @@ export default {
         if (oldVal && val && val.url !== oldVal.url) {
           this.count++;
         }
-        
       },
       deep: true,
       immediate: true
@@ -354,7 +356,7 @@ export default {
         return null;
       }
       if (
-        this.enterprise ||
+        (this.enterprise && JSON.stringify(this.enterprise) != '{}') ||
         (this.tabs &&
           this.tabs.length &&
           this.tabs[Number(this.active)].enterprise)
@@ -380,6 +382,7 @@ export default {
         return null;
       } else {
         if (this.checkeds) {
+          debugger;
           let params = {};
           if (Array.isArray(this.checkeds)) {
             if (this.syncKeys && util.isObject(this.syncKeys)) {

package/src/index.js

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