Browse Source

[Fix][UI Next][V1.0.0-Alpha]Fix the rules display incorrect in DATA_QUALITY. (#9236)

* [Fix][UI Next][V1.0.0-Alpha]Fix the rules display incorrect in DATA_QUALITY.

* [Fix][UI Next][V1.0.0-Alpha]Remove the unuse watch.
3.0.0/version-upgrade
Amy0104 2 years ago committed by GitHub
parent
commit
3e82312713
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 3
      dolphinscheduler-ui-next/src/views/projects/task/components/node/fields/use-rules.ts
  2. 5
      dolphinscheduler-ui-next/src/views/projects/task/components/node/tasks/use-data-quality.ts
  3. 14
      dolphinscheduler-ui-next/src/views/projects/task/components/node/use-task.ts

3
dolphinscheduler-ui-next/src/views/projects/task/components/node/fields/use-rules.ts

@ -80,7 +80,8 @@ export function useRules(
field: responseItem.field, field: responseItem.field,
options: responseItem.options, options: responseItem.options,
validate: responseItem.validate, validate: responseItem.validate,
props: responseItem.props props: responseItem.props,
value: responseItem.value
} }
const name = responseItem.name?.replace('$t(', '').replace(')', '') const name = responseItem.name?.replace('$t(', '').replace(')', '')
item.name = name ? t(`project.node.${name}`) : '' item.name = name ? t(`project.node.${name}`) : ''

5
dolphinscheduler-ui-next/src/views/projects/task/components/node/tasks/use-data-quality.ts

@ -25,13 +25,15 @@ export function useDataQuality({
from = 0, from = 0,
readonly, readonly,
data, data,
jsonRef jsonRef,
updateElements
}: { }: {
projectCode: number projectCode: number
from?: number from?: number
readonly?: boolean readonly?: boolean
data?: ITaskData data?: ITaskData
jsonRef: Ref<IJsonItem[]> jsonRef: Ref<IJsonItem[]>
updateElements: () => void
}) { }) {
const { t } = useI18n() const { t } = useI18n()
const model = reactive({ const model = reactive({
@ -87,6 +89,7 @@ export function useDataQuality({
...Fields.useTimeoutAlarm(model), ...Fields.useTimeoutAlarm(model),
...Fields.useRules(model, (items: IJsonItem[], len: number) => { ...Fields.useRules(model, (items: IJsonItem[], len: number) => {
jsonRef.value.splice(15, len, ...items) jsonRef.value.splice(15, len, ...items)
updateElements()
}), }),
Fields.useDeployMode(), Fields.useDeployMode(),
Fields.useDriverCores(), Fields.useDriverCores(),

14
dolphinscheduler-ui-next/src/views/projects/task/components/node/use-task.ts

@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
import { ref, Ref, unref, watch } from 'vue' import { ref, Ref, unref } from 'vue'
import nodes from './tasks' import nodes from './tasks'
import getElementByJson from '@/components/form/get-elements-by-json' import getElementByJson from '@/components/form/get-elements-by-json'
import { useTaskNodeStore } from '@/store/project/task-node' import { useTaskNodeStore } from '@/store/project/task-node'
@ -56,7 +56,10 @@ export function useTask({
from, from,
readonly, readonly,
data, data,
jsonRef jsonRef,
updateElements: () => {
getElements()
}
} }
const { model, json } = nodes[data.taskType || 'SHELL'](params) const { model, json } = nodes[data.taskType || 'SHELL'](params)
@ -71,12 +74,5 @@ export function useTask({
getElements() getElements()
watch(
() => jsonRef.value.length,
() => {
getElements()
}
)
return { elementsRef, rulesRef, model } return { elementsRef, rulesRef, model }
} }

Loading…
Cancel
Save