ui_migration fix(deps): --preliminary-- Removing markRaw to static declared components. Improvement, SmartScan now works partially.
This commit is contained in:
parent
dfca0ff7e0
commit
ee71a416b1
38 changed files with 71 additions and 72 deletions
|
|
@ -55,8 +55,8 @@ export default {
|
||||||
name: "App",
|
name: "App",
|
||||||
|
|
||||||
components: {
|
components: {
|
||||||
appContent: markRaw(appContent),
|
appContent,
|
||||||
loadingContent: markRaw(loadingContent),
|
loadingContent
|
||||||
},
|
},
|
||||||
|
|
||||||
data: function () {
|
data: function () {
|
||||||
|
|
|
||||||
|
|
@ -102,9 +102,9 @@ export default {
|
||||||
name: "AppContent",
|
name: "AppContent",
|
||||||
|
|
||||||
components: {
|
components: {
|
||||||
tabIcon: markRaw(tabIcon),
|
tabIcon,
|
||||||
tabContent: markRaw(tabContent),
|
tabContent,
|
||||||
calibrationWizard: markRaw(calibrationWizard),
|
calibrationWizard
|
||||||
},
|
},
|
||||||
data: function () {
|
data: function () {
|
||||||
return {
|
return {
|
||||||
|
|
|
||||||
|
|
@ -51,8 +51,8 @@ export default {
|
||||||
],
|
],
|
||||||
|
|
||||||
components: {
|
components: {
|
||||||
ActionProgressBar: markRaw(ActionProgressBar),
|
ActionProgressBar,
|
||||||
ActionStatusModal: markRaw(ActionStatusModal)
|
ActionStatusModal
|
||||||
},
|
},
|
||||||
|
|
||||||
props: {
|
props: {
|
||||||
|
|
|
||||||
|
|
@ -69,8 +69,7 @@ export default {
|
||||||
taskStatus: {
|
taskStatus: {
|
||||||
handler() {
|
handler() {
|
||||||
this.scrollToBottom();
|
this.scrollToBottom();
|
||||||
},
|
}
|
||||||
//deep: true,
|
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -35,8 +35,8 @@ import { eventBus } from "../../eventBus.js";
|
||||||
export default {
|
export default {
|
||||||
name: "ActionStatusModal",
|
name: "ActionStatusModal",
|
||||||
components: {
|
components: {
|
||||||
ActionProgressBar: markRaw(ActionProgressBar),
|
ActionProgressBar,
|
||||||
ActionLogDisplay: markRaw(ActionLogDisplay)
|
ActionLogDisplay
|
||||||
},
|
},
|
||||||
props: {
|
props: {
|
||||||
title: {
|
title: {
|
||||||
|
|
|
||||||
|
|
@ -107,7 +107,7 @@ export default {
|
||||||
name: "InputFromSchema",
|
name: "InputFromSchema",
|
||||||
|
|
||||||
components: {
|
components: {
|
||||||
syncPropertyButton: markRaw(syncPropertyButton),
|
syncPropertyButton
|
||||||
},
|
},
|
||||||
|
|
||||||
props: {
|
props: {
|
||||||
|
|
|
||||||
|
|
@ -20,7 +20,7 @@ export default {
|
||||||
name: "PropertyControl",
|
name: "PropertyControl",
|
||||||
|
|
||||||
components: {
|
components: {
|
||||||
InputFromSchema: markRaw(InputFromSchema),
|
InputFromSchema
|
||||||
},
|
},
|
||||||
|
|
||||||
props: {
|
props: {
|
||||||
|
|
|
||||||
|
|
@ -25,7 +25,7 @@ export default {
|
||||||
name: "ServerSpecifiedActionButton",
|
name: "ServerSpecifiedActionButton",
|
||||||
|
|
||||||
components: {
|
components: {
|
||||||
ActionButton: markRaw(ActionButton),
|
ActionButton
|
||||||
},
|
},
|
||||||
|
|
||||||
props: {
|
props: {
|
||||||
|
|
|
||||||
|
|
@ -19,7 +19,7 @@ export default {
|
||||||
name: "ServerSpecifiedPropertyControl",
|
name: "ServerSpecifiedPropertyControl",
|
||||||
|
|
||||||
components: {
|
components: {
|
||||||
PropertyControl: markRaw(PropertyControl),
|
PropertyControl
|
||||||
},
|
},
|
||||||
|
|
||||||
props: {
|
props: {
|
||||||
|
|
|
||||||
|
|
@ -22,7 +22,7 @@ export default {
|
||||||
name: "LoadingContent",
|
name: "LoadingContent",
|
||||||
|
|
||||||
components: {
|
components: {
|
||||||
devTools: markRaw(devTools)
|
devTools
|
||||||
},
|
},
|
||||||
|
|
||||||
data: function () {
|
data: function () {
|
||||||
|
|
|
||||||
|
|
@ -26,8 +26,8 @@ export default {
|
||||||
name: "CameraMainCalibrationStep",
|
name: "CameraMainCalibrationStep",
|
||||||
|
|
||||||
components: {
|
components: {
|
||||||
stepTemplateWithStream: markRaw(stepTemplateWithStream),
|
stepTemplateWithStream,
|
||||||
cameraCalibrationSettings: markRaw(cameraCalibrationSettings),
|
cameraCalibrationSettings
|
||||||
},
|
},
|
||||||
|
|
||||||
computed: {
|
computed: {
|
||||||
|
|
|
||||||
|
|
@ -20,7 +20,7 @@ import { markRaw } from "vue";
|
||||||
export default {
|
export default {
|
||||||
name: "CameraCalibrationTask",
|
name: "CameraCalibrationTask",
|
||||||
components: {
|
components: {
|
||||||
calibrationWizardTask: markRaw(calibrationWizardTask) },
|
calibrationWizardTask},
|
||||||
props: {
|
props: {
|
||||||
// Standard calibrationWizardTask props below:
|
// Standard calibrationWizardTask props below:
|
||||||
first: Boolean,
|
first: Boolean,
|
||||||
|
|
|
||||||
|
|
@ -20,8 +20,8 @@ import { markRaw } from "vue";
|
||||||
|
|
||||||
export default {
|
export default {
|
||||||
name: "CameraCalibrationTask",
|
name: "CameraCalibrationTask",
|
||||||
components: {
|
components: {
|
||||||
calibrationWizardTask: markRaw(calibrationWizardTask)
|
calibrationWizardTask
|
||||||
},
|
},
|
||||||
props: {
|
props: {
|
||||||
// Standard calibrationWizardTask props below:
|
// Standard calibrationWizardTask props below:
|
||||||
|
|
|
||||||
|
|
@ -37,8 +37,8 @@ export default {
|
||||||
name: "CameraMainCalibrationStep",
|
name: "CameraMainCalibrationStep",
|
||||||
|
|
||||||
components: {
|
components: {
|
||||||
stepTemplateWithStream: markRaw(stepTemplateWithStream),
|
stepTemplateWithStream,
|
||||||
ActionButton: markRaw(ActionButton),
|
ActionButton
|
||||||
},
|
},
|
||||||
};
|
};
|
||||||
</script>
|
</script>
|
||||||
|
|
|
||||||
|
|
@ -25,8 +25,8 @@ export default {
|
||||||
name: "CameraMainCalibrationStep",
|
name: "CameraMainCalibrationStep",
|
||||||
|
|
||||||
components: {
|
components: {
|
||||||
stepTemplateWithStream: markRaw(stepTemplateWithStream),
|
stepTemplateWithStream,
|
||||||
CSMCalibrationSettings: markRaw(CSMCalibrationSettings),
|
CSMCalibrationSettings,
|
||||||
},
|
},
|
||||||
|
|
||||||
mounted() {
|
mounted() {
|
||||||
|
|
|
||||||
|
|
@ -30,7 +30,7 @@ import { markRaw } from "vue";
|
||||||
export default {
|
export default {
|
||||||
name: "SingleStepTask",
|
name: "SingleStepTask",
|
||||||
components: {
|
components: {
|
||||||
calibrationWizardTask: markRaw(calibrationWizardTask)
|
calibrationWizardTask
|
||||||
},
|
},
|
||||||
props: {
|
props: {
|
||||||
// This must be sent
|
// This must be sent
|
||||||
|
|
|
||||||
|
|
@ -15,7 +15,7 @@ export default {
|
||||||
name: "StepTemplateWithStream",
|
name: "StepTemplateWithStream",
|
||||||
|
|
||||||
components: {
|
components: {
|
||||||
miniStreamDisplay: markRaw(miniStreamDisplay),
|
miniStreamDisplay
|
||||||
},
|
},
|
||||||
};
|
};
|
||||||
</script>
|
</script>
|
||||||
|
|
|
||||||
|
|
@ -63,7 +63,7 @@ import { markRaw } from "vue";
|
||||||
export default {
|
export default {
|
||||||
name: "StatusPane",
|
name: "StatusPane",
|
||||||
components: {
|
components: {
|
||||||
ActionButton: markRaw(ActionButton)
|
ActionButton
|
||||||
},
|
},
|
||||||
|
|
||||||
data: function () {
|
data: function () {
|
||||||
|
|
|
||||||
|
|
@ -31,8 +31,8 @@ export default {
|
||||||
name: "AboutContent",
|
name: "AboutContent",
|
||||||
|
|
||||||
components: {
|
components: {
|
||||||
devTools: markRaw(devTools),
|
devTools,
|
||||||
statusPane: markRaw(statusPane),
|
statusPane
|
||||||
},
|
},
|
||||||
};
|
};
|
||||||
</script>
|
</script>
|
||||||
|
|
|
||||||
|
|
@ -52,8 +52,8 @@ import { markRaw } from "vue";
|
||||||
|
|
||||||
export default {
|
export default {
|
||||||
components: {
|
components: {
|
||||||
ActionButton: markRaw(ActionButton),
|
ActionButton,
|
||||||
ServerSpecifiedPropertyControl: markRaw(ServerSpecifiedPropertyControl),
|
ServerSpecifiedPropertyControl
|
||||||
},
|
},
|
||||||
|
|
||||||
data() {
|
data() {
|
||||||
|
|
|
||||||
|
|
@ -20,8 +20,8 @@ export default {
|
||||||
name: "BackgroundDetectContent",
|
name: "BackgroundDetectContent",
|
||||||
|
|
||||||
components: {
|
components: {
|
||||||
paneBackgroundDetect: markRaw(paneBackgroundDetect),
|
paneBackgroundDetect,
|
||||||
streamDisplay: markRaw(streamDisplay),
|
streamDisplay
|
||||||
},
|
},
|
||||||
};
|
};
|
||||||
</script>
|
</script>
|
||||||
|
|
|
||||||
|
|
@ -26,7 +26,7 @@ export default {
|
||||||
name: "AutofocusControl",
|
name: "AutofocusControl",
|
||||||
|
|
||||||
components: {
|
components: {
|
||||||
ActionButton: markRaw(ActionButton),
|
ActionButton
|
||||||
},
|
},
|
||||||
|
|
||||||
data: function () {
|
data: function () {
|
||||||
|
|
|
||||||
|
|
@ -41,9 +41,9 @@ export default {
|
||||||
name: "PaneControl",
|
name: "PaneControl",
|
||||||
|
|
||||||
components: {
|
components: {
|
||||||
ActionButton: markRaw(ActionButton),
|
ActionButton,
|
||||||
positionControl: markRaw(positionControl),
|
positionControl,
|
||||||
autofocusControl: markRaw(autofocusControl),
|
autofocusControl
|
||||||
},
|
},
|
||||||
|
|
||||||
computed: {
|
computed: {
|
||||||
|
|
|
||||||
|
|
@ -69,9 +69,9 @@ export default {
|
||||||
name: "PaneControl",
|
name: "PaneControl",
|
||||||
|
|
||||||
components: {
|
components: {
|
||||||
ActionButton: markRaw(ActionButton),
|
ActionButton,
|
||||||
syncPropertyButton: markRaw(syncPropertyButton),
|
syncPropertyButton,
|
||||||
stageControlButtons: markRaw(stageControlButtons),
|
stageControlButtons
|
||||||
},
|
},
|
||||||
|
|
||||||
data: function () {
|
data: function () {
|
||||||
|
|
|
||||||
|
|
@ -20,8 +20,8 @@ export default {
|
||||||
name: "ControlContent",
|
name: "ControlContent",
|
||||||
|
|
||||||
components: {
|
components: {
|
||||||
paneControl: markRaw(paneControl),
|
paneControl,
|
||||||
streamDisplay: markRaw(streamDisplay) ,
|
streamDisplay
|
||||||
},
|
},
|
||||||
};
|
};
|
||||||
</script>
|
</script>
|
||||||
|
|
|
||||||
|
|
@ -90,8 +90,8 @@ export default {
|
||||||
name: "LoggingContent",
|
name: "LoggingContent",
|
||||||
|
|
||||||
components: {
|
components: {
|
||||||
Paginate: markRaw(Paginate),
|
Paginate,
|
||||||
EndpointButton: markRaw(EndpointButton),
|
EndpointButton
|
||||||
},
|
},
|
||||||
|
|
||||||
data: function () {
|
data: function () {
|
||||||
|
|
|
||||||
|
|
@ -89,8 +89,8 @@ import { markRaw } from "vue";
|
||||||
export default {
|
export default {
|
||||||
name: "ScanCard",
|
name: "ScanCard",
|
||||||
components: {
|
components: {
|
||||||
actionButton: markRaw(actionButton),
|
actionButton,
|
||||||
EndpointButton: markRaw(EndpointButton)
|
EndpointButton
|
||||||
},
|
},
|
||||||
|
|
||||||
props: {
|
props: {
|
||||||
|
|
|
||||||
|
|
@ -61,7 +61,7 @@ import { markRaw } from "vue";
|
||||||
export default {
|
export default {
|
||||||
name: "ScanViewerModal",
|
name: "ScanViewerModal",
|
||||||
components: {
|
components: {
|
||||||
OpenSeadragonViewer: markRaw(OpenSeadragonViewer)
|
OpenSeadragonViewer
|
||||||
},
|
},
|
||||||
props: {
|
props: {
|
||||||
selectedScan: {
|
selectedScan: {
|
||||||
|
|
|
||||||
|
|
@ -108,9 +108,9 @@ import { eventBus } from "../../eventBus.js";
|
||||||
export default {
|
export default {
|
||||||
name: "ScanListContent",
|
name: "ScanListContent",
|
||||||
components: {
|
components: {
|
||||||
actionButton: markRaw(actionButton),
|
actionButton,
|
||||||
scanCard: markRaw(scanCard),
|
scanCard,
|
||||||
ScanViewerModal: markRaw(ScanViewerModal)
|
ScanViewerModal
|
||||||
},
|
},
|
||||||
|
|
||||||
data: function () {
|
data: function () {
|
||||||
|
|
|
||||||
|
|
@ -25,8 +25,8 @@ export default {
|
||||||
name: "CSMSettings",
|
name: "CSMSettings",
|
||||||
|
|
||||||
components: {
|
components: {
|
||||||
CSMCalibrationSettings: markRaw(CSMCalibrationSettings),
|
CSMCalibrationSettings,
|
||||||
miniStreamDisplay: markRaw(miniStreamDisplay),
|
miniStreamDisplay
|
||||||
},
|
},
|
||||||
};
|
};
|
||||||
</script>
|
</script>
|
||||||
|
|
|
||||||
|
|
@ -65,8 +65,8 @@ export default {
|
||||||
name: "CSMCalibrationSettings",
|
name: "CSMCalibrationSettings",
|
||||||
|
|
||||||
components: {
|
components: {
|
||||||
ActionButton: markRaw(ActionButton),
|
ActionButton,
|
||||||
matrixDisplay: markRaw(matrixDisplay),
|
matrixDisplay
|
||||||
},
|
},
|
||||||
|
|
||||||
props: {
|
props: {
|
||||||
|
|
|
||||||
|
|
@ -33,9 +33,9 @@ export default {
|
||||||
name: "CameraSettings",
|
name: "CameraSettings",
|
||||||
|
|
||||||
components: {
|
components: {
|
||||||
cameraCalibrationSettings: markRaw(cameraCalibrationSettings),
|
cameraCalibrationSettings,
|
||||||
miniStreamDisplay: markRaw(miniStreamDisplay),
|
miniStreamDisplay,
|
||||||
ServerSpecifiedPropertyControl: markRaw(ServerSpecifiedPropertyControl),
|
ServerSpecifiedPropertyControl
|
||||||
},
|
},
|
||||||
|
|
||||||
data() {
|
data() {
|
||||||
|
|
|
||||||
|
|
@ -30,7 +30,7 @@ export default {
|
||||||
name: "CameraCalibrationSettings",
|
name: "CameraCalibrationSettings",
|
||||||
|
|
||||||
components: {
|
components: {
|
||||||
ServerSpecifiedActionButton: markRaw(ServerSpecifiedActionButton),
|
ServerSpecifiedActionButton,
|
||||||
},
|
},
|
||||||
|
|
||||||
props: {
|
props: {
|
||||||
|
|
|
||||||
|
|
@ -15,8 +15,8 @@ export default {
|
||||||
name: "DisplaySettings",
|
name: "DisplaySettings",
|
||||||
|
|
||||||
components: {
|
components: {
|
||||||
streamSettings: markRaw(streamSettings),
|
streamSettings,
|
||||||
appSettings: markRaw(appSettings),
|
appSettings
|
||||||
},
|
},
|
||||||
};
|
};
|
||||||
</script>
|
</script>
|
||||||
|
|
|
||||||
|
|
@ -36,7 +36,7 @@ export default {
|
||||||
name: "StageSettings",
|
name: "StageSettings",
|
||||||
|
|
||||||
components: {
|
components: {
|
||||||
ActionButton: markRaw(ActionButton),
|
ActionButton
|
||||||
},
|
},
|
||||||
|
|
||||||
data: function () {
|
data: function () {
|
||||||
|
|
|
||||||
|
|
@ -76,9 +76,9 @@ export default {
|
||||||
name: "SettingsContent",
|
name: "SettingsContent",
|
||||||
|
|
||||||
components: {
|
components: {
|
||||||
tabIcon: markRaw(tabIcon),
|
tabIcon,
|
||||||
tabContent: markRaw(tabContent),
|
tabContent,
|
||||||
calibrationWizard: markRaw(calibrationWizard),
|
calibrationWizard
|
||||||
},
|
},
|
||||||
|
|
||||||
data: function () {
|
data: function () {
|
||||||
|
|
|
||||||
|
|
@ -160,12 +160,12 @@ export default {
|
||||||
name: "SlideScanContent",
|
name: "SlideScanContent",
|
||||||
|
|
||||||
components: {
|
components: {
|
||||||
streamDisplay: markRaw(streamDisplay),
|
streamDisplay,
|
||||||
propertyControl: markRaw(propertyControl),
|
propertyControl,
|
||||||
actionLogDisplay: markRaw(actionLogDisplay),
|
actionLogDisplay,
|
||||||
actionProgressBar: markRaw(actionProgressBar),
|
actionProgressBar,
|
||||||
MiniStreamDisplay: markRaw(MiniStreamDisplay),
|
MiniStreamDisplay,
|
||||||
ActionButton: markRaw(ActionButton),
|
ActionButton,
|
||||||
},
|
},
|
||||||
|
|
||||||
data() {
|
data() {
|
||||||
|
|
|
||||||
|
|
@ -16,7 +16,7 @@ export default {
|
||||||
name: "ViewContent",
|
name: "ViewContent",
|
||||||
|
|
||||||
components: {
|
components: {
|
||||||
streamDisplay: markRaw(streamDisplay),
|
streamDisplay,
|
||||||
},
|
},
|
||||||
};
|
};
|
||||||
</script>
|
</script>
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue