Merge branch 'lulu-admin-oa'

Makefile

@@ -1,4 +1,4 @@
-ImageTag ?=v1.0.0
+ImageTag ?=v1.1.0
 ImageName ?= sunhao1256/lulu-admin-frontend:$(ImageTag)
 Platform ?=linux/amd64
 
@@ -7,7 +7,7 @@ VERSION=$(shell git rev-parse --short HEAD)
 all: compile docker-build docker-push
 
 compile:
-	yarn build
+	yarn build-no-typecheck
 
 docker-build:
 	docker build --platform=$(Platform) --build-arg version=$(VERSION) -t ${ImageName} -f docker/Dockerfile .

README.md

@@ -2,6 +2,8 @@
 
 elegant admin template, based on Vue3 , TypeScript, Vuetify3, Axios
 
+form-generator , bpmn-js-camunda
+
 ## Lulu
 Lulu is my arrogant cat
 <img src="https://i.imgur.com/3e63lxL.jpg" style="zoom:8%;" />
@@ -12,6 +14,10 @@ https://luluhome.site
 
 ## Feature
 
+- bpmn-js-camunda
+- form-generator 😄
+- chat
+
 [Vue3](https://vuejs.org/guide/quick-start.html#creating-a-vue-application)
 
 [Vuetify3](https://next.vuetifyjs.com/en/getting-started/installation/)
@@ -48,6 +54,8 @@ infrastructure [SoybeanAdmin](https://github.com/honghuangdc/soybean-admin)
 [vben](https://github.com/vbenjs)
 ## ScreenShot
 
+![](https://i.imgur.com/RQinDIf.png)
+![](https://i.imgur.com/wmODutf.png)
 ![](https://i.imgur.com/S5HeYO2.png)
 ![](https://i.imgur.com/MgHU7Av.png)
 ![](https://i.imgur.com/Xr5gqgE.png)

package.json

@@ -1,13 +1,14 @@
 {
   "name": "lulu-admin",
-  "version": "1.0.0",
+  "version": "1.1.0",
   "homepage": "https://github.com/sunhao1256/lulu-admin",
   "repository": {
     "url": "https://github.com/sunhao1256/lulu-admin.git"
   },
   "scripts": {
     "dev": "cross-env VITE_SERVICE_ENV=dev vite",
     "build": "npm run typecheck && cross-env VITE_SERVICE_ENV=prod vite build ",
+    "build-no-typecheck": "cross-env VITE_SERVICE_ENV=prod vite build ",
     "preview": "vite preview",
     "typecheck": "vue-tsc --noEmit --skipLibCheck"
   },

src/views/flowable/design/index.vue

@@ -13,7 +13,7 @@
       >
         SVG
       </v-btn>
-      <a ref="downloadSvg" class="d-none" href></a>
+      <a ref="downloadSvg" class="d-none" href="#"></a>
       <v-btn
         variant="outlined"
         size="small"
@@ -25,7 +25,7 @@
       >
         Diagram
       </v-btn>
-      <a ref="downloadDiagram" class="d-none" href></a>
+      <a ref="downloadDiagram" class="d-none" href="#"></a>
       <v-btn
         size="small"
         class="ml-1"

src/views/flowable/design/propertiesPanel/components/condition.vue

@@ -18,8 +18,7 @@
 <script lang="ts" setup>
 import {ref} from 'vue'
 import {useModelStore} from '@/store'
-import {getBusinessObject, is, isAny} from "bpmn-js/lib/util/ModelUtil";
-import {find} from "lodash-es";
+import {getBusinessObject} from "bpmn-js/lib/util/ModelUtil";
 
 const opinionOption = ref(['approve', 'disapprove'])
 const opinionRef = ref<Array<String>>([])

src/views/flowable/design/propertiesPanel/components/userAssigne.vue

@@ -50,7 +50,6 @@
 import {ref} from 'vue'
 import {useModelStore} from '@/store'
 import {getBusinessObject} from "bpmn-js/lib/util/ModelUtil";
-import {ar} from "vuetify/locale";
 
 const camundaDueDate = "camunda:dueDate"
 const typeOption = ['user', 'role']

src/views/flowable/design/propertiesPanel/index.vue

@@ -33,16 +33,9 @@ import {debounce} from 'lodash-es'
 import EventEmitter from "@/utils/flow/EventEmitter";
 import {useModelStore} from '@/store'
 import {isUserService, isStartEvent} from "@/views/flowable/bo-utils/userTaskUtil";
-import {isConditional, isNotConditional} from "@/views/flowable/bo-utils/conditionalUtil";
+import {isNotConditional} from "@/views/flowable/bo-utils/conditionalUtil";
 
 const modelStore = useModelStore()
-
-const items = ref([
-  {text: 'Real-Time', icon: 'mdi-clock'},
-  {text: 'Audience', icon: 'mdi-account'},
-  {text: 'Conversions', icon: 'mdi-flag'},
-])
-
 const renderComponents = ref<Component[]>([])
 const setCurrentComponents = (activatedElement: any) => {
 

src/views/form/design/index.vue

@@ -90,7 +90,7 @@
 
 <script setup lang="ts">
 import VueDraggable from 'vuedraggable'
-import {reactive, ref} from 'vue'
+import {ref} from 'vue'
 import Formitem from "@/views/form/design/components/formitem";
 import {cloneDeep, uniqueId} from 'lodash-es'
 import formComponentsGetter from "./formComponents";