eoss-ui 0.4.66 → 0.4.68

package/lib/upload.js

@@ -82,7 +82,7 @@ module.exports =
 /******/
 /******/
 /******/ 	// Load entry module and return exports
-/******/ 	return __webpack_require__(__webpack_require__.s = 35);
+/******/ 	return __webpack_require__(__webpack_require__.s = 32);
 /******/ })
 /************************************************************************/
 /******/ ({
@@ -91,14 +91,14 @@ module.exports =
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
-/* harmony import */ var _config_api__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(1);
+/* harmony import */ var _config_api__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(2);
 /* harmony import */ var axios__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(5);
 /* harmony import */ var axios__WEBPACK_IMPORTED_MODULE_1___default = /*#__PURE__*/__webpack_require__.n(axios__WEBPACK_IMPORTED_MODULE_1__);
 /* harmony import */ var qs__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(4);
 /* harmony import */ var qs__WEBPACK_IMPORTED_MODULE_2___default = /*#__PURE__*/__webpack_require__.n(qs__WEBPACK_IMPORTED_MODULE_2__);
 /* harmony import */ var json_bigint__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(6);
 /* harmony import */ var json_bigint__WEBPACK_IMPORTED_MODULE_3___default = /*#__PURE__*/__webpack_require__.n(json_bigint__WEBPACK_IMPORTED_MODULE_3__);
-/* harmony import */ var eoss_element__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(2);
+/* harmony import */ var eoss_element__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(1);
 /* harmony import */ var eoss_element__WEBPACK_IMPORTED_MODULE_4___default = /*#__PURE__*/__webpack_require__.n(eoss_element__WEBPACK_IMPORTED_MODULE_4__);
 var _typeof = typeof Symbol === "function" && typeof Symbol.iterator === "symbol" ? function (obj) { return typeof obj; } : function (obj) { return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; };
 
@@ -2407,6 +2407,13 @@ var watermark = function watermark(option) {
 /***/ }),
 
 /***/ 1:
+/***/ (function(module, exports) {
+
+module.exports = require("eoss-element");
+
+/***/ }),
+
+/***/ 2:
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
@@ -2746,13 +2753,6 @@ var formContents = '/config/admin/online/onlineForm/render';
 
 /***/ }),
 
-/***/ 2:
-/***/ (function(module, exports) {
-
-module.exports = require("eoss-element");
-
-/***/ }),
-
 /***/ 3:
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
@@ -2858,7 +2858,7 @@ function normalizeComponent(
 
 /***/ }),
 
-/***/ 35:
+/***/ 32:
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
@@ -3252,7 +3252,7 @@ mainvue_type_template_id_54a88f24_render._withStripped = true
 // CONCATENATED MODULE: ./packages/upload/src/main.vue?vue&type=template&id=54a88f24&
 
 // EXTERNAL MODULE: ./src/config/api.js
-var api = __webpack_require__(1);
+var api = __webpack_require__(2);
 
 // EXTERNAL MODULE: ./src/utils/util.js
 var util = __webpack_require__(0);

package/lib/wujie.js

@@ -82,7 +82,7 @@ module.exports =
 /******/
 /******/
 /******/ 	// Load entry module and return exports
-/******/ 	return __webpack_require__(__webpack_require__.s = 65);
+/******/ 	return __webpack_require__(__webpack_require__.s = 63);
 /******/ })
 /************************************************************************/
 /******/ ({
@@ -91,14 +91,14 @@ module.exports =
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
-/* harmony import */ var _config_api__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(1);
+/* harmony import */ var _config_api__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(2);
 /* harmony import */ var axios__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(5);
 /* harmony import */ var axios__WEBPACK_IMPORTED_MODULE_1___default = /*#__PURE__*/__webpack_require__.n(axios__WEBPACK_IMPORTED_MODULE_1__);
 /* harmony import */ var qs__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(4);
 /* harmony import */ var qs__WEBPACK_IMPORTED_MODULE_2___default = /*#__PURE__*/__webpack_require__.n(qs__WEBPACK_IMPORTED_MODULE_2__);
 /* harmony import */ var json_bigint__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(6);
 /* harmony import */ var json_bigint__WEBPACK_IMPORTED_MODULE_3___default = /*#__PURE__*/__webpack_require__.n(json_bigint__WEBPACK_IMPORTED_MODULE_3__);
-/* harmony import */ var eoss_element__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(2);
+/* harmony import */ var eoss_element__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(1);
 /* harmony import */ var eoss_element__WEBPACK_IMPORTED_MODULE_4___default = /*#__PURE__*/__webpack_require__.n(eoss_element__WEBPACK_IMPORTED_MODULE_4__);
 var _typeof = typeof Symbol === "function" && typeof Symbol.iterator === "symbol" ? function (obj) { return typeof obj; } : function (obj) { return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; };
 
@@ -2407,6 +2407,13 @@ var watermark = function watermark(option) {
 /***/ }),
 
 /***/ 1:
+/***/ (function(module, exports) {
+
+module.exports = require("eoss-element");
+
+/***/ }),
+
+/***/ 2:
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
@@ -2746,13 +2753,6 @@ var formContents = '/config/admin/online/onlineForm/render';
 
 /***/ }),
 
