add deptTreeSelect

index.html

@@ -8,6 +8,12 @@
   <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no">
   <link rel="icon" href="/favicon.ico">
   <title>若依管理系统</title>
+  <script type="text/javascript">
+    window._AMapSecurityConfig = {
+      securityJsCode: 'd9ded0c99c2545c9feb200da26b29fbf',
+    }
+  </script>
+  <script type="text/javascript" src="https://webapi.amap.com/maps?v=2.0&key=7891f1238368a895ff1967c79643102d"></script>
   <!--[if lt IE 11]><script>window.location.href='/html/ie.html';</script><![endif]-->
   <style>
     html,

src/api/file/file.js

@@ -0,0 +1,9 @@
+import request from '@/utils/request'
+
+export function uploadFile(data) {
+    return request({
+      url: '/common/upload',
+      method: 'post',
+      data: data
+    })
+}

src/api/system/dept.js

@@ -53,3 +53,11 @@ export function delDept(deptId) {
     }
   })
 }
+
+// 查询部门下拉树结构
+export function deptTreeSelect() {
+  return request({
+    url: '/system/dept/deptTree',
+    method: 'get'
+  })
+}

src/api/system/user.js

@@ -108,12 +108,15 @@ export function updateUserPwd(oldPassword, newPassword) {
 }
 
 // 用户头像上传
-export function uploadAvatar(data) {
+export function uploadAvatar(url) {
+  const data = {
+    url
+  }
   return request({
-    url: "/system/user/profile/avatar",
-    method: "post",
-    data: data,
-  });
+    url: '/system/user/profile/uploadAvatar',
+    method: 'put',
+    params: data
+  })
 }
 
 // 查询授权角色

src/components/ProcessDesigner/index.vue

