eoss-ui 0.7.83 → 0.7.84

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

@@ -492,7 +492,7 @@ export default {
                     params.row.pendstate == 0 || params.row.pendstate == 3
                       ? 'red'
                       : params.row.pendstate == 1
-                      ? 'green'
+                      ? 'green' :  params.row.pendstate == -1 ? 'orange'
                       : 'deepskyblue'
                 },
                 domProps: { innerHTML: params.row.querykeywords }
@@ -602,7 +602,7 @@ export default {
               return h(
                 'span',
                 { style: 'color:deepskyblue;cursor: pointer;' },
-                params.row.pressTimes
+                params.row.pressTimes != 0 ? params.row.pressTimes : ''
               );
             }
           },
@@ -668,7 +668,7 @@ export default {
                     params.row.pendstate == 0 || params.row.pendstate == 3
                       ? 'red'
                       : params.row.pendstate == 1
-                      ? 'green'
+                      ? 'green':  params.row.pendstate == -1 ? 'orange'
                       : 'deepskyblue'
                 },
                 domProps: { innerHTML: params.row.querykeywords }
@@ -778,7 +778,7 @@ export default {
               return h(
                 'span',
                 { style: 'color:deepskyblue;cursor: pointer;' },
-                params.row.pressTimes
+                params.row.pressTimes != 0 ? params.row.pressTimes : ''
               );
             }
           },
