Jelajahi Sumber

😉升级Furion v4.8.4.5 优化内置任务看板

zuohuaijun 3 tahun lalu
induk
melakukan
a2b05d55e2

+ 3 - 3
Admin.NET/Admin.NET.Core/Admin.NET.Core.csproj

@@ -17,9 +17,9 @@
     <PackageReference Include="AngleSharp" Version="0.17.1" />
     <PackageReference Include="AspNetCoreRateLimit" Version="5.0.0" />
     <PackageReference Include="DotNetCore.Natasha.CSharp" Version="5.0.2" />
-    <PackageReference Include="Furion.Extras.Authentication.JwtBearer" Version="4.8.4.4" />
-    <PackageReference Include="Furion.Extras.ObjectMapper.Mapster" Version="4.8.4.4" />
-    <PackageReference Include="Furion.Pure" Version="4.8.4.4" />
+    <PackageReference Include="Furion.Extras.Authentication.JwtBearer" Version="4.8.4.5" />
+    <PackageReference Include="Furion.Extras.ObjectMapper.Mapster" Version="4.8.4.5" />
+    <PackageReference Include="Furion.Pure" Version="4.8.4.5" />
     <PackageReference Include="Lazy.Captcha.Core" Version="2.0.0" />
     <PackageReference Include="Magicodes.IE.Excel" Version="2.7.4.1" />
     <PackageReference Include="Magicodes.IE.Pdf" Version="2.7.4.1" />

+ 3 - 1
Web/src/views/system/job/component/cronTab/day.vue

@@ -44,7 +44,9 @@
     </el-form-item>
   </el-form>
 </template>
-<script setup>
+<script setup lang="ts">
+import { computed, ref, watch } from 'vue';
+
 const emit = defineEmits(['update'])
 const props = defineProps({
   cron: {

+ 3 - 1
Web/src/views/system/job/component/cronTab/hour.vue

@@ -30,7 +30,9 @@
   </el-form>
 </template>
 
-<script setup>
+<script setup lang="ts">
+import { computed, ref, watch } from 'vue';
+
 const emit = defineEmits(['update'])
 const props = defineProps({
   cron: {

+ 7 - 6
Web/src/views/system/job/component/cronTab/index.vue

@@ -101,7 +101,8 @@
   </div>
 </template>
 
-<script setup>
+<script setup lang="ts">
+import { computed, onMounted, ref, watch } from 'vue'
 import CrontabSecond from './second.vue'
 import CrontabMin from './min.vue'
 import CrontabHour from './hour.vue'
@@ -110,7 +111,7 @@ import CrontabMonth from './month.vue'
 import CrontabWeek from './week.vue'
 import CrontabYear from './year.vue'
 import CrontabResult from './result.vue'
-const { proxy } = getCurrentInstance()
+// const { proxy } = getCurrentInstance()
 const emit = defineEmits(['hide', 'fill'])
 const props = defineProps({
   hideComponent: {
@@ -140,7 +141,7 @@ const crontabValueString = computed(() => {
   return obj.second + ' ' + obj.min + ' ' + obj.hour + ' ' + obj.day + ' ' + obj.month + ' ' + obj.week + (obj.year === '' ? '' : ' ' + obj.year)
 })
 watch(expression, () => resolveExp())
-function shouldHide(key) {
+function shouldHide(key: any) {
   return !(hideComponent.value && hideComponent.value.includes(key))
 }
 function resolveExp() {
@@ -168,15 +169,15 @@ function resolveExp() {
   }
 }
 // tab切换值
-function tabCheck(index) {
+function tabCheck(index: number) {
   tabActive.value = index
 }
 // 由子组件触发,更改表达式组成的字段值
-function updateCrontabValue(name, value, from) {
+function updateCrontabValue(name: string | number, value: any, from: any) {
   crontabValueObj.value[name] = value
 }
 // 表单选项的子组件校验数字格式(通过-props传递)
-function checkNumber(value, minLimit, maxLimit) {
+function checkNumber(value: number, minLimit: number, maxLimit: number) {
   // 检查必须为整数
   value = Math.floor(value)
   if (value < minLimit) {

+ 3 - 1
Web/src/views/system/job/component/cronTab/min.vue

@@ -29,7 +29,9 @@
     </el-form-item>
   </el-form>
 </template>
-<script setup>
+<script setup lang="ts">
+import { computed, ref, watch } from 'vue';
+
 const emit = defineEmits(['update'])
 const props = defineProps({
   cron: {

+ 3 - 1
Web/src/views/system/job/component/cronTab/month.vue

@@ -30,7 +30,9 @@
   </el-form>
 </template>
 
-<script setup>
+<script setup lang="ts">
+import { computed, ref, watch } from 'vue';
+
 const emit = defineEmits(['update'])
 const props = defineProps({
   cron: {

+ 4 - 2
Web/src/views/system/job/component/cronTab/result.vue

@@ -1,5 +1,5 @@
 <template>
-  <div class="popup-result">
+  <div class="popup-result" style="padding-left: 25px;">
     <p class="title">最近5次运行时间</p>
     <ul class="popup-result-scroll">
       <template v-if="isShow">
@@ -10,7 +10,9 @@
   </div>
 </template>
 
-<script setup>
+<script setup lang="ts">
+import { onMounted, ref, watch } from 'vue';
+
 const props = defineProps({
   ex: {
     type: String,

+ 3 - 1
Web/src/views/system/job/component/cronTab/second.vue

@@ -30,7 +30,9 @@
   </el-form>
 </template>
 
-<script setup>
+<script setup lang="ts">
+import { computed, ref, watch } from 'vue';
+
 const emit = defineEmits(['update'])
 const props = defineProps({
   cron: {

+ 3 - 1
Web/src/views/system/job/component/cronTab/week.vue

@@ -55,7 +55,9 @@
   </el-form>
 </template>
 
-<script setup>
+<script setup lang="ts">
+import { computed, ref, watch } from 'vue';
+
 const emit = defineEmits(['update'])
 const props = defineProps({
   cron: {

+ 3 - 1
Web/src/views/system/job/component/cronTab/year.vue

@@ -35,7 +35,9 @@
   </el-form>
 </template>
 
-<script setup>
+<script setup lang="ts">
+import { computed, onMounted, ref, watch } from 'vue';
+
 const emit = defineEmits(['update'])
 const props = defineProps({
   cron: {