-/***/ 2:
-/***/ (function(module, exports) {
-
-module.exports = require("eoss-element");
-
-/***/ }),
-
 /***/ 3:
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
@@ -2879,7 +2879,7 @@ module.exports = require("json-bigint");
 
 /***/ }),
 
-/***/ 65:
+/***/ 63:
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";

package/lib/wxlogin.js

@@ -82,7 +82,7 @@ module.exports =
 /******/
 /******/
 /******/ 	// Load entry module and return exports
-/******/ 	return __webpack_require__(__webpack_require__.s = 66);
+/******/ 	return __webpack_require__(__webpack_require__.s = 64);
 /******/ })
 /************************************************************************/
 /******/ ({
@@ -91,14 +91,14 @@ module.exports =
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
-/* harmony import */ var _config_api__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(1);
+/* harmony import */ var _config_api__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(2);
 /* harmony import */ var axios__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(5);
 /* harmony import */ var axios__WEBPACK_IMPORTED_MODULE_1___default = /*#__PURE__*/__webpack_require__.n(axios__WEBPACK_IMPORTED_MODULE_1__);
 /* harmony import */ var qs__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(4);
 /* harmony import */ var qs__WEBPACK_IMPORTED_MODULE_2___default = /*#__PURE__*/__webpack_require__.n(qs__WEBPACK_IMPORTED_MODULE_2__);
 /* harmony import */ var json_bigint__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(6);
 /* harmony import */ var json_bigint__WEBPACK_IMPORTED_MODULE_3___default = /*#__PURE__*/__webpack_require__.n(json_bigint__WEBPACK_IMPORTED_MODULE_3__);
-/* harmony import */ var eoss_element__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(2);
+/* harmony import */ var eoss_element__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(1);
 /* harmony import */ var eoss_element__WEBPACK_IMPORTED_MODULE_4___default = /*#__PURE__*/__webpack_require__.n(eoss_element__WEBPACK_IMPORTED_MODULE_4__);
 var _typeof = typeof Symbol === "function" && typeof Symbol.iterator === "symbol" ? function (obj) { return typeof obj; } : function (obj) { return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; };
 
@@ -2407,6 +2407,13 @@ var watermark = function watermark(option) {
 /***/ }),
 
 /***/ 1:
+/***/ (function(module, exports) {
+
+module.exports = require("eoss-element");
+
+/***/ }),
+
+/***/ 2:
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
@@ -2746,13 +2753,6 @@ var formContents = '/config/admin/online/onlineForm/render';
 
 /***/ }),
 
-/***/ 2:
-/***/ (function(module, exports) {
-
-module.exports = require("eoss-element");
-
-/***/ }),
-
 /***/ 3:
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
@@ -2879,7 +2879,7 @@ module.exports = require("json-bigint");
 
 /***/ }),
 
-/***/ 66:
+/***/ 64:
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";

package/package.json

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

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

