mooho-base-admin-plus 2.5.36 → 2.6.1

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "mooho-base-admin-plus",
   "description": "MOOHO basic framework for admin by Vue3",
-  "version": "2.5.36",
+  "version": "2.6.1",
   "author": "jinyifan <jinyifan@mooho.com.cn>",
   "license": "MIT",
   "private": false,

package/src/api/task.js

@@ -61,5 +61,12 @@ export default {
       method: 'post',
       data: filter
     });
+  },
+  queryMyDone(filter) {
+    return request({
+      url: `api/${res}/queryMyDone`,
+      method: 'post',
+      data: filter
+    });
   }
 };

package/src/components/view/column-edit.vue

@@ -56,6 +56,26 @@
                 </Select>
               </FormItem>
             </Col>
+            <Col v-bind="grid8" v-if="data.controlType == 'Tag'">
+              <FormItem label="标签样式" key="source" prop="source">
+                <Select v-model="data.source" :transfer="true" :clearable="true">
+                  <Option key="default" value="default">样式一（默认）</Option>
+                  <Option key="border" value="border">样式二（边框）</Option>
+                  <Option key="dot" value="dot">样式三（点）</Option>
+                </Select>
+              </FormItem>
+            </Col>
+            <Col v-bind="grid24" v-if="data.controlType == 'Tag'">
+              <FormItem label="标签颜色" key="param" prop="param">
+                <view-table
+                  ref="tagColorTable"
+                  view-code="TagColor"
+                  :static="true"
+                  :embedded="true"
+                  @on-change="(row, sender, selected) => onTagColorChange(column, null, row, sender, selected)"
+                ></view-table>
+              </FormItem>
+            </Col>
             <Col v-bind="grid8" v-if="data.controlType == 'Table'">
               <FormItem label="数据存储方式" key="tableStoreType" prop="tableStoreType">
                 <RadioGroup v-model="data.tableStoreType" @on-change="tableStoreTypeChange">
@@ -715,6 +735,21 @@
         if (this.data.isDictItem && this.data.param) {
           this.data.dictTypeCode = JSON.parse(this.data.param)['type.code'].replace('[', '').replace(']', '');
         }
+
+        if (this.data.controlType == 'Tag') {
+          setTimeout(() => {
+            let tagColor = [];
+            if (this.data.param) {
+              try {
+                tagColor = JSON.parse(this.data.param);
+              } catch (e) {
+                console.log(e);
+              }
+            }
+
+            this.$refs.tagColorTable.loadData(tagColor);
+          });
+        }
       },
       // 关闭
       close() {
@@ -748,6 +783,13 @@
       },
       // 控件类型变更
       controlTypeChange() {
+        if (this.data.controlType == 'Tag') {
+          setTimeout(() => {
+            this.data.param = null;
+            this.$refs.tagColorTable.loadData([]);
+          });
+        }
+
         if (this.data.sourceModel) {
           if (this.data.controlType == 'DialogSelect' || this.data.controlType == 'MultiDialogSelect') {
             this.data.source = this.data.sourceModel + 'Select';
@@ -755,10 +797,6 @@
             this.data.source = this.data.sourceModel;
           }
         }
-
-        setTimeout(() => {
-          //this.$forceUpdate();
-        });
       },
       // 数据源变更
       sourceChange(row) {
@@ -974,6 +1012,9 @@
       // 选择默认值
       async selectDefault(name) {
         this.data.defaultValue = '{' + name + '}';
+      },
+      onTagColorChange() {
+        this.data.param = JSON.stringify(this.$refs.tagColorTable.getData());
       }
     }
   };

package/src/components/view/mixin.js

@@ -67,6 +67,31 @@ export default {
       }
 
       return param;
+    },
+    // 获取标签颜色
+    getTagColor(column, data) {
+      let tagColor = [];
+      if (column.param) {
+        try {
+          tagColor = JSON.parse(column.param);
+        } catch (e) {
+          console.log(e);
+        }
+      }
+
+      let color = 'default';
+
+      tagColor.forEach(item => {
+        if (
+          item.value.split(',').some(i => {
+            return i.trim() == data.trim();
+          })
+        ) {
+          color = item.color;
+        }
+      });
+
+      return color;
     }
   }
 };

package/src/components/view/view-form.vue

@@ -93,6 +93,11 @@
                   <div :class="{ error: compareData != null && parseData(data, column.code) != parseData(compareData, column.code) }" v-html="showData(data, column)"></div>
                 </div>
               </template>
+              <template v-else-if="column.controlType === 'Tag'">
+                <Tag :color="getTagColor(column, parseData(data, column.code))" :type="column.source == 'default' ? null : column.source">
+                  {{ showData(data, column) }}
+                </Tag>
+              </template>
               <template v-else-if="column.controlType === 'Description'">
                 <div v-html="showMultiLine(column.description)"></div>
               </template>
@@ -107,7 +112,7 @@
                   :model-value="parseData(data, column.code)"
                   @update:model-value="$event => setData(data, column.code, $event)"
                   :readonly="readonly || column.isReadonly"
-                  :clearable="true"
+                  :clearable="!(readonly || column.isReadonly)"
                   :style="{ width: column.controlWidth == null ? null : column.controlWidth + 'px' }"
                   :maxlength="column.maxLength"
                   :placeholder="column.description"
@@ -122,7 +127,7 @@
                   :model-value="parseData(data, column.code)"
                   @update:model-value="$event => setData(data, column.code, $event)"
                   :readonly="readonly || column.isReadonly"
-                  :clearable="true"
+                  :clearable="!(readonly || column.isReadonly)"
                   :style="{ width: column.controlWidth == null ? '100px' : column.controlWidth + 'px' }"
                   :placeholder="column.description"
                   :max="column.maxValue"
@@ -136,7 +141,7 @@
                   :model-value="parseData(data, column.code)"
                   @update:model-value="$event => setData(data, column.code, $event)"
                   :disabled="readonly || column.isReadonly"
-                  :clearable="true"
+                  :clearable="!(readonly || column.isReadonly)"
                   :style="{
                     width: column.controlWidth == null ? null : column.controlWidth + 'px',
                     'min-width': column.controlWidth == null ? null : column.controlWidth + 'px'
@@ -154,7 +159,7 @@
                   @update:model-value="$event => setArrayData(data, column.code, $event)"
                   :disabled="readonly || column.isReadonly"
                   :multiple="true"
-                  :clearable="true"
+                  :clearable="!(readonly || column.isReadonly)"
                   :style="{ width: column.controlWidth == null ? null : column.controlWidth + 'px' }"
                   :placeholder="column.description"
                   :transfer="true"
@@ -169,7 +174,7 @@
                   @update:model-value="$event => setData(data, column.code, $event)"
                   :data="getDataSource(data, column)"
                   :disabled="readonly || column.isReadonly"
-                  :clearable="true"
+                  :clearable="!(readonly || column.isReadonly)"
                   :style="{ width: column.controlWidth == null ? null : column.controlWidth + 'px' }"
                   :placeholder="column.description"
                   :transfer="true"
@@ -184,7 +189,7 @@
                   :disabled="readonly || column.isReadonly"
                   :multiple="true"
                   :show-checkbox="true"
-                  :clearable="true"
+                  :clearable="!(readonly || column.isReadonly)"
                   :style="{ width: column.controlWidth == null ? null : column.controlWidth + 'px' }"
                   :placeholder="column.description"
                   :transfer="true"
@@ -265,7 +270,7 @@
                   :model-value="parseDataWithOther(data, column)"
                   @update:model-value="$event => setDataWithOther(data, column.code, $event)"
                   :disabled="readonly || column.isReadonly"
-                  :clearable="true"
+                  :clearable="!(readonly || column.isReadonly)"
                   :style="{ width: column.controlWidth == null ? '40%' : column.controlWidth + 'px' }"
                   :placeholder="column.description"
                   :transfer="true"

package/src/components/view/view-table.vue

@@ -134,6 +134,11 @@
                 v-html="showData(rowData(row, index), column)"
               ></div>
             </template>
+            <template v-else-if="column.controlType === 'Tag'">
+              <Tag size="small" :color="getTagColor(column, parseData(rowData(row, index), column.code))" :type="column.source == 'default' ? null : column.source">
+                {{ showData(rowData(row, index), column) }}
+              </Tag>
+            </template>
             <template v-else-if="column.controlType === 'Hyperlink'">
               <a :href="getHyperlink(rowData(row, index), column.hyperlink)" :target="column.isNewWindow ? '_blank' : ''">
                 <span v-html="showData(rowData(row, index), column)"></span>