@@ -845,7 +845,7 @@ export default {
                     params.row.pendstate == 0 || params.row.pendstate == 3
                       ? 'red'
                       : params.row.pendstate == 1
-                      ? 'green'
+                      ? 'green':  params.row.pendstate == -1 ? 'orange'
                       : 'deepskyblue',
                   cursor: this.hasCircularReadWithdrawAuthority
                     ? 'pointer'
@@ -1388,7 +1388,9 @@ export default {
       if (column.property == 'hasAdjunct' && row.hasAdjunct) {
         this.showFile(row.wfpendingid);
       } else if (column.property == 'pressTimes') {
-        this.goPress(row.id);
+        if(row.pressTimes != 0){
+          this.goPress(row.id);
+        }
       } else if (
         column.property == 'pendstate' &&
         this.hasCircularReadWithdrawAuthority

package/packages/form/index.js

@@ -1,5 +1,5 @@
-import EsForm from './src/main';
-
-EsForm.install = Vue => Vue.component(EsForm.name, EsForm);
-
-export default EsForm;
+import EsForm from './src/main';
+
+EsForm.install = Vue => Vue.component(EsForm.name, EsForm);
+
+export default EsForm;

package/packages/form/src/main.vue

@@ -3553,7 +3553,7 @@ export default {
     clearValidate() {
       this.$refs.esForm && this.$refs.esForm.clearValidate();
     },
-    submitData(handle, close = true, type, validate = true) {
+    submitData(handle, close = true, type, validate = true, code) {
       if (this.readonly) {
         return Promise.resolve();
       }

package/packages/handle-user/index.js

@@ -1,5 +1,5 @@
-import EsHandleUser from './src/main';
-
-EsHandleUser.install = Vue => Vue.component(EsHandleUser.name, EsHandleUser);
-
-export default EsHandleUser;
+import EsHandleUser from './src/main';
+
+EsHandleUser.install = Vue => Vue.component(EsHandleUser.name, EsHandleUser);
+
+export default EsHandleUser;

package/packages/handler/index.js

@@ -1,5 +1,5 @@
-import EsHandler from './src/main';
-
-EsHandler.install = Vue => Vue.component(EsHandler.name, EsHandler);
-
-export default EsHandler;
+import EsHandler from './src/main';
+
+EsHandler.install = Vue => Vue.component(EsHandler.name, EsHandler);
+
+export default EsHandler;

package/packages/icon/index.js

@@ -1,5 +1,5 @@
-import EsIcon from './src/main';
-
-EsIcon.install = Vue => Vue.component(EsIcon.name, EsIcon);
-
-export default EsIcon;
+import EsIcon from './src/main';
+
+EsIcon.install = Vue => Vue.component(EsIcon.name, EsIcon);
+
+export default EsIcon;

package/packages/icons/index.js

@@ -1,5 +1,5 @@
-import EsIcons from './src/main';
-
-EsIcons.install = Vue => Vue.component(EsIcons.name, EsIcons);
-
-export default EsIcons;
+import EsIcons from './src/main';
+
+EsIcons.install = Vue => Vue.component(EsIcons.name, EsIcons);
+
+export default EsIcons;

package/packages/icons/src/main.vue

@@ -1,81 +1,81 @@
-<template>
-  <div class="es-icons" :class="{ 'es-icon-readonly': readonly }">
-    <el-input
-      v-if="!readonly"
-      v-bind="$attrs"
-      v-on="$listeners"
-      :placeholder="placeholder"
-      readonly
-      v-model="model"
-    >
-      <i class="es-iconfont" :class="model" slot="prepend" v-if="model"></i>
-      <el-button slot="suffix" type="primary" size="small" @click="handleClick"
-        >选择</el-button
-      >
-    </el-input>
-    <i class="es-iconfont" :class="model" slot="prepend" v-else></i>
-    <es-dialog title="选择图标" :visible.sync="visible">
-      <el-scrollbar class="es-scrollbar" ref="scrollbar">
-        <ul class="es-icon-list">
-          <li v-for="name in list" :key="name" @click.stop="handleSelect(name)">
-            <span>
-              <i :class="'es-icon-' + name"></i>
-              <span class="icon-name">{{ 'es-icon-' + name }}</span>
-            </span>
-          </li>
-        </ul>
-      </el-scrollbar>
-    </es-dialog>
-  </div>
-</template>
-<script>
-import icon from './icon.json';
-export default {
-  name: 'EsIcons',
-  inheritAttrs: false,
-  props: {
-    value: String,
-    placeholder: {
-      type: String,
-      default: '请选择图标'
-    },
-    label: '',
-    readonly: Boolean
-  },
-  computed: {
-    model: {
-      get() {
-        return this.value ? this.value : this.icon;
-      },
-      set(val) {
-        return val;
-      }
-    }
-  },
-  watch: {
-    model(val) {
-      this.$emit('change', val);
-    }
-  },
-  data() {
-    return {
-      list: icon,
-      icon: null,
-      visible: false
-    };
-  },
-  created() {
-    //this.loadsub(this.param);
-  },
-  methods: {
-    handleClick() {
-      this.visible = true;
-    },
-    handleSelect(name) {
-      this.$emit('input', `es-icon-${name}`);
-      this.icon = `es-icon-${name}`;
-      this.visible = false;
-    }
-  }
-};
-</script>
+<template>
+  <div class="es-icons" :class="{ 'es-icon-readonly': readonly }">
+    <el-input
+      v-if="!readonly"
+      v-bind="$attrs"
+      v-on="$listeners"
+      :placeholder="placeholder"
+      readonly
+      v-model="model"
+    >
+      <i class="es-iconfont" :class="model" slot="prepend" v-if="model"></i>
+      <el-button slot="suffix" type="primary" size="small" @click="handleClick"
+        >选择</el-button
+      >
+    </el-input>
+    <i class="es-iconfont" :class="model" slot="prepend" v-else></i>
+    <es-dialog title="选择图标" :visible.sync="visible">
+      <el-scrollbar class="es-scrollbar" ref="scrollbar">
+        <ul class="es-icon-list">
+          <li v-for="name in list" :key="name" @click.stop="handleSelect(name)">
+            <span>
+              <i :class="'es-icon-' + name"></i>
+              <span class="icon-name">{{ 'es-icon-' + name }}</span>
+            </span>
+          </li>
+        </ul>
+      </el-scrollbar>
+    </es-dialog>
+  </div>
+</template>
+<script>
+import icon from './icon.json';
+export default {
+  name: 'EsIcons',
+  inheritAttrs: false,
+  props: {
+    value: String,
+    placeholder: {
+      type: String,
+      default: '请选择图标'
+    },
+    label: '',
+    readonly: Boolean
+  },
+  computed: {
+    model: {
+      get() {
+        return this.value ? this.value : this.icon;
+      },
+      set(val) {
+        return val;
+      }
+    }
+  },
+  watch: {
+    model(val) {
+      this.$emit('change', val);
+    }
+  },
+  data() {
+    return {
+      list: icon,
+      icon: null,
+      visible: false
+    };
+  },
+  created() {
+    //this.loadsub(this.param);
+  },
+  methods: {
+    handleClick() {
+      this.visible = true;
+    },
+    handleSelect(name) {
+      this.$emit('input', `es-icon-${name}`);
+      this.icon = `es-icon-${name}`;
+      this.visible = false;
+    }
+  }
+};
+</script>

package/packages/input/index.js

@@ -1,5 +1,5 @@
-import EsInput from './src/main';
-
-EsInput.install = Vue => Vue.component(EsInput.name, EsInput);
-
-export default EsInput;
+import EsInput from './src/main';
+
+EsInput.install = Vue => Vue.component(EsInput.name, EsInput);
+
+export default EsInput;