sohelp-eleplus 1.1.24 → 1.1.26

package/sohelp-table/index.vue

@@ -9,10 +9,11 @@
     :where="where"
     :show-overflow-tooltip="true"
     v-model:selections="selections"
-    highlight-current-row>
+    highlight-current-row
+  >
     <slot>
       <template v-for="(slotProps, slotName) in $scopedSlots" :key="slotName">
-        <slot :name="slotName" v-bind="slotProps"/>
+        <slot :name="slotName" v-bind="slotProps" />
       </template>
     </slot>
     <template #toolbar="{ row }">
@@ -25,127 +26,124 @@
   </ele-pro-table>
 </template>
 <script>
-import {reactive, ref} from 'vue';
-import {moduleCache} from '../cache/ModuleCache';
-import {EleMessage} from "@/components/ele-admin-plus/components";
+  import { reactive, ref } from 'vue';
+  import { moduleCache } from '../cache/ModuleCache';
+  import { EleMessage } from '@/components/ele-admin-plus/components';
 
-
-export default {
-  name: "SohelpTable",
-  props: {
-    /**网格列表配置ID*/
-    refid: {
-      type: String,
-      default: "",
-      required: true
-    },
-    /**数据源URL**/
-    url: {
-      type: String,
-      default: ""
+  export default {
+    name: 'SohelpTable',
+    props: {
+      /**网格列表配置ID*/
+      refid: {
+        type: String,
+        default: '',
+        required: true
+      },
+      /**数据源URL**/
+      url: {
+        type: String,
+        default: ''
+      },
+      /**数据源URL**/
+      where: {
+        type: Object,
+        default: {}
+      }
     },
-    /**数据源URL**/
-    where: {
-      type: Object,
-      default: {}
-    }
-  },
-  setup(props, {emit}) {
-    /**列表实例*/
-    const sohelpTableRef = ref(null);
-    /**存储表格配置*/
-    const sohelpConfig = reactive({});
-    /**在放选中数据列表**/
-    const selections = ref([]);
-    /**默认加载数据**/
-    const loadOnCreated = ref(false);
+    setup(props, { emit }) {
+      /**列表实例*/
+      const sohelpTableRef = ref(null);
+      /**存储表格配置*/
+      const sohelpConfig = reactive({});
+      /**在放选中数据列表**/
+      const selections = ref([]);
+      /**默认加载数据**/
+      const loadOnCreated = ref(false);
 
-    /**自定义列配置 **/
-    const columns = reactive([{
-      type: 'selection',
-      columnKey: 'selection',
-      width: 50,
-      align: 'center',
-      fixed: 'left'
-    }, {
-      type: 'index',
-      columnKey: 'index',
-      width: 50,
-      align: 'center',
-      fixed: 'left'
-    }]);
+      /**自定义列配置 **/
+      const columns = reactive([
+        {
+          type: 'selection',
+          columnKey: 'selection',
+          width: 50,
+          align: 'center',
+          fixed: 'left'
+        },
+        {
+          type: 'index',
+          columnKey: 'index',
+          width: 50,
+          align: 'center',
+          fixed: 'left'
+        }
+      ]);
 
-    /** 表格数据源 */
-    const datasource = async ({page, limit, where, orders}) => {
-      if (!loadOnCreated.value) {
-        return {total: 0, results: []}
-      }
-      const res = await SohelpHttp.get(props.url || sohelpConfig.requestValue, {
-        page,
-        limit,
-        ...where,
-        ...props.where,
-        orders
-      }).catch(e => {
-        EleMessage.error(e.message);
-      });
-      return res.data;
-    };
+      /** 表格数据源 */
+      const datasource = async ({ page, limit, where, orders }) => {
+        if (!loadOnCreated.value) {
+          return { total: 0, results: [] };
+        }
+        const res = await SohelpHttp.get(props.url || sohelpConfig.requestValue, {
+          page,
+          limit,
+          ...where,
+          ...props.where,
+          orders
+        }).catch((e) => {
+          EleMessage.error(e.message);
+        });
+        return res.data;
+      };
 
-    /**根据配置列转成ProTable格式的列*/
-    const switchProperty = (property) => {
-      return {
-        prop: property.name,
-        columnKey: property.name,
-        label: property.label,
-        width: property.width || 100
-      }
-    }
+      /**根据配置列转成ProTable格式的列*/
+      const switchProperty = (property) => {
+        return {
+          prop: property.name,
+          columnKey: property.name,
+          label: property.label,
+          width: property.width || 100
+        };
+      };
 
-    /***初始化网格列表配置**/
-    const initProTableConfiguration = (cfg) => {
-      loadOnCreated.value = true;
-      reload();
-    }
-    /**获取列表配置*/
-    moduleCache.getGrid(props.refid).then(data => {
-      Object.assign(sohelpConfig, {...data});
-      //初始化属性列表配置
-      data.properties.map(property => {
-        columns.push(switchProperty(property));
-      });
-      /**添加操作列**/
-      columns.push({
-        columnKey: 'action',
-        label: '操作',
-        width: 200,
-        align: 'center',
-        slot: 'action'
+      /***初始化网格列表配置**/
+      const initProTableConfiguration = (cfg) => {
+        loadOnCreated.value = true;
+        reload();
+      };
+      /**获取列表配置*/
+      moduleCache.getGrid(props.refid).then((data) => {
+        Object.assign(sohelpConfig, { ...data });
+        //初始化属性列表配置
+        data.properties.map((property) => {
+          columns.push(switchProperty(property));
+        });
+        /**添加操作列**/
+        columns.push({
+          field: 'action',
+          label: '操作',
+          width: 200,
+          align: 'center',
+          slot: 'action'
+        });
+        //初始化表格配置
+        initProTableConfiguration();
       });
-      //初始化表格配置
-      initProTableConfiguration();
-    });
 
+      const reload = (param) => {
+        sohelpTableRef.value?.reload?.(param);
+      };
+      const getData = () => {
+        return sohelpTableRef.value?.getData?.();
+      };
+      const getTableRef = () => {
+        return sohelpTableRef.value?.getTableRef?.();
+      };
 
-    const reload = (param) => {
-      sohelpTableRef.value?.reload?.(param);
-    }
-    const getData = () => {
-      return sohelpTableRef.value?.getData?.();
-    }
-    const getTableRef = () => {
-      return sohelpTableRef.value?.getTableRef?.();
+      // defineExpose({
+      //   reload, getData,getTableRef,datasource
+      // })
+      return { columns, reload, getData, getTableRef, datasource, selections, sohelpTableRef, sohelpConfig };
     }
-
-    // defineExpose({
-    //   reload, getData,getTableRef,datasource
-    // })
-    return {columns, reload, getData, getTableRef, datasource, selections, sohelpTableRef, sohelpConfig}
-  }
-
-};
-
+  };
 </script>
-<style scoped>
-
-</style>
+<style scoped></style>

package/sohelp-vform-eleplus/render.es.js

@@ -63893,7 +63893,6 @@ const _sfc_main$C = {
   },
   methods: {
     toolbarClick(event) {
-      console.log("toolbarClick", event);
       this.$emit("toolbarButtonClick", event);
     },
     onCheckboxChange(event) {

package/sohelp-vxe-table/index.vue

@@ -18,12 +18,7 @@
       :edit-render="getEditor(item)"
       :key="item.name"
     ></vxe-column>
-    <vxe-pager
-      v-model:currentPage="page"
-      v-model:pageSize="limit"
-      :total="datasource.total"
-      @page-change="reload"
-    >
+    <vxe-pager v-model:currentPage="page" v-model:pageSize="limit" :total="datasource.total" @page-change="reload">
     </vxe-pager>
   </vxe-table>
 </template>
@@ -32,7 +27,7 @@
   import { EleMessage } from '@/components/ele-admin-plus/components';
   import { DragOutlined } from '../sohelp-icon-select/icons';
   import Sortable from 'sortablejs';
-  import {moduleCache} from  '../cache/ModuleCache';
+  import { moduleCache } from '../cache/ModuleCache';
 
   export default {
     name: 'SohelpVxeTable',
@@ -82,18 +77,18 @@
           header: property.label,
           width: property.with || 100,
           edit: property.edit,
-          editor:property.editor
+          editor: property.editor
         };
       };
 
       /***初始化网格列表配置**/
       const initProTableConfiguration = () => {
-        props.drag && rowDrop()
+        props.drag && rowDrop();
       };
 
       /**获取列表配置*/
       moduleCache.getGrid(props.refid).then((data) => {
-        if(!data){
+        if (!data) {
           return;
         }
         Object.assign(sohelpConfig, { ...data });
@@ -103,7 +98,7 @@
         });
         /**添加操作列**/
         columns.push({
-          columnKey: 'action',
+          field: 'action',
           label: '操作',
           width: 200,
           align: 'center',
@@ -120,39 +115,32 @@
           Object.assign(datasource, { total: 0, results: [] });
           return;
         }
-        const res = await SohelpHttp.get(
-          props.url || sohelpConfig.requestValue,
-          {
-            page,
-            limit,
-            ...props.where
-          }
-        ).catch((e) => {
+        const res = await SohelpHttp.get(props.url || sohelpConfig.requestValue, {
+          page,
+          limit,
+          ...props.where
+        }).catch((e) => {
           EleMessage.error(e.message);
         });
         Object.assign(datasource, { ...res.data });
       };
 
-      const getEditor = (item) =>{
-        if(item.edit){
-          return {'name':'input'}
-        }else{
+      const getEditor = (item) => {
+        if (item.edit) {
+          return { name: 'input' };
+        } else {
           return null;
         }
-
-      }
+      };
 
       // 行拖拽
       const rowDrop = () => {
         nextTick(() => {
           const xGTable = sohelpVxeTableRef.value;
-          sortable.value = Sortable.create(
-            xGTable.$el.querySelector('.body--wrapper>.vxe-table--body tbody'),
-            {
-              handle: '.drag-btn',
-              onEnd: ({ newIndex, oldIndex }) => {}
-            }
-          );
+          sortable.value = Sortable.create(xGTable.$el.querySelector('.body--wrapper>.vxe-table--body tbody'), {
+            handle: '.drag-btn',
+            onEnd: ({ newIndex, oldIndex }) => {}
+          });
         });
       };
 

package/sohelp-workflow-drawer/components/form.vue

@@ -26,7 +26,7 @@
   const formValue = ref(null);
   const entityFormRef = ref(null);
 
-  const refid = ref(props.data.refid.split('!')[0]);
+  const refid = ref(props.data?.refid?.split('!')[0]);
 
   const load = async () => {
     const { id, refid } = props.data || {};

package/sohelp-workflow-drawer/components/table.vue

@@ -1,5 +1,4 @@
 <template>
-  fff
   <sohelp-vxe-grid
     style="padding-top: 10px"
     url="/engine/web/workflow/getTasks"

package/sohelp-workflow-drawer/components/timeline.vue

@@ -25,8 +25,8 @@
 
         <ele-text style="margin-top: 5px">
           <div style="display: flex; gap: 5px; flex-wrap: wrap">
-            <ele-text v-if="item.task_type == 1">办理人:</ele-text>
             <ele-text v-if="item.task_type == 0">申请人:</ele-text>
+            <ele-text v-if="item.task_type == 1">办理人:</ele-text>
             <ele-text v-if="item.task_type == 2" type="info">抄送人:</ele-text>
             <span v-for="row in item?.actorList" :key="row.actor_id">
               <vxe-tag status="primary">{{ row.actor_name }}</vxe-tag>
@@ -34,8 +34,8 @@
           </div>
         </ele-text>
         <div style="display: flex; gap: 5px; flex-wrap: wrap">
-          <ele-text v-if="item.task_type === 1">办理意见:</ele-text>
           <ele-text v-if="item.task_type === 0">申请理由:</ele-text>
+          <ele-text v-if="item.task_type === 1">办理意见:</ele-text>
           <ele-text v-if="item.task_type !== 2">{{ getVariable(item)?.reason }}</ele-text>
           <ele-text v-if="item.type !== 'done'" type="info">指派人:</ele-text>
 

package/sohelp-workflow-drawer/components/workflow.vue

@@ -1,5 +1,10 @@
 <template>
   <div v-loading="loading" class="workflow-wrap">
+    <div class="tips">
+      <span class="tips-item done">已通过</span>
+      <span class="tips-item do">办理中</span>
+      <span class="tips-item undo">未处理</span>
+    </div>
     <draw-box class="workflow-scroll">
       <sohelp-workflow class="workflow" ref="workflowRef" v-model="workflow.nodeConfig" v-if="workflow?.nodeConfig" />
     </draw-box>
@@ -65,4 +70,27 @@
     align-items: center;
     margin: 0 20px 20px auto;
   }
+  .tips {
+    display: flex;
+    gap: 10px;
+    width: 100%;
+    align-items: center;
+    justify-content: center;
+    margin: 0 20px 20px auto;
+    .tips-item {
+      padding: 2px 10px;
+      height: 20px;
+      border-radius: 6px;
+      line-height: 20px;
+    }
+    .tips-item.done {
+      border: 3px solid #409eff;
+    }
+    .tips-item.do {
+      border: 3px dashed #e6a23c;
+    }
+    .tips-item.undo {
+      border: 3px solid #ccc;
+    }
+  }
 </style>