@@ -81,8 +81,6 @@ function initModeler(modelerArgv) {
   }, 10);
 }
 function handlerEvent(eventName) {
-  console.log(eventName);
-
   if (eventName === "connection-added") {
     // 设置结束节点的默认名称
     nextTick(() => {

src/components/ProcessViewer/index.vue

@@ -184,7 +184,7 @@
   </div>
 </template>
 
-<script setup name="">
+<script setup name="ProcessViewer">
 import "@/plugins/package/theme/index.scss";
 import { parseTime } from "@/utils/ruoyi";
 import BpmnViewer from "bpmn-js/lib/Viewer";
@@ -362,8 +362,10 @@ function setProcessStatus(processNodeInfoArgv) {
   if (Array.isArray(finishedSequenceFlowSet)) {
     finishedSequenceFlowSet.forEach((item) => {
       if (item != null) {
-        canvas.addMarker(item, "success");
+        // FIXME:  TODO:
         let element = elementRegistry.get(item);
+        if (!element) return;
+        canvas.addMarker(item, "success");
         const conditionExpression = element.businessObject.conditionExpression;
         if (conditionExpression) {
           canvas.addMarker(item, "condition-expression");

src/plugins/package/designer/ProcessDesigner.vue

@@ -426,13 +426,15 @@ function onSave() {
   if (bpmnModeler) {
     const elementRegistry = bpmnModeler.get("elementRegistry");
     const userTaskEle = elementRegistry?.find(
-      (el) => el.type === "bpmn:UserTask"
+      (el) => el.type === "bpmn:UserTask" && !el.businessObject.name
     );
-    if (!userTaskEle.businessObject.name) {
-      console.log(userTaskEle.businessObject.name);
+    if (userTaskEle) {
       ElMessage.warning("用户任务节点名称必填");
       const EventBus = bpmnModeler.get("eventBus");
-      EventBus.fire("element.click", { element: userTaskEle });
+      const activeEle = window?.bpmnInstances?.bpmnElement;
+      if (activeEle.id != userTaskEle.id) {
+        EventBus.fire("element.click", { element: userTaskEle });
+      }
       return;
     }
   }

src/plugins/package/designer/plugins/content-pad/contentPadProvider.js

@@ -49,19 +49,17 @@ export default function ContextPadProvider(
   }
 
   eventBus.on("create.end", 250, function (event) {
-    console.log(
-      "create.end,contentPadProvider.js",
-      window.bpmnInstances.bpmnElement
-    );
-
-    // TODO:设置开始节点默认名称
+    // TODO:设置通过左面板创建的开始、结束节点的默认名称
     const bpmnElement = window.bpmnInstances.bpmnElement;
     if (bpmnElement.type === "bpmn:StartEvent") {
       window.bpmnInstances.modeling.updateProperties(bpmnElement, {
         name: "开始",
       });
+    } else if (bpmnElement.type === "bpmn:EndEvent") {
+      window.bpmnInstances.modeling.updateProperties(bpmnElement, {
+        name: "结束",
+      });
     }
-
     var context = event.context,
       shape = context.shape;
 

src/plugins/package/penal/listeners/utilSelf.js

@@ -14,13 +14,11 @@ export function initListenerForm(listener) {
     if (listener.eventDefinitions.length) {
       let k = "";
       for (let key in listener.eventDefinitions[0]) {
-        console.log(listener.eventDefinitions, key);
         if (key.indexOf("time") !== -1) {
           k = key;
           self.eventDefinitionType = key.replace("time", "").toLowerCase();
         }
       }
-      console.log(k);
       self.eventTimeDefinitions = listener.eventDefinitions[0][k].body;
     }
   }

src/plugins/package/penal/task/task-components/UserTask.vue

@@ -181,10 +181,10 @@
 import { listUser, deptTreeSelect } from "@/api/system/user";
 import { listRole } from "@/api/system/role";
 import { addDateRange } from "@/utils/ruoyi";
-import TreeSelect from "@/components/TreeSelect";
+// import TreeSelect from "@/components/TreeSelect";
 import { ref, reactive, watch } from "vue";
 import { ElMessage } from "element-plus";
-const testResult = ref([]);
+// const testResult = ref([]);
 const userTaskForm = {
   dataType: "",
   assignee: "",
@@ -296,7 +296,7 @@ function clearOptionsData() {
   deptIds.value = [];
 }
 /**
- * 跟新节点数据
+ * 更新节点数据
  */
 function updateElementTask() {
   const taskAttr = Object.create(null);

src/utils/generator/js.js

@@ -40,15 +40,7 @@ export function makeUpJs(formConfig, type) {
       created
     );
   });
-  console.log(
-    dataList,
-    ruleList,
-    optionsList,
-    methodList,
-    propsList,
-    uploadVarList,
-    created
-  );
+
   const script = buildexport(
     formConfig,
     type,
@@ -303,7 +295,6 @@ function buildexport(
   methods,
   created
 ) {
-  console.log(selectOptions);
   const newStr = `
 import { ref, reactive, toRefs } from "vue";
 

src/utils/generator/parser.jsx

@@ -18,10 +18,9 @@ const ruleTrigger = {
 };
 
 const layouts = {
-  colFormItem(h, scheme) {
+  colFormItem(h, scheme, disabled) {
     const config = scheme.__config__;
     const listeners = buildListeners.call(this, scheme);
-    console.log(listeners, "28");
     let labelWidth = config.labelWidth ? `${config.labelWidth}px` : null;
     if (config.showLabel === false) labelWidth = "0";
     return (
@@ -31,13 +30,13 @@ const layouts = {
           prop={scheme.__vModel__}
           label={config.showLabel ? config.label : ""}
         >
-          <render conf={scheme} on={listeners} />
+          <render conf={{ ...scheme, noedit: disabled }} on={listeners} />
         </el-form-item>
       </el-col>
     );
   },
-  rowFormItem(h, scheme) {
-    let child = renderChildren.apply(this, arguments);
+  rowFormItem(h, scheme, disabled) {
+    let child = renderChildren.apply(this, arguments, disabled);
     if (scheme.type === "flex") {
       child = (
         <el-row
@@ -73,7 +72,12 @@ function renderFrom(h) {
         props={{ model: this[formConfCopy.formModel] }}
         rules={this[formConfCopy.formRules]}
       >
-        {renderFormItem.call(this, h, formConfCopy.fields)}
+        {renderFormItem.call(
+          this,
+          h,
+          formConfCopy.fields,
+          formConfCopy.disabled
+        )}
         {formConfCopy.formBtns && formBtns.call(this, h)}
       </el-form>
     </el-row>
@@ -93,27 +97,25 @@ function formBtns(h) {
   );
 }
 
-function renderFormItem(h, elementList) {
+function renderFormItem(h, elementList, disabled) {
   return elementList.map((scheme) => {
     const config = scheme.__config__;
     const layout = layouts[config.layout];
 
     if (layout) {
-      console.log(layout);
-      return layout.call(this, h, scheme);
+      return layout.call(this, h, scheme, disabled);
     }
     throw new Error(`没有与${config.layout}匹配的layout`);
   });
 }
 
-function renderChildren(h, scheme) {
+function renderChildren(h, scheme, disabled) {
   const config = scheme.__config__;
   if (!Array.isArray(config.children)) return null;
-  return renderFormItem.call(this, h, config.children);
+  return renderFormItem.call(this, h, config.children, disabled);
 }
 
 function setValue(event, config, scheme) {
-  console.log(event, config, scheme, "serval");
   config.defaultValue = event;
   this[this.formConf.formModel][scheme.__vModel__] = event;
 }

src/utils/generator/render.jsx

@@ -17,7 +17,7 @@ import {
   ElCheckboxGroup,
 } from "element-plus";
 import Editor from "@/components/Editor";
-import { h, defineComponent } from "vue";
+import { h, defineComponent, readonly } from "vue";
 
 const formComponentsMap = {
   "el-row": ElRow,
@@ -171,6 +171,9 @@ export default defineComponent({
       type: Object,
       required: true,
     },
+    // noedit: {
+    //   type: Boolean,
+    // },
   },
   data() {
     return {
@@ -237,6 +240,11 @@ export default defineComponent({
         ) : (
           <Tag
             {...dataObject.attrs}
+            {...(this.$props.conf.__config__.tag === "editor"
+              ? {
+                  readOnly: dataObject.attrs.noedit,
+                }
+              : {})}
             on={dataObject.on}
             modelValue={this.$props.conf.__config__.defaultValue}
           ></Tag>

src/views/office/detail.vue

@@ -393,6 +393,8 @@ const commentType = computed(() => {
         return "委派";
       case "5":
         return "转办";
+      case "6":
+        return "撤回";
     }
   };
 });
@@ -409,6 +411,8 @@ const approveTypeTag = computed(() => {
         return "primary";
       case "5":
         return "success";
+      case "6":
+        return "warning";
     }
   };
 });

src/views/system/user/profile/userAvatar.vue

@@ -61,6 +61,7 @@
 <script setup>
 import "vue-cropper/dist/index.css";
 import { VueCropper } from "vue-cropper";
+import { uploadFile } from "@/api/file/file";
 import { uploadAvatar } from "@/api/system/user";
 import useUserStore from "@/store/modules/user";
 
@@ -119,18 +120,23 @@ function beforeUpload(file) {
 }
 /** 上传图片 */
 function uploadImg() {
+  
   proxy.$refs.cropper.getCropBlob(data => {
     let formData = new FormData();
-    formData.append("avatarfile", data);
-    uploadAvatar(formData).then(response => {
+    formData.append("file", data);
+    uploadFile(formData).then(response => {
       open.value = false;
-      options.img = import.meta.env.VITE_APP_BASE_API + response.imgUrl;
+      options.img = import.meta.env.VITE_APP_BASE_API + response.url;
       userStore.avatar = options.img;
+      uploadAvatar(response.url);
       proxy.$modal.msgSuccess("修改成功");
       visible.value = false;
     });
   });
 }
+
+
+
 /** 实时预览 */
 function realTime(data) {
   options.previews = data;

src/views/tool/build/DraggableItem.jsx

@@ -138,7 +138,6 @@ const layouts = {
             {{
               item: ({ element, index }) => {
                 const layout = layouts[element.__config__.layout];
-                console.log(element, "element");
                 if (layout) {
                   return layout.call(this, element, index, config.children);
                 }

src/views/tool/build/RightPanel.vue

@@ -577,7 +577,8 @@
               <template #item="{ element, index }">
                 <div class="select-item">
                   <div class="select-line-icon option-drag">
-                    <i class="el-icon-s-operation" />
+                    <!-- <i class="el-icon-s-operation" /> -->
+                    <el-icon><Operation /></el-icon>
                   </div>
                   <el-input
                     v-model="element.label"
@@ -594,7 +595,10 @@
                     class="close-btn select-line-icon"
                     @click="activeData.__slot__.options.splice(index, 1)"
                   >
-                    <i class="el-icon-remove-outline" />
+                    <!-- <i class="el-icon-remove-outline" /> -->
+                    <el-icon>
+                      <Remove />
+                    </el-icon>
                   </div>
                 </div>
               </template>
@@ -602,8 +606,9 @@
             <div style="margin-left: 20px">
               <el-button
                 style="padding-bottom: 0"
-                icon="el-icon-circle-plus-outline"
+                icon="circle-plus"
                 link
+                type="primary"
                 @click="addSelectItem"
               >
                 添加选项
@@ -703,6 +708,7 @@
               <el-button
                 style="padding-bottom: 0"
                 icon="circle-plus"
+                type="primary"
                 link
                 @click="addTreeItem"
               >
@@ -951,7 +957,9 @@
                 class="close-btn"
                 @click="activeData.__config__.regList.splice(index, 1)"
               >
-                <i class="el-icon-close" />
+                <el-icon>
+                  <Close />
+                </el-icon>
               </span>
               <el-form-item label="表达式">
                 <el-input v-model="item.pattern" placeholder="请输入正则" />
@@ -961,11 +969,7 @@
               </el-form-item>
             </div>
             <div style="margin-left: 20px">
-              <el-button
-                icon="el-icon-circle-plus-outline"
-                link
-                @click="addReg"
-              >
+              <el-button icon="circle-plus" type="primary" link @click="addReg">
                 添加规则
               </el-button>
             </div>
@@ -1045,7 +1049,7 @@
   </div>
 </template>
 <script setup>
-import { Link, Menu, Plus } from "@element-plus/icons-vue";
+import { Link, Plus, Remove, Operation, Close } from "@element-plus/icons-vue";
 import TreeNodeDialog from "./TreeNodeDialog.vue";
 import { isNumberStr } from "@/utils/index";
 import IconsDialog from "./IconsDialog.vue";

src/views/tool/build/index.vue

@@ -713,6 +713,9 @@ textarea {
     z-index: 1;
     cursor: pointer;
     font-size: 12px;
+    display: flex;
+    justify-content: center;
+    align-items: center;
     &:hover {
       background: rgba(210, 23, 23, 0.5);
     }

vite.config.js

@@ -33,7 +33,7 @@ export default defineConfig(({ mode, command }) => {
         // https://cn.vitejs.dev/config/#server-proxy
         "/dev-api": {
           // target: 'http://localhost:8080',
-          target: "http://192.168.110.10:1616",
+          target: "http://192.168.1.16:1616",
           changeOrigin: true,
           rewrite: (p) => p.replace(/^\/dev-api/, ""),
         },