@@ -60,6 +60,14 @@ import util from 'eoss-ui/src/utils/util';
 export default {
   name: 'EsCheckboxGroup',
   inheritAttrs: false,
+  inject: {
+    esForm: {
+      default: ''
+    },
+    sysCodes: {
+      default: ''
+    }
+  },
   props: {
     method: {
       type: String,
@@ -121,11 +129,13 @@ export default {
     isNoParamRequest: {
       type: Boolean,
       default: true
-    }
+    },
+    dataKey: String
   },
   data() {
     return {
-      options: ''
+      options: '',
+      canceled: false
     };
   },
   computed: {
@@ -216,6 +226,27 @@ export default {
       handler() {
         this.url && this.getData(this.url);
       }
+    },
+    sysCodes: {
+      deep: true,
+      handler(val) {
+        if (
+          this.canceled &&
+          val &&
+          ((this.sysCode && val[this.sysCode]) ||
+            (this.dataKey && val[this.dataKey]))
+        ) {
+          if (this.parseData) {
+            this.options = this.parseData(
+              JSON.parse(JSON.stringify(val[this.sysCode || this.dataKey]))
+            );
+          } else {
+            this.options = JSON.parse(
+              JSON.stringify(val[this.sysCode || this.dataKey])
+            );
+          }
+        }
+      }
     }
   },
   created() {},
@@ -248,9 +279,15 @@ export default {
         })
         .then((res) => {
           this.loading = false;
+          this.canceled = false;
           if (res.rCode === 0) {
             this.options = JSON.parse(JSON.stringify(res.results));
-            if (sysCode) {
+            if (sysCode || this.dataKey) {
+              this.esForm &&
+                this.esForm.setSysCodes(
+                  sysCode || this.dataKey,
+                  JSON.parse(JSON.stringify(this.options))
+                );
               store.set(sysCode, JSON.parse(JSON.stringify(res.results)));
             }
           } else {
@@ -260,8 +297,13 @@ export default {
         })
         .catch((err) => {
           this.loading = false;
-          if (err.message && err.message !== 'canceled') {
-            this.$message.error(err.message);
+          if (err.message) {
+            if (err.message !== 'canceled') {
+              this.$message.error(err.message);
+            }
+            if (err.message === 'canceled' && sysCode) {
+              this.canceled = true;
+            }
           }
         });
     },

package/packages/flow/src/processForm.vue

@@ -184,9 +184,6 @@
         <el-form-item
           prop="noticeType"
           label="通知方式"
-          :rules="[
-            { required: true, message: `请选择通知方式`, trigger: 'blur' }
-          ]"
         >
           <el-checkbox-group v-model="nextNode.noticeType">
             <el-checkbox

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

@@ -387,6 +387,7 @@
     <es-flow
       v-if="isShow"
       class="es-group-flow"
+      :pendingId="pendingId"
       v-bind="flow"
       :style="{ width: _width }"
       :before-submit="handleSubmit"
@@ -484,8 +485,9 @@ export default {
     }
   },
   mounted() {
-    if (this.flow.businessId) {
-      this.businessId = this.flow.businessId;
+    if (this.pendingId || this.flow.pendingId || this.flow.businessId) {
+      this.businessId =
+        this.pendingId || this.flow.pendingId || this.flow.businessId;
     }
   },
   methods: {

package/packages/flow-list/src/main.vue

@@ -85,103 +85,7 @@
       >
       </es-form>
     </es-dialog>
-    <!-- <div
-      v-if="hide.indexOf('flow') == -1"
-      :class="
-        fyTableList != undefined && fyTableList.length != 0
-          ? 'preset-list'
-          : 'preset-list-tow'
-      "
-      style="flex: 1"
-    >
-      <div class="es-toolbar" >
-        流程列表
-        <div v-if="isShort != 1" style="display:inline-block;margin-left:10px">
-         
-          <el-radio-group
-            class="list-radio"
-            v-model="showSuggest"
-            @input="handleChange"
-          >
-            <el-radio label="all">显示全部</el-radio>
-            <el-radio label="have">显示已填意见</el-radio>
-          </el-radio-group>
-           <es-select
-            v-model="viewType"
-            placeholder="请选择"
-            @change="handleChange"
-          >
-            <el-option
-              v-for="item in options"
-              :key="item.value"
-              :label="item.label"
-              :value="item.value"
-            >
-            </el-option>
-          </es-select>
-        </div>
-      </div>
-      <FlowTable
-        v-if="show"
-        style="height: calc(100% - 60px)"
-        :data="flowTableList"
-        :modify="modify"
-        :toolbar="newToolbar"
-        :fileStyle="attachmentPaperClipCssStyle"
-        v-bind="flowTableInfo"
-        @success="handleChange"
-      />
-    </div>
-    <div
-      v-if="
-        fyTableList != undefined &&
-        fyTableList.length != 0 &&
-        show &&
-        hide.indexOf('splitReading') == -1
-      "
-      :class="'preset-list'"
-      :style="hide.indexOf('preset') != -1 ? 'flex:1' : ''"
-    >
-      <FlowTable
-        style="height: calc(100% - 40px)"
-        :toolbar="[
-          {
-            type: 'text',
-            contents: (taskReadName ? taskReadName : '非流程') + '列表'
-          }
-        ]"
-        :data="fyTableList"
-        v-bind="flowTableInfo"
-        @success="handleChange"
-      />
-    </div>
-    <div
-      v-if="show && hide.indexOf('preset') == -1"
-      :class="
-        fyTableList != undefined && fyTableList.length != 0
-          ? 'preset-list'
-          : 'preset-list-tow'
-      "
-      :style="
-        fyTableList != undefined && fyTableList.length != 0 ? '' : 'flex:1'
-      "
-    >
-      <es-data-table
-        numbers
-        :data="presetData"
-        :thead="thead"
-        :toolbar="[
-          {
-            type: 'text',
-            contents: '预设列表'
-          }
-        ]"
-        stripe
-        full
-        style="width: 100%"
-        @btnClick="handleClick"
-      />
-    </div> -->
+    
   </div>
 </template>
 
@@ -195,12 +99,10 @@ import {
   deleteFlow
 } from 'eoss-ui/src/config/api';
 import FileList from '../../flow/src/component/FileList.vue';
-import FlowTable from './flow-table.vue';
 import util from 'eoss-ui/src/utils/util';
 export default {
   name: 'EsFlowList',
   components: {
-    [FlowTable.name]: FlowTable,
     [FileList.name]: FileList
   },
   props: {

package/packages/form/src/main.vue

@@ -3766,7 +3766,8 @@ export default {
   inheritAttrs: false,
   provide() {
     return {
-      esForm: this
+      esForm: this,
+      sysCodes: this.sysCodes
     };
   },
   inject: {
@@ -3939,7 +3940,8 @@ export default {
       newHeight: null,
       uuid: util.uuid(32),
       dialog: false,
-      refresh: true
+      refresh: true,
+      sysCodes: {}
     };
   },
   computed: {
@@ -5022,6 +5024,9 @@ export default {
         data: data,
         attrs: attrs
       });
+    },
+    setSysCodes(name, value) {
+      this.$set(this.sysCodes, name, value);
     }
   }
 };