@@ -146,7 +151,7 @@
                 :model-value="parseData(rowData(row, index), column.code)"
                 @update:model-value="$event => setData(rowData(row, index), column.code, $event)"
                 :readonly="isReadonly(rowData(row, index), column)"
-                :clearable="true"
+                :clearable="!isReadonly(rowData(row, index), column)"
                 :style="{ width: column.controlWidth == null ? null : column.controlWidth - 8 + 'px' }"
                 :maxlength="column.maxLength"
                 :pattern="column.pattern"
@@ -176,7 +181,7 @@
                 :model-value="parseData(rowData(row, index), column.code)"
                 @update:model-value="$event => setData(rowData(row, index), column.code, $event)"
                 :readonly="isReadonly(rowData(row, index), column)"
-                :clearable="true"
+                :clearable="!isReadonly(rowData(row, index), column)"
                 :style="{ width: column.controlWidth == null ? null : column.controlWidth - 8 + 'px' }"
                 :placeholder="column.description"
                 @on-change="onDataChange(rowData(row, index), column)"
@@ -189,7 +194,7 @@
                 :model-value="parseData(rowData(row, index), column.code)"
                 @update:model-value="$event => setData(rowData(row, index), column.code, $event)"
                 :disabled="isReadonly(rowData(row, index), column)"
-                :clearable="true"
+                :clearable="!isReadonly(rowData(row, index), column)"
                 :style="{ width: column.controlWidth == null ? null : column.controlWidth - 8 + 'px' }"
                 :placeholder="column.description"
                 :transfer="true"
@@ -205,7 +210,7 @@
                 @update:model-value="$event => setArrayData(rowData(row, index), column.code, $event)"
                 :disabled="isReadonly(rowData(row, index), column)"
                 :multiple="true"
-                :clearable="true"
+                :clearable="!isReadonly(rowData(row, index), column)"
                 :style="{ width: column.controlWidth == null ? null : column.controlWidth - 8 + 'px' }"
                 :placeholder="column.description"
                 :transfer="true"
@@ -288,7 +293,7 @@
                   @update:model-value="$event => setDataWithOther(rowData(row, index), column.code, $event)"
                   size="small"
                   :disabled="isReadonly(rowData(row, index), column)"
-                  :clearable="true"
+                  :clearable="!isReadonly(rowData(row, index), column)"
                   :style="{
                     width:
                       parseDataWithOther(rowData(row, index), column) == '__Other'
@@ -1618,6 +1623,7 @@
           delete item._needRefresh;
           delete item._needClear;
           delete item._rawData;
+          delete item._disabled;
         });
 
         return data;

package/src/components/workflow/task-form.vue

@@ -113,10 +113,10 @@
         let applicationType = row.processInst.applicationType;
         this.outcomes = [];
         this.task = row;
