eoss-ui 0.4.81 → 0.4.82

package/lib/layout.js

@@ -206,7 +206,7 @@ function normalizeComponent(
 // 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/layout/src/main.vue?vue&type=template&id=6868aa00&
+// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/layout/src/main.vue?vue&type=template&id=3f931032&
 var render = function () {
   var _vm = this
   var _h = _vm.$createElement
@@ -214,18 +214,32 @@ var render = function () {
   return _c(
     "div",
     { staticClass: "es-layout" },
-    [_c("layout-item"), _c("layout-item", { attrs: { top: "100px" } })],
-    1
+    [
+      _c("layout-item"),
+      _c("layout-item", { attrs: { top: "100px" } }),
+      _vm._l(_vm.contents, function (item, index) {
+        return _c(
+          "layout-item",
+          _vm._b(
+            { key: item.id || index },
+            "layout-item",
+            Object.assign({}, item, { disabled: _vm.disabled }),
+            false
+          )
+        )
+      }),
+    ],
+    2
   )
 }
 var staticRenderFns = []
 render._withStripped = true
 
 
-// CONCATENATED MODULE: ./packages/layout/src/main.vue?vue&type=template&id=6868aa00&
+// CONCATENATED MODULE: ./packages/layout/src/main.vue?vue&type=template&id=3f931032&
 
-// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/layout/src/item.vue?vue&type=template&id=4b100112&
-var itemvue_type_template_id_4b100112_render = function () {
+// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/layout/src/item.vue?vue&type=template&id=3bdfff8c&
+var itemvue_type_template_id_3bdfff8c_render = function () {
   var _vm = this
   var _h = _vm.$createElement
   var _c = _vm._self._c || _h
@@ -246,11 +260,11 @@ var itemvue_type_template_id_4b100112_render = function () {
     1
   )
 }
-var itemvue_type_template_id_4b100112_staticRenderFns = []
-itemvue_type_template_id_4b100112_render._withStripped = true
+var itemvue_type_template_id_3bdfff8c_staticRenderFns = []
+itemvue_type_template_id_3bdfff8c_render._withStripped = true
 
 
-// CONCATENATED MODULE: ./packages/layout/src/item.vue?vue&type=template&id=4b100112&
+// CONCATENATED MODULE: ./packages/layout/src/item.vue?vue&type=template&id=3bdfff8c&
 
 // EXTERNAL MODULE: external "interactjs"
 var external_interactjs_ = __webpack_require__(14);
@@ -361,13 +375,22 @@ var external_interactjs_default = /*#__PURE__*/__webpack_require__.n(external_in
       }
     });
     this.interaction.resizable({
-      modifiers: [external_interactjs_default.a.modifiers.restrictSize({
-        min: { width: 100, height: 100 },
-        max: { width: this.$parent.$el.offsetWidth }
+      modifiers: [
+      // keep the edges inside the parent
+      external_interactjs_default.a.modifiers.restrictEdges({
+        outer: 'parent'
+      }),
+
+      // minimum size
+      external_interactjs_default.a.modifiers.restrictSize({
+        min: { width: 100, height: 100 }
       })],
+
+      //inertia: true,
       edges: { top: true, left: true, bottom: true, right: true },
       listeners: {
         move: function move(event) {
+          console.log(1212);
           var _event$target$dataset = event.target.dataset,
               x = _event$target$dataset.x,
               y = _event$target$dataset.y;
@@ -406,8 +429,8 @@ var componentNormalizer = __webpack_require__(2);
 
 var component = Object(componentNormalizer["a" /* default */])(
   src_itemvue_type_script_lang_js_,
-  itemvue_type_template_id_4b100112_render,
-  itemvue_type_template_id_4b100112_staticRenderFns,
+  itemvue_type_template_id_3bdfff8c_render,
+  itemvue_type_template_id_3bdfff8c_staticRenderFns,
   false,
   null,
   null,
@@ -423,12 +446,20 @@ var component = Object(componentNormalizer["a" /* default */])(
 //
 //
 //
+//
+//
+//
+//
+//
 
 
 /* harmony default export */ var mainvue_type_script_lang_js_ = ({
   name: 'EsLayout',
   components: { layoutItem: item },
-  props: {},
+  props: {
+    contents: Array,
+    disabled: Boolean
+  },
   computed: {},
   watch: {},
   data: function data() {

package/lib/main.js

@@ -3431,7 +3431,7 @@ module.exports = require("stompjs");
 // 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/main/src/main.vue?vue&type=template&id=0c933a5f&
+// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/main/src/main.vue?vue&type=template&id=4b1d4233&
 var render = function () {
   var _vm = this
   var _h = _vm.$createElement
@@ -3861,7 +3861,7 @@ var staticRenderFns = []
 render._withStripped = true
 
 
-// CONCATENATED MODULE: ./packages/main/src/main.vue?vue&type=template&id=0c933a5f&
+// CONCATENATED MODULE: ./packages/main/src/main.vue?vue&type=template&id=4b1d4233&
 
 // CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/main/src/userinfo.vue?vue&type=template&id=799780ee&
 var userinfovue_type_template_id_799780ee_render = function () {
@@ -7188,6 +7188,7 @@ var log = util["a" /* default */].getParams('console');
           util["a" /* default */].win.open(res.path, '_blank');
           break;
       }
+      this.$emit('handler-click', res);
     },
 
     //刷新子页面、子路由

package/package.json

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

package/packages/flow/src/main.vue

@@ -2255,6 +2255,7 @@ export default {
             this.value = this.value.replace(RegExp('同意。', 'g'), '');
             this.value = val + this.value;
           }
+          if(!this.validInfo()) return
           if (this.beforeSubmit == undefined) {
             this.subFun(this.sendData);
           } else {
@@ -2267,12 +2268,8 @@ export default {
         }
       });
     },
-    validInfo() {},
-    sendData() {
-      this.$refs['nextNode'].validate(async (valid) => {
-        if (valid) {
-          if (this.isFlow) return (this.handleVisible = true);
-          if (
+    validInfo() {
+       if (
             !this.endFlow &&
             this.newTypeCode != 'fenyue' &&
             !this.shrink &&
@@ -2288,33 +2285,52 @@ export default {
                 this.nextNode.nextUserId == '' ||
                 (this.multiple && this.nextNode.nextUserId.length == 0)
               ) {
-                return this.$message.warning('请选择下步办理人');
+              this.$message.warning('请选择下步办理人');
+                return false
               }
             } else {
               if (
                 this.nextNode.nextOrgId == '' ||
                 (this.multiple && this.nextNode.nextOrgId.length == 0)
               ) {
-                return this.$message.warning('请选择办理对象');
+                 this.$message.warning('请选择办理对象');
+                return false
               }
             }
           }
 
-          let nextUserId = [];
-          if (this.multiple) {
-            this.nextNode.nextUserId &&
-              this.nextNode.nextUserId.map((item) => nextUserId.push(item));
-          }
           if (
             this.nextNode.isAddSign == '1' &&
             this.nextNode.addSignUserId.length == 0
           )
-            return this.$message.warning('请选择加签办理人');
+            {this.$message.warning('请选择加签办理人');
+                return false}
           if (
             this.nextNode.isRemoveSign == '1' &&
             this.nextNode.removeSignUserId.length == 0
-          )
-            return this.$message.warning('请选择减签办理人');
+          ){
+           this.$message.warning('请选择减签办理人');
+                return false
+            }
+          if (!this.value && this.isOpinionRequired === 1) {
+            this.$message.warning('请选择输入审批意见');
+            return false;
+          }
+          if (this.isHideCurrentOrg && !this.nextNode.nextCurrentOrgObjJson) {
+            this.$message.warning(`请选择${this.currentOrgName || '本单位'}`);
+            return false;
+          }
+          return true
+    },
+    sendData() {
+      this.$refs['nextNode'].validate(async (valid) => {
+        if (valid) {
+          if (this.isFlow) return (this.handleVisible = true);
+          let nextUserId = [];
+          if (this.multiple) {
+            this.nextNode.nextUserId &&
+              this.nextNode.nextUserId.map((item) => nextUserId.push(item));
+          }
           let addSignUserId = [];
           if (this.isCanAddSign && this.nextNode.isAddSign == '1') {
             this.nextNode.addSignUserId.map((item) => {
@@ -2327,14 +2343,6 @@ export default {
               removeSignUserId.push(item);
             });
           }
-          if (!this.value && this.isOpinionRequired === 1) {
-            this.$message.warning('请选择输入审批意见');
-            return;
-          }
-          if (this.isHideCurrentOrg && !this.nextNode.nextCurrentOrgObjJson) {
-            this.$message.warning(`请选择${this.currentOrgName || '本单位'}`);
-            return;
-          }
           let str = '';
           if (this.value) {
             str = this.value.replace(/\s+/g, '');

package/packages/form/src/main.vue

@@ -4845,7 +4845,10 @@ export default {
                   .then((res) => {
                     loading && loading.close();
                     if (res.rCode === 0) {
-                      this.$message.success(res.msg || res.message || '成功！');
+                      this.showMsg &&
+                        this.$message.success(
+                          res.msg || res.message || '成功！'
+                        );
                       this.$emit('success', res, models);
                       this.models = {};
                       if (this.esTabs) {

package/packages/layout/src/item.vue

@@ -103,14 +103,22 @@ export default {
     });
     this.interaction.resizable({
       modifiers: [
+        // keep the edges inside the parent
+        interact.modifiers.restrictEdges({
+          outer: 'parent'
+        }),
+
+        // minimum size
         interact.modifiers.restrictSize({
-          min: { width: 100, height: 100 },
-          max: { width: this.$parent.$el.offsetWidth }
+          min: { width: 100, height: 100 }
         })
       ],
+
+      //inertia: true,
       edges: { top: true, left: true, bottom: true, right: true },
       listeners: {
         move: function (event) {
+          console.log(1212);
           let { x, y } = event.target.dataset;
 
           x = (parseFloat(x) || 0) + event.deltaRect.left;

package/packages/layout/src/main.vue

@@ -2,6 +2,11 @@
   <div class="es-layout">
     <layout-item></layout-item>
     <layout-item top="100px"></layout-item>
+    <layout-item
+      v-for="(item, index) in contents"
+      :key="item.id || index"
+      v-bind="{ ...item, disabled: disabled }"
+    ></layout-item>
   </div>
 </template>
 <script>
@@ -9,7 +14,10 @@ import layoutItem from './item.vue';
 export default {
   name: 'EsLayout',
   components: { layoutItem },
-  props: {},
+  props: {
+    contents: Array,
+    disabled: Boolean
+  },
   computed: {},
   watch: {},
   data() {

package/packages/main/src/main.vue

@@ -1594,6 +1594,7 @@ export default {
           util.win.open(res.path, '_blank');
           break;
       }
+      this.$emit('handler-click', res);
     },
     //刷新子页面、子路由
     handleRefresh() {

package/src/index.js

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