-        this.isRejectable = this.task.activityInst.activity.isRejectable;
-        this.isBackable = this.task.activityInst.activity.isBackable;
-        this.isRedirectable = this.task.activityInst.activity.isRedirectable;
-        this.isMessageEnable = this.task.processInst.isMessageEnable;
+        this.isRejectable = this.task.activityInst.activity.isRejectable && this.task.status == 'Pending';
+        this.isBackable = this.task.activityInst.activity.isBackable && this.task.status == 'Pending';
+        this.isRedirectable = this.task.activityInst.activity.isRedirectable && this.task.status == 'Pending';
+        this.isMessageEnable = this.task.processInst.isMessageEnable && this.task.status == 'Pending';
         this.isCustom = false;
 
         setTimeout(async () => {
@@ -126,7 +126,7 @@
             return;
           } else if (this.task.activityInst.activity.pageMode == 'Component') {
             // 动态组件
-            this.readonly = !this.task.activityInst.activity.isEditable;
+            this.readonly = !this.task.activityInst.activity.isEditable || this.task.status != 'Pending';
             this.customComponent = markRaw(this.$pages[this.task.activityInst.activity.templateUrl]); // 动态组件
             this.isCustom = true;
 
@@ -143,7 +143,7 @@
             });
           } else if (this.task.activityInst.activity.pageMode == 'Form') {
             this.form = this.$refs.form;
-            this.readonly = !this.task.activityInst.activity.isEditable;
+            this.readonly = !this.task.activityInst.activity.isEditable || this.task.status != 'Pending';
             this.form.init(this.task.activityInst.activity.formViewCode, async view => {
               if (view.dataView.isCustom) {
                 this.model = await customModelApi.get(applicationType.model, row.processInst.modelID);
@@ -167,7 +167,7 @@
             return;
           } else if (applicationType.pageMode == 'Component') {
             // 动态组件
-            this.readonly = !this.task.activityInst.activity.isEditable;
+            this.readonly = !this.task.activityInst.activity.isEditable || this.task.status != 'Pending';
             this.customComponent = markRaw(this.$pages[applicationType.templateUrl]); // 动态组件
             this.isCustom = true;
 
@@ -184,7 +184,7 @@
             });
           } else if (applicationType.pageMode == 'Form') {
             this.form = this.$refs.form;
-            this.readonly = !this.task.activityInst.activity.isEditable;
+            this.readonly = !this.task.activityInst.activity.isEditable || this.task.status != 'Pending';
             this.form.init(applicationType.formViewCode, async view => {
               if (view.dataView.isCustom) {
                 this.model = await customModelApi.get(applicationType.model, row.processInst.modelID);
@@ -208,8 +208,10 @@
             return;
           }
 
-          let res = await modelApi.query('Outcome', { activityFromID: row.activityInst.activityID });
-          this.outcomes = res.data;
+          if (this.task.status == 'Pending') {
+            let res = await modelApi.query('Outcome', { activityFromID: row.activityInst.activityID });
+            this.outcomes = res.data;
+          }
         });
       },
       // 自定义组件就绪

package/src/pages/common/todo.vue

@@ -4,14 +4,25 @@
       <PageHeader :title="$route.meta.title" :content="$route.meta.description" hidden-breadcrumb />
     </div>
     <Card :bordered="false" dis-hover class="ivu-mt">
-      <view-table ref="table" view-code="TodoList" :select-enable="true">
-        <template #filterCommand>
-          <Button size="small" type="primary" custom-icon="fa fa-check-double" @click="batchDo">{{ $t('Front_Btn_Batch_Do') }}</Button>
-        </template>
-        <template #command="{ row }">
-          <Button size="small" :title="$t('Front_Btn_Detail')" type="info" custom-icon="fa fa-file-alt" @click="$refs.taskForm.open(row)"></Button>
-        </template>
-      </view-table>
+      <Tabs value="todo">
+        <TabPane :label="$t('Front_Label_Todo')" name="todo">
+          <view-table ref="table" view-code="TodoList" :select-enable="true">
+            <template #filterCommand>
+              <Button size="small" type="primary" custom-icon="fa fa-check-double" @click="batchDo">{{ $t('Front_Btn_Batch_Do') }}</Button>
+            </template>
+            <template #command="{ row }">
+              <Button size="small" :title="$t('Front_Btn_Detail')" type="info" custom-icon="fa fa-file-alt" @click="$refs.taskForm.open(row)"></Button>
+            </template>
+          </view-table>
+        </TabPane>
+        <TabPane :label="$t('Front_Label_Done')" name="done">
+          <view-table ref="table" view-code="DoneList">
+            <template #command="{ row }">
+              <Button size="small" :title="$t('Front_Btn_Detail')" type="info" custom-icon="fa fa-file-alt" @click="$refs.taskForm.open(row)"></Button>
+            </template>
+          </view-table>
+        </TabPane>
+      </Tabs>
     </Card>
     <task-form ref="taskForm" @on-after-action="$refs.table.loadData()"></task-form>
   </div>

package/src/styles/css/default.css

@@ -304,6 +304,12 @@
   padding-right: 8px;
 }
 
+.ivu-table-cell .ivu-tag-dot {
+  height: 22px;
+  line-height: 22px;
+  padding: 0 8px;
+}
+
 .ivu-table-wrapper {
   overflow: initial;
 }